xiugai1

cors.js

@@ -89,22 +89,22 @@ module.exports = {
         '^/icore-api': '/'
       }
     },
-     '/icore.icp.web/pass/testManagement/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://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/mqtt/v1': {
       // target: 'http://172.22.4.6:9006/v1', // 加https
       // target: 'http://prod-lims-test/v1', // 加https
@@ -114,22 +114,22 @@ module.exports = {
         '^/icore.icp.web/pass/mqtt/v1': '/'
       }
     },
-    // '/icore.icp.web/pass/baseManagement/v1': {
-    //   target: 'http://localhost:9002/v1', // 正式
-    //   // target: 'http://192.168.3.165:9002/v1', // 加https
-    //   // target: 'https://jclims.steerinfo.com/v1',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/baseManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-    //     // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-    //   }
-    // },
     '/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
+      changeOrigin: true,
+      pathRewrite: {
+        '^/icore.icp.web/pass/baseManagement/v1': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+        // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
+      }
     },
+    // '/icore.icp.web/pass/baseManagement/v1': {
+    //   target: 'http://172.16.4.162', // 正式
+    //   // target: 'http://192.168.3.165:9002/v1', // 加https
+    //   // target: 'https://jclims.steerinfo.com/v1',
+    //   changeOrigin: true
+    // },
     '/icore.icp.web/pass/systemBase/v1': {
       // target: 'http://168.168.45.55:9002/v1',
       // target: 'http://192.168.3.38:9004/v1',
@@ -205,7 +205,7 @@ module.exports = {
   },
   // devModules: ['index', 'reportForm','workFlow', 'systemConfig', 'demo', 'taskManagement', 'batchManagement', 'programManagement', 'entrustedManagement', 'screeningTests','sampleManagement', 'sampleManager', 'samplePreparationTask','approveManagement','weightingManagement','testAnalysis','decideManagement','commodityInspection', 'exceptionManagement', 'certificateManagement', 'standardManagement', 'resourceManager']
   //devModules: ['reportForm', 'screeningTests', 'index',  'entrustedManagement','measurementDataManagement', 'approveManagement', 'testAnalysis', 'resourceManager', 'taskManagement']
- devModules: ['all']
+//  devModules: ['all']
 //  devModules:['index']
-//  devModules:['index','testAnalysis','reportForm']
+ devModules:['index','testAnalysis']
 }

src/views/reportForm/components/chemicalAnalysisReport.vue

@@ -88,7 +88,7 @@
               <template slot-scope="scope">
                 <span :style="redStyle(scope.row.SA_ID, col.ANLY_ITEM_NO)">{{
                   scope.row[col.ANLY_ITEM_NO]
-                  }}</span>
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="UPDATE_TIME"
@@ -225,6 +225,7 @@ export default {
       recallList: [],
       theight2: 0,
       recallSelectionList: [],
+      clickMap: {}
     };
   },
   created() {
@@ -323,7 +324,8 @@ export default {
         validFlag: 1,
         startTime: startTime,
         endTime: endTime,
-        matName: this.search.matName
+        matName: this.clickMap.MAT_NAME || this.search.matName,
+        matNo: this.clickMap.MAT_NO,
       };
       this.dataLoading = true;
       this.axios
@@ -339,12 +341,17 @@ export default {
             }
             this.table.list1 = res.data.badyData.list;
             if (this.table.list1 != null && this.table.list1.length > 0) {
-              this.table.list = res.data.badyData.list[0].sampleResults
+              if (Object.keys(this.clickMap).length === 0) {
+                this.table.list = res.data.badyData.list[0].sampleResults
+              }
             } else {
-              this.table.list = []
+              if (Object.keys(this.clickMap).length === 0) {
+                this.table.list = []
+              }
             }
             this.page.totalPage = res.data.badyData.total;
             this.redDataCk = res.data.redMap || {};
+            // this.clickMap = {}
           } else {
             this.$message.error(res.message);
           }
@@ -525,7 +532,7 @@ export default {
       });
     },
     handleCurrentChange(row) {
-      this.search.matName = row.MAT_NAME;
+      this.clickMap = JSON.parse(JSON.stringify(row))
       this.searchData();
     },
     tableHeaderCellStyle() {

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

@@ -1062,11 +1062,19 @@ export default {
         return;
       }
       let tt = false;
+      let userVilidate = false;
       this.multipleSelection5.forEach(s => {
         if (s.state == '1') {
           tt = true;
         }
+        if(username === s.createMan) {
+          userVilidate = true;
+        }
       })
+      if(userVilidate) {
+        this.$message.warning('存在数据的创建人与当前用户一致,请重新勾选！')
+        return;
+      }
       if (tt) {
         this.$message.warning('请勾选未验收的数据！')
         return;