Merge remote-tracking branch 'origin/develop' into develop

src/views/home/component/top-fliter.vue

@@ -53,7 +53,7 @@
         />
       </el-select>
       <el-date-picker
-        v-model="query.time"
+        v-model="time"
         type="daterange"
         format="YYYY-MM-DD"
         start-placeholder="开始日期"
@@ -77,17 +77,18 @@ export default {
         projectYear: '',
         deptIds: '',
         timeType: '',
-        time: ''
+        findTime: ''
       },
+      time: '',
       years: [],
-      dateType: '计划(实际)入库时间',
+      dateType: '计划(实际)开工时间',
       types: [
         {
-          label: '计划(实际)入库时间',
+          label: '计划(实际)开工时间',
           value: 1
         },
         {
-          label: '计划(实际)开工时间',
+          label: '计划(实际)入库时间',
           value: 2
         }
       ],
@@ -127,12 +128,11 @@ export default {
         this.query.deptIds = res
       } else if (type === 3) {
         this.query.timeType = res
-      } else {
-        if (this.query.timeType === 1) {
-          this.query.planCommencementTime = this.query.time.join(',')
-        } else {
-          this.query.planStorageTime = this.query.time.join(',')
+        if (this.query.findTime.length === 0) {
+          return
         }
+      } else {
+        this.query.findTime = this.time.join(',')
       }
       this.$bus.emit('serach', this.query)
     }

src/views/store/component/info2.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
     <div class="padding top flex flex-center flex-justify-between">
-      <span>入库时间预警</span>
+      <span>入库智能预警</span>
     </div>
-    <div class="padding-left padding-right" style="padding: 20px;">
+    <div class="padding-left padding-right" style="padding: 20px">
       <avue-crud
         :option="option"
         :data="data"

src/views/store/component/info3.vue

@@ -324,6 +324,7 @@ export default {
           this.$api.store.removeFile(data).then(res => {
             if (res.code === 200) {
               this.$message.success('删除成功')
+              this.onLoad()
             } else {
               this.$message.error(res.msg)
             }

src/views/store/index.vue

@@ -24,16 +24,20 @@
         @row-del="rowDel"
         @row-save="rowSave"
         @row-update="rowUpdate"
+        @selection-change="selectionChange"
         @on-load="onLoad"
       >
-        <template #menu-left>
+        <template #menu-left="{ row }">
           <div class="mt-20 mb-10">
-            <el-button type="primary" v-if="user.info.viewStage !== 1"
-              >上报预审</el-button
-            >
+            <el-button
+              type="primary"
+              v-if="user.info.viewStage !== 1"
+              @click="report(row)"
+              >上报预审
+            </el-button>
             <el-button type="primary" plain v-if="user.info.viewStage !== 1"
-              >删 除</el-button
-            >
+              >删 除
+            </el-button>
           </div>
         </template>
 
@@ -42,6 +46,16 @@
             <el-button icon="Refresh" circle plain @click="onLoad" />
           </div>
         </template>
+        <template #hasfiles="{ row }">
+          <el-tag>
+            {{ row.hasFiles === 1 ? '已上传' : '未上传' }}
+          </el-tag>
+        </template>
+        <template #isUp="{ row }">
+          <el-tag>
+            {{ row.isUp === 1 ? '已上报' : '未上报' }}
+          </el-tag>
+        </template>
       </avue-crud>
     </div>
   </el-card>
@@ -67,12 +81,14 @@ export default {
       keyword: '',
       form: {},
       data: [],
+      selectList: [],
       option: {
         align: 'center',
         menuAlign: 'center',
         size: 'mini',
         viewBtn: true,
         editBtn: false,
+        tip: false,
         selection: true,
         addBtn: false,
         refreshBtn: false,
@@ -89,8 +105,16 @@ export default {
             prop: 'unitName'
           },
           {
-            label: '上传时间',
+            label: '入库附件',
+            prop: 'hasfiles'
+          },
+          {
+            label: '入库时间',
             prop: 'createTime'
+          },
+          {
+            label: '上报状态',
+            prop: 'isUp'
           }
         ]
       },
@@ -108,6 +132,7 @@ export default {
             const project = ele.project
             delete project.id
             delete ele.project
+            ele.hasfile = ele.hasFile
             return Object.assign(ele, project)
           })
         }
@@ -128,6 +153,9 @@ export default {
         }
       })
     },
+    selectionChange(list) {
+      this.selectList = list
+    },
     beforeOpen(done, type) {
       if (type === 'view') {
         const data = this.$router.resolve({
@@ -138,6 +166,12 @@ export default {
       } else {
         done()
       }
+    },
+    report() {
+      const tmps = this.selectList.filter(ele => ele.hasFiles === 0)
+      if (tmps.length > 0) {
+        this.$message.error('操作失败，存在未上传入库附件的项目')
+      }
     }
   }
 }