新增查询字段

cors.js

@@ -125,8 +125,8 @@ module.exports = {
     //   }
     // },
     '/icore.icp.web/pass/baseManagement/v1': {
-      // target: 'http://172.16.4.162', // 正式
-      target: 'http://localhost:9002/v1', // 正式
+      target: 'http://172.16.4.162', // 正式
+      // target: 'http://localhost:9002/v1', // 正式
       // target: 'http://192.168.3.165:9002/v1', // 加https
       // target: 'https://jclims.steerinfo.com/v1',
       changeOrigin: true

src/views/approveManagement/components/threeApprove.vue

@@ -16,6 +16,14 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="委托编号">
+          <el-input v-model="searchForm.carNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入查询编号"
+            style="width: 150px" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="中心编号">
+          <el-input v-model="searchForm.sampleNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入查询编号"
+            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"
             placeholder="开始日期" size="mini" style="width: 140px" :default-time="'00:00:00'">
@@ -191,12 +199,12 @@
       <el-col :span="14">
         <el-tabs type="border-card" v-model="activeName2">
           <el-tab-pane :label="analyzeVal.matName
-              ? '【 ' +
-              analyzeVal.matName +
-              ' 】 - 【 ' +
-              analyzeVal.testItemName +
-              ' 】'
-              : '未选择数据'
+            ? '【 ' +
+            analyzeVal.matName +
+            ' 】 - 【 ' +
+            analyzeVal.testItemName +
+            ' 】'
+            : '未选择数据'
             " name="first2">
             <div style="height: auto; padding-top: 1px" class="common-title-div">
               <div class="common-title-name">
@@ -389,6 +397,8 @@ export default {
         matName: "",
         sampleTypeCode: "",
         eqpNo: "",
+        carNo: "",
+        sampleNo: ""
       },
       autoCollData: {
         eqpTypeCode: "",
@@ -1328,6 +1338,8 @@ export default {
         object: {
           matName: this.searchForm.matName,
           sampleTypeCode: this.searchForm.sampleTypeCode,
+          sampleNo: this.searchForm.sampleNo,
+          carNo: this.searchForm.carNo
         },
         list: "4",
         list2: [484003], // 测试分析模块
@@ -1388,6 +1400,8 @@ export default {
         object: {
           matName: this.searchForm.matName,
           sampleTypeCode: this.searchForm.sampleTypeCode,
+          sampleNo: this.searchForm.sampleNo,
+          carNo: this.searchForm.carNo
         },
         list: [5], // 查询已审
         list2: [484003], // 测试分析模块

src/views/entrustedManagement/components/inspectionProudects/inspectionProudects.vue

@@ -18,6 +18,14 @@
           <el-input v-model="search.batchNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
             style="width: 200px; margin-right: 10px"></el-input>
         </el-form-item>
+        <el-form-item label="委托编号">
+          <el-input v-model="search.carNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 200px; margin-right: 10px" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="中心编号">
+          <el-input v-model="search.sampleNo" size="small" @keyup.enter.native="searchData()" placeholder="请输入查询内容"
+            style="width: 200px; margin-right: 10px" clearable></el-input>
+        </el-form-item>
         <el-form-item label="委托日期">
           <el-date-picker v-model="search.times[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
             placeholder="开始日期" size="mini" style="width: 140px">
@@ -562,6 +570,9 @@ export default {
         times: [],
         planCompanyName: "",
         matName: "",
+        carNo:"",
+        sampleNo:""
+        
       },
       height_top: 0,
       height_bot: 0,
@@ -1265,8 +1276,10 @@ export default {
           entrOrgNo: this.search.planCompanyNo, // 委托单位
           matName: this.search.matName,
           batchNo: this.search.batchNo,
+          carNo: this.search.carNo,
           validFlag: "1",
         },
+        sampleNo: this.search.sampleNo,
         pageIndex: this.page.pageNum,
         pageSize: this.page.pageSize,
         startTime: startTime,
@@ -1321,8 +1334,10 @@ export default {
           entrOrgNo: this.search.planCompanyNo, // 委托单位
           matName: this.search.matName,
           batchNo: this.search.batchNo,
+          carNo: this.search.carNo,
           validFlag: "0",
         },
+        sampleNo: this.search.sampleNo,
         pageIndex: this.page.pageNum,
         pageSize: this.page.pageSize,
         startTime: startTime,