修复审核页面时间查询错误以及增加显示字段

cors.js

@@ -209,5 +209,5 @@ module.exports = {
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
    devModules: ['all']
   //  devModules:['index']
-  // devModules: ['index',  'entrustedManagement']
+  // devModules: ['index',  'entrustedManagement','approveManagement','sampleManager']
 }

src/views/approveManagement/components/fiveApprove.vue

@@ -238,11 +238,11 @@
                 <el-table-column type="selection" width="45" fixed="left" align="center"></el-table-column>
                 <!--                <el-table-column sortable show-overflow-tooltip align="center" width="135" prop="CONTRACT_NO"-->
                 <!--                                 label="合同号"></el-table-column>-->
-                <el-table-column sortable show-overflow-tooltip align="center" min-width="80" prop="DEPT_NAME"
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="80px" prop="DEPT_NAME"
                   label="检验车间"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip align="center" min-width="80" prop="SECTION_NAME"
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="80px" prop="SECTION_NAME"
                   label="检验班组"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip fixed="left" min-width="100" prop="SAMPLE_NO"
+                <el-table-column sortable show-overflow-tooltip fixed="left" min-width="100px" prop="SAMPLE_NO"
                   label="中心编号">
                   <template slot-scope="scope">
                     <span @click.stop="showHistory(scope.row)" style="color:rgb(15,69,105);cursor: pointer;"
@@ -290,10 +290,10 @@
                 </el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="ENTR_MEMO"
                   label="委托备注"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip align="center" min-width="80" prop="AUDIT_MAN"
-                  label="审核人"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip align="center" min-width="140" prop="AUDIT_TIME"
-                  label="审核时间"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="100px" prop="AUDIT_MAN"
+                  label="二审审核人"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="140px" prop="AUDIT_TIME"
+                  label="二审审核时间"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="CREATE_MAN"
                   label="创建人"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="125px" prop="CREATE_TIME"
@@ -912,15 +912,19 @@ export default {
       this.click_main = {}
       this.tableData1 = []
       this.total_main = 0
-      let startTime = ''
-      let endTime = ''
-      if (!this.search.times) {
-        startTime = ''
-        endTime = ''
-      } else {
-        startTime = this.search.times[0] + ' 00:00:00'
-        endTime = this.search.times[1] + ' 23:59:59'
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+      // let startTime = ''
+      // let endTime = ''
+      // if (!this.search.times) {
+      //   startTime = ''
+      //   endTime = ''
+      // } else {
+      //   startTime = this.search.times[0] + ' 00:00:00'
+      //   endTime = this.search.times[1] + ' 23:59:59'
+      // }
       let obj = {
         object: {
           validFlag: '1',
@@ -959,15 +963,19 @@ export default {
       this.click_main2 = {}
       this.tableData2 = []
       this.total_main2 = 0
-      let startTime = ''
-      let endTime = ''
-      if (!this.search.times) {
-        startTime = ''
-        endTime = ''
-      } else {
-        startTime = this.search.times[0] + ' 00:00:00'
-        endTime = this.search.times[1] + ' 23:59:59'
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+      // let startTime = ''
+      // let endTime = ''
+      // if (!this.search.times) {
+      //   startTime = ''
+      //   endTime = ''
+      // } else {
+      //   startTime = this.search.times[0] + ' 00:00:00'
+      //   endTime = this.search.times[1] + ' 23:59:59'
+      // }
       let obj = {
         object: {
           validFlag: '1',
@@ -1006,15 +1014,19 @@ export default {
       if (!this.click_main || !this.click_main.MAT_NO) {
         return false;
       }
-      let startTime = ''
-      let endTime = ''
-      if (!this.search.times) {
-        startTime = ''
-        endTime = ''
-      } else {
-        startTime = this.search.times[0] + ' 00:00:00'
-        endTime = this.search.times[1] + ' 23:59:59'
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+      // let startTime = ''
+      // let endTime = ''
+      // if (!this.search.times) {
+      //   startTime = ''
+      //   endTime = ''
+      // } else {
+      //   startTime = this.search.times[0] + ' 00:00:00'
+      //   endTime = this.search.times[1] + ' 23:59:59'
+      // }
       let obj = {
         object: {
           matNo: this.click_main.MAT_NO,
@@ -1084,15 +1096,19 @@ export default {
       if (!this.click_main2 || !this.click_main2.MAT_NO) {
         return;
       }
-      let startTime = ''
-      let endTime = ''
-      if (!this.search.times) {
-        startTime = ''
-        endTime = ''
-      } else {
-        startTime = this.search.times[0] + ' 00:00:00'
-        endTime = this.search.times[1] + ' 23:59:59'
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.search.times[0] === null ? null : (this.search.times[0] + ' 00:00:00')
+      endTime = this.search.times[1] === null ? null : (this.search.times[1] + ' 23:59:59')
+      // let startTime = ''
+      // let endTime = ''
+      // if (!this.search.times) {
+      //   startTime = ''
+      //   endTime = ''
+      // } else {
+      //   startTime = this.search.times[0] + ' 00:00:00'
+      //   endTime = this.search.times[1] + ' 23:59:59'
+      // }
       let obj = {
         object: {
           matNo: this.click_main2.MAT_NO,

src/views/approveManagement/components/fourApprove.vue

@@ -377,10 +377,10 @@
                 </el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="ENTR_MEMO"
                   label="委托备注"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip align="center" min-width="80" prop="AUDIT_MAN"
-                  label="审核人"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip align="center" min-width="140" prop="AUDIT_TIME"
-                  label="审核时间"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="100px" prop="AUDIT_MAN"
+                  label="二审审核人"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="140px" prop="AUDIT_TIME"
+                  label="二审审核时间"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="75px" prop="CREATE_MAN"
                   label="创建人"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip align="center" min-width="125px" prop="CREATE_TIME"
@@ -667,7 +667,6 @@ export default {
     this.theight13 = window.innerHeight - 240;
     this.activeMenu = window.top.localStorage.getItem("activeMenu");
     let timestamp = new Date().getTime() - 7 * 24 * 60 * 60 * 1000; // 默认前一周
-
     this.fromDaiban = JSON.parse(sessionStorage.getItem("fromDaiban"));
     sessionStorage.removeItem("fromDaiban");
 
@@ -675,9 +674,6 @@ export default {
       this.search.times = [this.fromDaiban.startTime, this.fromDaiban.endTime];
       this.activeName = this.fromDaiban.status == 1 ? "second" : "first";
     } else {
-      this.search.times = [
-        null, null
-      ];
       this.search.times = [
         this.getYNM(new Date(timestamp)),
         this.getYNM(new Date()),
@@ -851,6 +847,10 @@ export default {
       this.search.sampleNo = "";
       let timestamp = new Date().getTime() - 7 * 24 * 60 * 60 * 1000; // 默认前一周
 
+      this.search.times = [
+        this.getYNM(new Date(timestamp)),
+        this.getYNM(new Date()),
+      ];
       // this.search.times = [
       //   this.getYNM(new Date(timestamp)) + " 00:00:00",
       //   this.getYNM(new Date()) + " 23:59:59",
@@ -1217,7 +1217,7 @@ export default {
         this.pageIndex2 = 1;
         this.pageSize2 = 500;
         this.dataMainWl11(),
-        this.dataMainWl21()
+          this.dataMainWl21()
       } catch (error) {
         console.error('数据加载失败:', error);
         this.loading = false;

src/views/approveManagement/components/secondApprove.vue

@@ -1,4 +1,4 @@
-<!-- 二级审核 -->
+<!-- 二级审核：批量审核操作不理解！！！三审撤回操作好难！！！ -->
 <template>
   <div class="examination testManagement">
     <div class="common-head-search">
@@ -17,13 +17,19 @@
           </el-select>
         </el-form-item>
         <el-form-item label="创建时间">
-          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="date"
+          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="开始日期" size="mini" style="width: 140px" :default-time="'00:00:00'">
           </el-date-picker>
+          <!-- <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="date"
+            placeholder="开始日期" size="mini" style="width: 140px" :default-time="'00:00:00'">
+          </el-date-picker> -->
           <span>至</span>
-          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="date"
+          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="结束日期" size="mini" style="width: 140px" :default-time="'23:59:59'">
           </el-date-picker>
+          <!-- <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="date"
+            placeholder="结束日期" size="mini" style="width: 140px" :default-time="'23:59:59'">
+          </el-date-picker> -->
           <!-- <el-date-picker
             v-model="searchForm.times"
             type="daterange"
@@ -110,6 +116,10 @@
                   label="提交人"></el-table-column>
                 <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="checkTime"
                   label="提交时间"></el-table-column>
+                  <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createMan"
+                  label="创建人"></el-table-column>
+                <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createTime"
+                  label="创建时间"></el-table-column>
               </el-table>
             </div>
             <div class="common-foot-style">
@@ -172,10 +182,14 @@
                   align="center"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip min-width="140px" prop="checkTime" label="提交时间"
                   align="center"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip min-width="80px" prop="auditMan" label="审核人"
+                <el-table-column sortable show-overflow-tooltip min-width="100px" prop="auditMan" label="二审审核人"
                   align="center"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip min-width="140px" prop="auditTime" label="审核时间"
+                <el-table-column sortable show-overflow-tooltip min-width="140px" prop="auditTime" label="二审审核时间"
                   align="center"></el-table-column>
+                  <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createMan"
+                  label="创建人"></el-table-column>
+                <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createTime"
+                  label="创建时间"></el-table-column>
               </el-table>
               <div class="common-foot-style">
                 <el-pagination @size-change="handleSizeChangeDep" @current-change="Data5()"
@@ -577,9 +591,13 @@ export default {
       this.activeName = this.fromDaiban.status == 1 ? "second" : "first";
     } else {
       this.searchForm.times = [
-        this.getYNM(new Date(timestamp)) + " 00:00:00",
-        this.getYNM(new Date()) + " 23:59:59",
+        this.getYNM(new Date(timestamp)),
+        this.getYNM(new Date()),
       ];
+      // this.searchForm.times = [
+      //   this.getYNM(new Date(timestamp)) + " 00:00:00",
+      //   this.getYNM(new Date()) + " 23:59:59",
+      // ];
     }
 
     this.activeMenu = window.top.localStorage.getItem("activeMenu");
@@ -794,9 +812,13 @@ export default {
       let timestamp = new Date().getTime() - 7 * 24 * 60 * 60 * 1000; // 默认前一周
 
       this.searchForm.times = [
-        this.getYNM(new Date(timestamp)) + " 00:00:00",
-        this.getYNM(new Date()) + " 23:59:59",
+        this.getYNM(new Date(timestamp)),
+        this.getYNM(new Date()),
       ];
+      // this.searchForm.times = [
+      //   this.getYNM(new Date(timestamp)) + " 00:00:00",
+      //   this.getYNM(new Date()) + " 23:59:59",
+      // ];
       this.searchData();
     },
     SelectionValues(val) {
@@ -1286,15 +1308,19 @@ export default {
     },
     // 未审核
     Data4() {
-      let startTime = "";
-      let endTime = "";
-      if (!this.searchForm.times) {
-        startTime = "";
-        endTime = "";
-      } else {
-        startTime = this.searchForm.times[0];
-        endTime = this.searchForm.times[1];
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.searchForm.times[0] === null ? null : (this.searchForm.times[0] + ' 00:00:00')
+      endTime = this.searchForm.times[1] === null ? null : (this.searchForm.times[1] + ' 23:59:59')
+      // let startTime = "";
+      // let endTime = "";
+      // if (!this.searchForm.times) {
+      //   startTime = "";
+      //   endTime = "";
+      // } else {
+      //   startTime = this.searchForm.times[0];
+      //   endTime = this.searchForm.times[1];
+      // }
       let obj = {
         object: {
           matName: this.searchForm.matName,
@@ -1347,15 +1373,19 @@ export default {
       this.glDialog.totalPage = this.glDialog.totalPage - 1;
     },
     Data5() {
-      let startTime = "";
-      let endTime = "";
-      if (!this.searchForm.times) {
-        startTime = "";
-        endTime = "";
-      } else {
-        startTime = this.searchForm.times[0];
-        endTime = this.searchForm.times[1];
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.searchForm.times[0] === null ? null : (this.searchForm.times[0] + ' 00:00:00')
+      endTime = this.searchForm.times[1] === null ? null : (this.searchForm.times[1] + ' 23:59:59')
+      // let startTime = "";
+      // let endTime = "";
+      // if (!this.searchForm.times) {
+      //   startTime = "";
+      //   endTime = "";
+      // } else {
+      //   startTime = this.searchForm.times[0];
+      //   endTime = this.searchForm.times[1];
+      // }
       let obj = {
         object: {
           matName: this.searchForm.matName,

src/views/approveManagement/components/threeApprove.vue

@@ -1,4 +1,4 @@
-<!-- 三级审核 -->
+<!-- 三级审核： -->
 <template>
   <div class="examination testManagement">
     <div class="common-head-search">
@@ -25,11 +25,11 @@
             style="width: 150px" clearable></el-input>
         </el-form-item>
         <el-form-item label="创建时间">
-          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="date"
+          <el-date-picker v-model="searchForm.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="开始日期" size="mini" style="width: 140px" :default-time="'00:00:00'">
           </el-date-picker>
           <span>至</span>
-          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd HH:mm:ss" format="" type="date"
+          <el-date-picker v-model="searchForm.times[1]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="结束日期" size="mini" style="width: 140px" :default-time="'23:59:59'">
           </el-date-picker>
           <!-- <el-date-picker
@@ -116,10 +116,18 @@
                   label="使用设备"></el-table-column>
                 <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="entrMemo"
                   label="委托备注"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="100px" prop="auditMan"
+                  label="二审审核人"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="140px" prop="auditTime"
+                  label="二审审核时间"></el-table-column>
                 <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="checkMan"
                   label="提交人"></el-table-column>
                 <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="checkTime"
                   label="提交时间"></el-table-column>
+                <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createMan"
+                  label="创建人"></el-table-column>
+                <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createTime"
+                  label="创建时间"></el-table-column>
               </el-table>
             </div>
             <div class="common-foot-style">
@@ -182,10 +190,18 @@
                   align="center"></el-table-column>
                 <el-table-column sortable show-overflow-tooltip min-width="140px" prop="checkTime" label="提交时间"
                   align="center"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip min-width="80px" prop="apprMan" label="审核人"
+                  <el-table-column sortable show-overflow-tooltip align="center" min-width="100px" prop="auditMan"
+                  label="二审审核人"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip align="center" min-width="140px" prop="auditTime"
+                  label="二审审核时间"></el-table-column>
+                <el-table-column sortable show-overflow-tooltip min-width="100px" prop="apprMan" label="三审审核人"
                   align="center"></el-table-column>
-                <el-table-column sortable show-overflow-tooltip min-width="140px" prop="apprTime" label="审核时间"
+                <el-table-column sortable show-overflow-tooltip min-width="140px" prop="apprTime" label="三审审核时间"
                   align="center"></el-table-column>
+                <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createMan"
+                  label="创建人"></el-table-column>
+                <el-table-column show-overflow-tooltip sortable min-width="75" align="center" prop="createTime"
+                  label="创建时间"></el-table-column>
               </el-table>
               <div class="common-foot-style">
                 <el-pagination @size-change="handleSizeChangeDep" @current-change="Data5()"
@@ -301,16 +317,16 @@
             <template slot-scope="scope">
               <span v-if="col.prop == 'matName'">{{
                 tableData[scope.$index].matName
-              }}</span>
+                }}</span>
               <span v-else-if="col.prop == 'sampleNo'">{{
                 tableData[scope.$index].sampleNo
-              }}</span>
+                }}</span>
               <span v-else-if="col.prop == 'carNo'">{{
                 tableData[scope.$index].carNo
-              }}</span>
+                }}</span>
               <span v-else-if="scope.$index > 0">{{
                 scope.row[col.prop]
-              }}</span>
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -599,8 +615,10 @@ export default {
       this.activeName = this.fromDaiban.status == 1 ? "second" : "first";
     } else {
       this.searchForm.times = [
-        this.getYNM(new Date(timestamp)) + " 00:00:00",
-        this.getYNM(new Date()) + " 23:59:59",
+        this.getYNM(new Date(timestamp)),
+        this.getYNM(new Date()),
+        // this.getYNM(new Date(timestamp)) + " 00:00:00",
+        // this.getYNM(new Date()) + " 23:59:59",
       ];
     }
     this.activeMenu = window.top.localStorage.getItem("activeMenu");
@@ -615,17 +633,17 @@ export default {
         this.getCompany();
       });
   },
-   watch: {
-  "$route.query.type"(newType) {
-    this.searchForm.type = newType || '';
-  }
-},
+  watch: {
+    "$route.query.type"(newType) {
+      this.searchForm.type = newType || '';
+    }
+  },
   mounted() {
-    this.searchForm.type = this.$route.query.type  || '';
+    this.searchForm.type = this.$route.query.type || '';
     this.axios
       .post(
         "pass/baseManagement/v1/limsbaseinfos/queryBaseInfoByBaseCode",
-        { validFlag: 1, baseCode: 4801},
+        { validFlag: 1, baseCode: 4801 },
         { individualType: "json" }
       )
       .then((res) => {
@@ -812,8 +830,10 @@ export default {
       let timestamp = new Date().getTime() - 7 * 24 * 60 * 60 * 1000; // 默认前一周
 
       this.searchForm.times = [
-        this.getYNM(new Date(timestamp)) + " 00:00:00",
-        this.getYNM(new Date()) + " 23:59:59",
+        this.getYNM(new Date(timestamp)),
+        this.getYNM(new Date()),
+        // this.getYNM(new Date(timestamp)) + " 00:00:00",
+        // this.getYNM(new Date()) + " 23:59:59",
       ];
       this.searchData();
     },
@@ -1332,15 +1352,19 @@ export default {
     },
     // 未审核
     Data4() {
-      let startTime = "";
-      let endTime = "";
-      if (!this.searchForm.times) {
-        startTime = "";
-        endTime = "";
-      } else {
-        startTime = this.searchForm.times[0];
-        endTime = this.searchForm.times[1];
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.searchForm.times[0] === null ? null : (this.searchForm.times[0] + ' 00:00:00')
+      endTime = this.searchForm.times[1] === null ? null : (this.searchForm.times[1] + ' 23:59:59')
+      // let startTime = "";
+      // let endTime = "";
+      // if (!this.searchForm.times) {
+      //   startTime = "";
+      //   endTime = "";
+      // } else {
+      //   startTime = this.searchForm.times[0];
+      //   endTime = this.searchForm.times[1];
+      // }
       let obj = {
         object: {
           matName: this.searchForm.matName,
@@ -1354,7 +1378,7 @@ export default {
         pageIndex: this.pageIndex4,
         startTime: startTime,
         endTime: endTime,
-        deptName:this.searchForm.type
+        deptName: this.searchForm.type
       };
       this.tableLoading4 = true;
       this.axios
@@ -1395,15 +1419,19 @@ export default {
       this.glDialog.totalPage = this.glDialog.totalPage - 1;
     },
     Data5() {
-      let startTime = "";
-      let endTime = "";
-      if (!this.searchForm.times) {
-        startTime = "";
-        endTime = "";
-      } else {
-        startTime = this.searchForm.times[0];
-        endTime = this.searchForm.times[1];
-      }
+      let startTime = null;
+      let endTime = null;
+      startTime = this.searchForm.times[0] === null ? null : (this.searchForm.times[0] + ' 00:00:00')
+      endTime = this.searchForm.times[1] === null ? null : (this.searchForm.times[1] + ' 23:59:59')
+      // let startTime = "";
+      // let endTime = "";
+      // if (!this.searchForm.times) {
+      //   startTime = "";
+      //   endTime = "";
+      // } else {
+      //   startTime = this.searchForm.times[0];
+      //   endTime = this.searchForm.times[1];
+      // }
       let obj = {
         object: {
           matName: this.searchForm.matName,
@@ -1417,7 +1445,7 @@ export default {
         pageIndex: this.pageIndex42,
         startTime: startTime,
         endTime: endTime,
-        deptName:this.searchForm.type
+        deptName: this.searchForm.type
       };
       this.tableLoading42 = true;
       this.axios

src/views/resourceManager/components/goodsMangement/goodsMangementruku.vue

@@ -496,8 +496,8 @@ export default {
       let startTime = ''
       let endTime = ''
       if (!this.search.times) {
-        // startTime = null
-        // endTime = null
+        startTime = null
+        endTime = null
       } else {
         startTime = this.search.times[0]
         endTime = this.search.times[1]

src/views/sampleManager/components/sampleTrack/sampleTrack.vue

@@ -414,6 +414,22 @@
                   label="三审审核时间"
                   align="center"
                 ></el-table-column>
+                <el-table-column
+                  sortable
+                  :show-overflow-tooltip="true"
+                  min-width="100px"
+                  prop="auditMan2"
+                  label="四审审核人"
+                  align="center"
+                ></el-table-column>
+                <el-table-column
+                  sortable
+                  :show-overflow-tooltip="true"
+                  min-width="100px"
+                  prop="auditTime2"
+                  label="四审审核时间"
+                  align="center"
+                ></el-table-column>
                 <el-table-column
                   :show-overflow-tooltip="true"
                   sortable