修改了报告编制生成报告

pages/soil-report-manage/report-make/ItemReportView.vue

@@ -170,6 +170,7 @@ export default {
       this.$refs.createModal._open()
     },
     _certificateSelectExcelBack(data) {
+      this.$refs.pageTable._showLoading()
       if (data) {
         console.log(this.selectIds)
         console.log(data)
@@ -179,7 +180,6 @@ export default {
       }
     },
     _makeCodeExcel: async function(data) {
-      this.$refs.pageTable._hideLoading()
       const result = await soilSample.generateReport({
         entrustId: this.formObj.entrustId,
         expReportIds: this.selectIds,
@@ -192,8 +192,11 @@ export default {
           this.$refs.pageTable._hideLoading()
           return false
         } else {
+          this.$refs.pageTable._hideLoading()
           this._viewReport(result)
         }
+      } else {
+        this.$refs.pageTable._hideLoading()
       }
     },
     _viewReport(data) {

pages/soil-sample-manage/keep-address/AddressManage.vue

@@ -50,9 +50,8 @@
                   <div v-else-if="item.key==='type'">
                     {{scope.row[item.key]===0?'国家标准':scope.row[item.key]===1?'地方标准':scope.row[item.key]===2?'行业标准':scope.row[item.key]===3?'企业标准': ''}}
                   </div>
-
-                  <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}
-                  </div>
+                  <div v-else-if="item.key==='keepLimitTime'" :class="[ scope.row.keepReminder ===1 ? 'redColor' : '' ]">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
+                  <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</div>
                   <div v-else-if="item.key==='fileUrl'">
                     <span v-if="scope.row['fileUrl']" class="green-color">是</span>
                     <span v-else class="red-color">否</span>
@@ -121,7 +120,7 @@ export default {
         { title: '现场编号', key: 'siteNo', width: 100 },
         { title: '接收人', key: 'receiver', width: 120 },
         { title: '接收时间', key: 'receiveTime', width: 140, date: true },
-        { title: '留存有效期', key: 'keepLimitTime', width: 140, date: true },
+        { title: '留存有效期', key: 'keepLimitTime', width: 140 },
         { title: '收样存储位置', key: 'receiveLocation', width: 140 },
         { title: '土质描述', key: 'sampleDescribe', width: 185 },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
@@ -398,3 +397,8 @@ export default {
   }
 }
 </script>
+<style scoped>
+.redColor {
+  color: red;
+}
+</style>

pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue

@@ -6,21 +6,21 @@
         <Form id="task-assign-item-left" :label-width="70" inline onsubmit="return false">
         <label class="label-sign"></label>
         <Form-item class="search-item" label="检测项目:">
-          <Input v-model="formObj.name" placeholder="请输入检测项目" clearable @on-enter="_formSearch"></Input>
+          <Input v-model="formObj.name" @on-enter="_formSearch" placeholder="请输入检测项目" clearable></Input>
         </Form-item>
         <Form-item class="search-btn">
-          <Button type="primary" @click="_formSearch">搜索</Button>
+          <Button @click="_formSearch" type="primary">搜索</Button>
         </Form-item>
       </Form>
       </Col>
       <Col span="24">
-      <btn-list class="contHide" style="margin-bottom: 6px;" @on-result-change="_btnClick"></btn-list>
+      <btn-list @on-result-change="_btnClick" class="contHide" style="margin-bottom: 6px;"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
       <PTVXETable ref="pageTable" :is-radio="true" :page-columns="pageColumns" :table-name="tableName"
                   :table-height="tableHeight"
-                    :get-page="getPage" :icon-msg="iconMsg" :hide-checkbox="true" select-data  @on-result-change="_tableResultChange">
+                    :get-page="getPage" :icon-msg="iconMsg" :hide-checkbox="true" @on-result-change="_tableResultChange"  select-data>
         <vxe-table-column
           v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
           :key="item.key"
@@ -209,6 +209,8 @@ export default {
           this.$refs.pageTable._hideLoading()
           this._viewReport(result)
         }
+      } else {
+        this.$refs.pageTable._hideLoading()
       }
     },
     _viewReport(data) {