功能优化

src/utils/date.js

@@ -96,13 +96,6 @@ export default {
     return moment().add(num, 'weeks').format(DATE_FORMAT)
   },
 
-  lastDayOfWeek(date) {
-    if (date) {
-      return moment(date).endOf('week').format(DATE_FORMAT)
-    }
-    return moment().endOf('week').format(DATE_FORMAT)
-  },
-
   firstDayOfNextWeek(date) {
     if (date) {
       return moment(date).add(1, 'weeks').startOf('week').format(DATE_FORMAT)

src/views/material/asset.vue

@@ -140,7 +140,7 @@
     </el-row>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="asset-dialog" width="800px" append-to-body >
+    <el-dialog :title="title" :visible.sync="open" class="asset-dialog" width="800px" append-to-body>
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
@@ -258,7 +258,8 @@
     </el-dialog>
 
     <!-- 物品流转对话框 -->
-    <el-dialog title="物品流转" :visible.sync="transferOpen" class="asset-dialog" width="800px" append-to-body>
+    <el-dialog title="物品流转" :visible.sync="transferOpen" class="asset-dialog" width="800px" append-to-body
+               @close="cancelTransferForm">
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form ref="transferForm" :model="transferForm" :rules="transferRules" size="mini" label-width="100px">
@@ -615,6 +616,7 @@ export default {
           }
           addTransfer(this.transferForm).then(res => {
             this.$message.success("流转成功");
+            this.$refs.dut.clearText();
             this.transferOpen = false;
             this.resetForm("transferForm");
             this.getList();
@@ -623,6 +625,7 @@ export default {
       });
     },
     cancelTransferForm() {
+      this.$refs.dut.clearText();
       this.transferOpen = false
       this.transferForm = {}
       this.resetForm("transferForm");

src/views/material/receive.vue

@@ -468,6 +468,16 @@ export default {
     },
     handleSelectionChange(val) {
       let temp = _.cloneDeep(val)
+
+      if (this.addList.length > 0) {
+        if (val.recordDate != this.addList[0].recordDate) {
+          this.$message.warning("多条数据不属于同月，请重新选择")
+          this.$refs.materialList.clearSelection()
+          this.addList = []
+          return
+        }
+      }
+
       this.addList = temp.map(item => {
         item.parentId = item.id
         item.num = undefined
@@ -491,7 +501,12 @@ export default {
         }
       }
       if (type === 'week') {
-        let limitTime = DateUtil.unix(DateUtil.firstDayOfNextWeek()) * 1000
+        let limitTime = 0
+        if (this.addList.length > 0) {
+          limitTime = DateUtil.unix(this.addList[0].recordDate + '-01') * 1000
+        }
+        let nextWeekFirstDay = DateUtil.unix(DateUtil.firstDayOfNextWeek()) * 1000;
+        limitTime = limitTime < nextWeekFirstDay ? nextWeekFirstDay : limitTime;
         return {
           firstDayOfWeek: 1,
           disabledDate: time => time.getTime() <= limitTime

src/views/task/task.vue

@@ -62,7 +62,7 @@
                   lazy
                   :load="load"
                   :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-          <el-table-column label="任务编号" prop="id" width="80"/>
+          <el-table-column label="任务编号" prop="id"/>
           <el-table-column label="任务名称" prop="taskName" min-width="150" :show-overflow-tooltip="true"/>
           <el-table-column label="执行(负责)人" prop="executorName"/>
           <el-table-column label="进度" prop="progressValue" width="80">