Merge branch 'master' of https://git.steerinfo.com/beiHaiYunWei-lims/beiHai-ui

cors.js

@@ -13,7 +13,7 @@ module.exports = {
       // target: 'http://172.22.4.6:20002/auth',
       //target: url + '/auth',
       //target: 'https://172.16.4.162/icore.icp.web/pass/auth',
-      target:'http://172.16.4.162/icore.icp.web/pass/auth',
+      target: 'http://172.16.4.162/icore.icp.web/pass/auth',
       changeOrigin: true,
       pathRewrite: {
         '^/icore.icp.web/pass/auth': '/'
@@ -90,20 +90,20 @@ module.exports = {
       }
     },
      '/icore.icp.web/pass/testManagement/v1': {
-       // target: 'http://172.22.4.6:9006/v1', // 加https
-       // target: 'http://prod-lims-test/v1', //
+      //  target: 'http://172.22.4.6:9006/v1', // 加https
+      //  target: 'http://prod-lims-test/v1', //
       //  target: 'http://localhost:9001/v1', //加http
        target: 'http://172.16.4.162', // 加https
        // target: 'https://lims-bnusiness-dev.steerinfo.com/v1', //加https
        changeOrigin: true
      },
-    // '/icore.icp.web/pass/testManagement/v1': {
-    //    target: 'http://127.0.0.1:9001/v1', // 加https
-    //    changeOrigin: true,
-    //    pathRewrite: {
-    //    '^/icore.icp.web/pass/testManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-    //  // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/ 
-    //   }
+    // '/icore.icp.web/pass/testManagement/v1': {
+    //   target: 'http://127.0.0.1:9001/v1', // 加https
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/testManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+    //     // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/ 
+    //   }
     // },
     '/icore.icp.web/pass/mqtt/v1': {
       // target: 'http://172.22.4.6:9006/v1', // 加https
@@ -126,6 +126,7 @@ module.exports = {
     // },
     '/icore.icp.web/pass/baseManagement/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
@@ -136,7 +137,7 @@ module.exports = {
       // target: 'http://168.168.44.214:9004/v1',
       // target: 'http://172.22.42.233:9004/v1',
       target: 'http://172.16.4.162', //加http
-      // target: 'http://localhost:9004/v1', //加http
+      // target: 'http://localhost:9002/v1', //加http
       // target: 'http://192.168.3.113:9004/v1', //加http
       // target: 'http://168.168.44.214:9004/v1', //加http
       // target: 'http://jc1.steerinfo.com/v1', //加http

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,

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

@@ -210,10 +210,10 @@
           </div>
           <!-- 物品入库表表格 -->
           <div class="common-table-div" style="margin-bottom:0;margin-top:0">
-            <el-table v-loading="dataLoading3" ref="dataTable3" border :height="height_bot" highlight-current-row
+            <el-table v-loading="dataLoading3" ref="dataTable3" border :height="height_bot" highlight-current-row 
               @selection-change="handleSelectionChange3" :data="table.list3" :icore-filter-flag="icoreFilterFlag"
               :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName3" @row-click="getRowCheck2"
-              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' }, }">
+              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' }, }" show-summary :summary-method="getSummaries1">
               <el-table-column type="index" label="NO" fixed="left" align="center"></el-table-column>
               <el-table-column type="selection" width="55" fixed="left" align="center"></el-table-column>
               <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" label="数据状态" align="center">
@@ -829,6 +829,45 @@ export default {
           })
         })
     },
+     getSummaries1(param) {
+      let unit=null;
+            const { columns, data } = param;
+            const sums = [];
+            columns.forEach((column, index) => {
+              
+                if (index === 0) {
+                    sums[index] = '合计';
+                    return;
+                }
+                if(column.property==='stuffUnit') {
+                  console.log('unit column ',column)
+                  console.log('unit data ',data)
+                  unit=data[0].stuffUnit;
+                }
+                if (column.property && column.property === 'qtyInstk') {
+                    console.log('getSummaries qtyInstk column:', column)
+                    const values = data.map(item => {
+                        const num = Number(item[column.property]);
+                        return isNaN(num) ? NaN : num;
+                    });
+                    console.log('getSummaries  values:', values)
+                    if (!values.every(value => {
+                      console.log('getSummaries value:',value)
+                      isNaN(value)
+                    })) {
+                        const total = values.reduce((prev, curr) => {
+                            return isNaN(curr) ? prev : prev + curr; 
+                        }, 0);
+                        sums[index] = total + unit;
+                    } else {
+                        sums[index] = 'N/A'; 
+                    }
+                } else {
+                    sums[index] = '';
+                }
+            });
+            return sums;
+        },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
@@ -1702,6 +1741,7 @@ export default {
       }
     },
     getAllListByEmpNo(val) {
+      // console.log('click   ....',val)
       // this.$refs.dataTable.toggleRowSelection(val,true)
       this.getDataList2(val.stuffNo)
       this.getDataList3(val.stuffNo)
@@ -1858,6 +1898,7 @@ export default {
         });
     },
     getDataList2(stuffNo) {
+      console.log
       this.dataLoading2 = true;
       if (stuffNo === null || stuffNo === '') {
         this.table.list2 = [];