Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/personnelManagement/checkWorkList.vue

@@ -49,18 +49,24 @@
       label="上班打卡时间"
       width="180">
       <template slot-scope="scope">
-        <span v-if="scope.row.toClockDate" style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+        <span v-if="scope.row.toClockDate" style="margin-left: 10px">
+          {{ scope.row.toClockDate.split(" ")[1] }}
+          <span v-if="scope.row.lateFlag == 1" style="color: brown;font-size: 14px;">迟</span>
+        </span>
         <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px;">已补卡</span>
-        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
+        <span v-else-if="!scope.row.toClockDate && scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
     <el-table-column
       prop="offClockDate"
       label="下班打卡时间">
       <template slot-scope="scope">
-        <span v-if="scope.row.offClockDate" style="margin-left: 10px">{{ scope.row.offClockDate.split(" ")[1] }}</span>
+        <span v-if="scope.row.offClockDate" style="margin-left: 10px">
+          {{ scope.row.offClockDate.split(" ")[1] }}
+          <span v-if="scope.row.leaveEarlyFlag == 1" style="color: brown;font-size: 14px;">早</span>
+        </span>
         <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px;">已补卡</span>
-        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
+        <span v-else-if="!scope.row.offClockDate && scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
   </el-table>
@@ -171,15 +177,30 @@
     },
     mounted() {
       let date = new Date()
-            // 通过时间戳计算
-            let defalutStartTime = date.getTime() - 7 * 24 * 3600 * 1000 // 转化为时间戳
-            let defalutEndTime = date.getTime()
-            let startDateNs = new Date(defalutStartTime) 
-            let endDateNs = new Date(defalutEndTime)
-            // 月，日 不够10补0
-            defalutStartTime = startDateNs.getFullYear() + '-' + ((startDateNs.getMonth() + 1) >= 10 ? (startDateNs.getMonth() + 1) : '0' + (startDateNs.getMonth() + 1)) + '-' + (startDateNs.getDate() >= 10 ? startDateNs.getDate() : '0' + startDateNs.getDate())
-            defalutEndTime = endDateNs.getFullYear() + '-' + ((endDateNs.getMonth() + 1) >= 10 ? (endDateNs.getMonth() + 1) : '0' + (endDateNs.getMonth() + 1)) + '-' + (endDateNs.getDate() >= 10 ? endDateNs.getDate() : '0' + endDateNs.getDate())
-            this.value2= [defalutStartTime, defalutEndTime]
+			let new_year = date.getFullYear(); // 取当前的年份
+			let month = date.getMonth();
+			let new_month = month + 1; // 取当前的月份
+			let mon = '';
+			let day = '';
+			if (month > 12) {
+				new_month -= 12; // 月份减
+				new_year++; // 年份增
+			}
+			let firstDay = new Date(new_year, new_month, 1); // 取当年当月中的第一天
+			let lastDay = new Date(firstDay.getTime() - 1000 * 60 * 60 * 24).getDate(); // 获取当月最后一天日期
+			if (firstDay.getMonth() < 10) {
+				mon = '0' + firstDay.getMonth();
+			} else {
+				mon = firstDay.getMonth();
+			}
+			if (lastDay < 10) {
+				day = '0' + lastDay;
+			} else {
+				day = lastDay;
+			}
+			let startDate = firstDay.getFullYear() + '-' + mon + '-' + '0' + firstDay.getDate();
+			let endDate = firstDay.getFullYear() + '-' + mon + '-' + day;
+      this.value2 = [startDate,endDate]
     },
      
     methods: {
@@ -201,7 +222,15 @@
         }, 1000)
       },
       datechange() {
-        this.getList()
+        if (this.value2[0].split('-')[1] != this.value2[1].split('-')[1]) {
+          this.$message({
+            message: '请选择相同月份的起始日期',
+            type: 'warning',
+          })
+          return
+        } else {
+          this.getList()
+        }
       },
       deptChange(){
         this.getList()
@@ -215,28 +244,28 @@
           },
         })
       },
-      dateFormat(fmt, date) {
-        let ret
-        const opt = {
-          'Y+': date.getFullYear().toString(), // 年
-          'm+': (date.getMonth() + 1).toString(), // 月
-          'd+': date.getDate().toString(), // 日
-          'H+': date.getHours().toString(), // 时
-          // "M+": date.getMinutes().toString(),         // 分
-          // "S+": date.getSeconds().toString()          // 秒
-          // 有其他格式化字符需求可以继续添加，必须转化成字符串
-        }
-        for (let k in opt) {
-          ret = new RegExp('(' + k + ')').exec(fmt)
-          if (ret) {
-            fmt = fmt.replace(
-              ret[1],
-              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-            )
-          }
-        }
-        return fmt
-      },
+      // dateFormat(fmt, date) {
+      //   let ret
+      //   const opt = {
+      //     'Y+': date.getFullYear().toString(), // 年
+      //     'm+': (date.getMonth() + 1).toString(), // 月
+      //     'd+': date.getDate().toString(), // 日
+      //     'H+': date.getHours().toString(), // 时
+      //     // "M+": date.getMinutes().toString(),         // 分
+      //     // "S+": date.getSeconds().toString()          // 秒
+      //     // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      //   }
+      //   for (let k in opt) {
+      //     ret = new RegExp('(' + k + ')').exec(fmt)
+      //     if (ret) {
+      //       fmt = fmt.replace(
+      //         ret[1],
+      //         ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+      //       )
+      //     }
+      //   }
+      //   return fmt
+      // },
 
       handleClose() {
         this.accessoryTFs = false
@@ -266,27 +295,27 @@
           startDate = this.value2[0] ? this.value2[0] : ''
           endDate = this.value2[1] ? this.value2[1] : ''
         }
-        getList({
-          currentPage: this.currentPage,
+          getList({
+            currentPage: this.currentPage,
             pageSize: this.pageSize,
             startDate: startDate,
             endDate: endDate,
             searchKeyWord: this.searchKeyWord,
             compId: localStorage.getItem('ws-pf_compId'),
-            dept:this.deptId
-          })
-          .toPromise()
-          .then((response) => {
-            console.log(response.data)
-            this.tableData = response.records
-            // for (var i = 0; i < response.records.length; i++) {
-            //   response.records[i].identification = 'false'
-            // }
-            // this.customerList = response
-            // this.deptCircularPage.currentPage = response.current
-            // this.deptCircularPage.pageSize = response.size
-            // this.deptBudgetTotal = response.total
+            dept: this.deptId
           })
+            .toPromise()
+            .then((response) => {
+              console.log(response.data)
+              this.tableData = response.records
+              // for (var i = 0; i < response.records.length; i++) {
+              //   response.records[i].identification = 'false'
+              // }
+              // this.customerList = response
+              // this.deptCircularPage.currentPage = response.current
+              // this.deptCircularPage.pageSize = response.size
+              // this.deptBudgetTotal = response.total
+            })
       },
       //部门列表查询
       getDeptList() {

src/views/profitable/oilcost.vue

@@ -74,7 +74,9 @@
             </template></el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
-              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+              <span v-else-if="scope.row.status=='待付款'">{{scope.row.status}}</span>
+              <span v-else>{{scope.row.travelStatus}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="附件">
@@ -100,7 +102,7 @@
               <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
-              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
+              <el-button v-if='!scope.row.approveStatus&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -353,7 +355,7 @@
       },
       payment(row){
         if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-          this.$router.push({name:'payment',query:{id:row.id}})
+          this.$router.push({name:'payment',query:{id:row.expenseId}})
         }else{
           this.$message({
             message: '暂无此权限!',

src/views/profitable/payment.vue

@@ -34,7 +34,7 @@
             </ws-select>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouse}}
+          {{deptBudgetList.warehouseName}}
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.wareExpenseType}}

src/views/warehousenew/warehousingOrder.vue

@@ -1144,6 +1144,13 @@ export default {
         })
     },
     withdraw(item) {
+      if(!this.multipleSelection1[item.id]){
+        this.$message({
+            message: '至少选择一条请款审核中的条目',
+            type: 'error'
+          });
+      }
+      else{
       var arr1 = this.multipleSelection1[item.id]
       for (let i = 0; i < arr1.length; i++) {
         if (!arr1[i].approveStatus || arr1[i].approveStatus == '发起人撤回') {
@@ -1177,6 +1184,7 @@ export default {
         }
       }
       this.getList()
+      }
     },
     unique(arr) {
       const res = new Map();