任务2修改更新

beiHai-ui.code-workspace

@@ -0,0 +1,11 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "src/views/approveManagement/components"
+		}
+	],
+	"settings": {}
+}

cors.js

@@ -1,212 +1,212 @@
-let url = 'http://172.16.4.162/icore.icp.web/pass'
-module.exports = {
-  proxyTable: {
-    '/icore.icp.web/pass/v1': {
-      target: url + '/v1', //加http
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
-    '/icore.icp.web/pass/auth': {
-      // 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',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/auth': '/'
-      }
-    },
-    '/icore.icp.web/pass/logout': {
-      target: url + '/logout',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/logout': '/'
-      }
-    },
-    // '/icore.icp.web/pass/configCenter': {
-    //   target: 'http://dev-config.steerinfo.com/configCenter',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/configCenter': '/'
-    //   }
-    // },
-    '/icore.icp.web/restPassword': {
-      target: url,
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/restPassword': '/'
-      }
-    },
-    // '/icore.icp.web/pass/serviceCenter': {
-    //   target: 'http://dev-govern.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/serviceCenter': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/act': {
-    //   target: 'http://dev-act.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/act': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/job': {
-    //   target: 'http://dev-job.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/job': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/dd': {
-    //   target: 'http://dd.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/dd': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/apiauth': {
-    //   target: 'http://auth.steerinfo.com',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/apiauth': '/'
-    //   }
-    // },
-    // '/icore.icp.web/pass/websocket': {
-    //   target: 'http://websocket.steerinfo.com/',
-    //   changeOrigin: true,
-    //   pathRewrite: {
-    //     '^/icore.icp.web/pass/websocket': '/'
-    //   }
-    // },
-    '/icore-api': {
-      target: 'http://172.16.4.162/icore.icp.web/pass/',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/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/mqtt/v1': {
-      // target: 'http://172.22.4.6:9006/v1', // 加https
-      // target: 'http://prod-lims-test/v1', // 加https
-      target: 'http://172.16.4.162:9410/v1', // 加https
-      // target: 'https://lims-business-dev.steerinfo.com/v1', //加https
-      pathRewrite: {
-        '^/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
-    },
-    '/icore.icp.web/pass/systemBase/v1': {
-      // target: 'http://168.168.45.55:9002/v1',
-      // target: 'http://192.168.3.38:9004/v1',
-      // 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: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
-      changeOrigin: true,
-    },
-    '/weblib': {
-      target: 'http://172.22.42.2/',
-      // target: 'http://172.22.4.2:9004/v1', //加http
-      // target: 'http://jc1.steerinfo.com/v1', //加http
-      changeOrigin: true,
-      pathRewrite: {
-        '^/weblib': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
-    // 文件系统-上传下载
-    '/icore.icp.web/pass/seaweedfs/v1/download': {
-      target: 'http://172.22.4.6:30888',
-      // target: 'http://oss-filer.icore-oss.svc.cluster.local:8888', // 正式
-      changeOrigin: true,
-      pathRewrite: {
-        '^/icore.icp.web/pass/seaweedfs/v1/download': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-        // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
-      }
-    },
-    // 报表地址代理
-    '/webroot/decision': {
-      target: 'http://172.22.4.5:8080/webroot/decision',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/file': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/oss-volume-0': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/oss-volume-1': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    },
-    // 文件上传地址代理
-    '/icore.icp.web/oss-volume-2': {
-      target: 'http://lims.jnmc.com',
-      changeOrigin: true,
-      pathRewrite: {
-        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
-      }
-    }
-  },
-  // 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:['index']
-  devModules: ['index', 'approveManagement', 'entrustedManagement', 'resourceManager', 'systemConfig']
-}
+let url = 'http://172.16.4.162/icore.icp.web/pass'
+module.exports = {
+  proxyTable: {
+    '/icore.icp.web/pass/v1': {
+      target: url + '/v1', //加http
+      changeOrigin: true,
+      pathRewrite: {
+        '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+        // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
+      }
+    },
+    '/icore.icp.web/pass/auth': {
+      // 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',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/icore.icp.web/pass/auth': '/'
+      }
+    },
+    '/icore.icp.web/pass/logout': {
+      target: url + '/logout',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/icore.icp.web/pass/logout': '/'
+      }
+    },
+    // '/icore.icp.web/pass/configCenter': {
+    //   target: 'http://dev-config.steerinfo.com/configCenter',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/configCenter': '/'
+    //   }
+    // },
+    '/icore.icp.web/restPassword': {
+      target: url,
+      changeOrigin: true,
+      pathRewrite: {
+        '^/icore.icp.web/restPassword': '/'
+      }
+    },
+    // '/icore.icp.web/pass/serviceCenter': {
+    //   target: 'http://dev-govern.steerinfo.com',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/serviceCenter': '/'
+    //   }
+    // },
+    // '/icore.icp.web/pass/act': {
+    //   target: 'http://dev-act.steerinfo.com',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/act': '/'
+    //   }
+    // },
+    // '/icore.icp.web/pass/job': {
+    //   target: 'http://dev-job.steerinfo.com',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/job': '/'
+    //   }
+    // },
+    // '/icore.icp.web/pass/dd': {
+    //   target: 'http://dd.steerinfo.com',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/dd': '/'
+    //   }
+    // },
+    // '/icore.icp.web/pass/apiauth': {
+    //   target: 'http://auth.steerinfo.com',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/apiauth': '/'
+    //   }
+    // },
+    // '/icore.icp.web/pass/websocket': {
+    //   target: 'http://websocket.steerinfo.com/',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/icore.icp.web/pass/websocket': '/'
+    //   }
+    // },
+    '/icore-api': {
+      target: 'http://172.16.4.162/icore.icp.web/pass/',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/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/mqtt/v1': {
+    //   // target: 'http://172.22.4.6:9006/v1', // 加https
+    //   // target: 'http://prod-lims-test/v1', // 加https
+    //   target: 'http://172.16.4.162:9410/v1', // 加https
+    //   // target: 'https://lims-business-dev.steerinfo.com/v1', //加https
+    //   pathRewrite: {
+    //     '^/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
+    },
+    '/icore.icp.web/pass/systemBase/v1': {
+      // target: 'http://168.168.45.55:9002/v1',
+      // target: 'http://192.168.3.38:9004/v1',
+      // 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: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
+      changeOrigin: true,
+    },
+    '/weblib': {
+      target: 'http://172.22.42.2/',
+      // target: 'http://172.22.4.2:9004/v1', //加http
+      // target: 'http://jc1.steerinfo.com/v1', //加http
+      changeOrigin: true,
+      pathRewrite: {
+        '^/weblib': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+        // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
+      }
+    },
+    // 文件系统-上传下载
+    '/icore.icp.web/pass/seaweedfs/v1/download': {
+      target: 'http://172.22.4.6:30888',
+      // target: 'http://oss-filer.icore-oss.svc.cluster.local:8888', // 正式
+      changeOrigin: true,
+      pathRewrite: {
+        '^/icore.icp.web/pass/seaweedfs/v1/download': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+        // 比如我要调用'https://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
+      }
+    },
+    // 报表地址代理
+    '/webroot/decision': {
+      target: 'http://172.22.4.5:8080/webroot/decision',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      }
+    },
+    // 文件上传地址代理
+    '/icore.icp.web/file': {
+      target: 'http://lims.jnmc.com',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      }
+    },
+    // 文件上传地址代理
+    '/icore.icp.web/oss-volume-0': {
+      target: 'http://lims.jnmc.com',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      }
+    },
+    // 文件上传地址代理
+    '/icore.icp.web/oss-volume-1': {
+      target: 'http://lims.jnmc.com',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      }
+    },
+    // 文件上传地址代理
+    '/icore.icp.web/oss-volume-2': {
+      target: 'http://lims.jnmc.com',
+      changeOrigin: true,
+      pathRewrite: {
+        '^/webroot/decision': '/' // 这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      }
+    }
+  },
+  // 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:['index']
+  devModules: ['index', 'approveManagement', 'entrustedManagement', 'resourceManager', 'systemConfig']
+}

src/views/approveManagement/components/fourApprove.vue

@@ -41,6 +41,10 @@
             </el-option>
           </el-select>
         </el-form-item> -->
+        <el-form-item label="委托编号">
+          <el-input v-model="search.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="search.sampleNo" @keyup.enter.native="searchData()" size="small" placeholder="请输入中心编号样号查询"
             style="width: 150px"></el-input>
@@ -587,6 +591,7 @@ export default {
         sectionNo: "",
         matClassNo: "",
         matNo: "",
+        carNo: "",
         sampleTypeCode: "",
         matName: "",
         times: "",
@@ -1234,6 +1239,7 @@ export default {
           sectionNo: this.search.sectionNo,
           sampleNo: this.search.sampleNo,
         },
+        carNo: this.search.carNo,
         list: [4],
         mode: this.search.matClassNo,
         startTime: startTime,
@@ -1280,6 +1286,7 @@ export default {
           sectionNo: this.search.sectionNo,
           sampleNo: this.search.sampleNo,
         },
+        carNo: this.search.carNo,
         list: [5],
         mode: this.search.matClassNo,
         startTime: startTime,

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

@@ -63,9 +63,11 @@
           align="center"></el-table-column>
         <el-table-column sortable :show-overflow-tooltip="true" min-width="140px" prop="unitPrice" label="标准单价（元）"
           align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="totalStuffQty" label="库存数量"
           align="center"></el-table-column>
-        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" label="数据状态" align="center">
+          <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="memo" label="备注"
+          align="center"></el-table-column>
+        <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="validFlag" label="数据状态" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.validFlag == 1">已启用</span>
             <span v-else-if="scope.row.validFlag == 0">已停用</span>
@@ -122,10 +124,11 @@
             <el-table v-loading="dataLoading2" ref="dataTable2" border :height="height_bot" highlight-current-row
               @selection-change="handleSelectionChange2" :data="table.list2" :icore-filter-flag="icoreFilterFlag"
               :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName2" @row-click="getRowCheck"
-              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' }, }">
+              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' },'state':{'0':'未验收','1':'已验收'} }"
+              :summary-method="getSummaries3" show-summary>
               <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="100px" label="数据状态" align="center">
+              <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="validFlag" label="数据状态" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.validFlag == 1">已启用</span>
                   <span v-else-if="scope.row.validFlag == 0">已停用</span>
@@ -213,19 +216,19 @@
             <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': '已启用' }, }" show-summary :summary-method="getSummaries1">
+              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' },'state':{'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">
+              <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlag" label="数据状态" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.validFlag == 1">已启用</span>
                   <span v-else-if="scope.row.validFlag == 0">已停用</span>
                 </template>
               </el-table-column>
-              <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" label="" align="center">
+              <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="state" label="验收状态" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.state == 1">已验收</span>
-                  <span v-else-if="scope.row.state == 0">未验收</span>
+                  <span v-if="scope.row.state == '1'">已验收</span>
+                  <span v-else-if="scope.row.state == '0'">未验收</span>
                 </template>
               </el-table-column>
               <el-table-column sortable :show-overflow-tooltip="true" min-width="130px" prop="inId" label="入库记录号"
@@ -318,11 +321,11 @@
           <div class="common-table-div" style="margin-bottom:0;margin-top:0">
             <el-table v-loading="dataLoading4" ref="dataTable4" border :height="height_bot" highlight-current-row
               @selection-change="handleSelectionChange4" :data="table.list4" :icore-filter-flag="icoreFilterFlag"
-              :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName4" @row-click="getRowCheck3"
-              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' }, }">
+              :header-cell-style="tableHeaderCellStyle" :cell-class-name="tableRowClassName4" @row-click="getRowCheck3" show-summary :summary-method="getSummaries2"
+              :exchangeFilterMap="{ 'validFlag': { '0': '已停用', '1': '已启用' },'state':{'0':'未验收','1':'已验收'} }">
               <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">
+              <el-table-column sortable :show-overflow-tooltip="true" min-width="80px" prop="validFlag" label="数据状态" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.validFlag == 0">无效</span>
                   <span v-else-if="scope.row.state == 1">已审批</span>
@@ -359,10 +362,10 @@
                 align="center"></el-table-column>
               <el-table-column sortable :show-overflow-tooltip="true" min-width="130px" prop="stkId" label="库存记录号"
                 align="center"></el-table-column>
-              <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" label="是否有效" align="center">
+              <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="validFlag" label="是否有效" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.validFlag == 1">已启用</span>
-                  <span v-else-if="scope.row.validFlag == 0">已停用</span>
+                  <span v-if="scope.row.validFlag == '1'">已启用</span>
+                  <span v-else-if="scope.row.validFlag == '0'">已停用</span>
                 </template>
               </el-table-column>
               <el-table-column sortable :show-overflow-tooltip="true" min-width="120px" prop="createMan" label="创建人"
@@ -609,7 +612,7 @@
                   <span v-else>未确认</span>
                 </template>
               </el-table-column>
-              <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" label="数据状态" align="center">
+              <el-table-column sortable :show-overflow-tooltip="true" min-width="100px" prop="validFlag" label="数据状态" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.validFlag == 1">已启用</span>
                   <span v-else-if="scope.row.validFlag == 0">已停用</span>
@@ -829,6 +832,86 @@ export default {
           })
         })
     },
+    // qtyOutstk
+     getSummaries3(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 === 'stuffQty') {
+                    console.log('getSummaries stuffQty 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;
+        },
+    // qtyOutstk
+     getSummaries2(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 === 'qtyOutstk') {
+                    console.log('getSummaries qtyOutstk 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;
+        },
      getSummaries1(param) {
       let unit=null;
             const { columns, data } = param;
@@ -869,8 +952,21 @@ export default {
             return sums;
         },
     getSummaries(param) {
+      // totalStuffQty
       const { columns, data } = param;
       const sums = [];
+      const unitGroups = {}; 
+      data.forEach(item => {
+        const unit = item.stuffUnit; 
+        const qty = Number(item.totalStuffQty); 
+        if (!isNaN(qty) && unit) { 
+          if (unitGroups[unit]) {
+            unitGroups[unit] += qty; 
+          } else {
+            unitGroups[unit] = qty;
+          }
+        }
+      });
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '合计';
@@ -879,6 +975,12 @@ export default {
         if (index === 1) {
           sums[index] = data.length;
         }
+        if (column.property === 'totalStuffQty') {
+          const unitSummary = Object.entries(unitGroups).map(([unit, total]) => {
+            return `${total} ${unit}`; // 拼接单位和总和
+          }).join(', '); // 用逗号分隔多个单位
+          sums[index] = unitSummary || 'N/A'; // 无数据时显示 N/A
+        } 
       });
       return sums;
     },
@@ -986,6 +1088,7 @@ export default {
         '&pageSize=' + this.page.pageSize + '&stuffTypeName=' + this.search.stuffTypeName + '&stuffName=' + this.search.stuffName +
         '&startTime=' + startTime + '&endTime=' + endTime + '&searchData=' + '1')
         .then(res => {
+          console.log('searchData   res:',res)
           this.dataLoading = false;
           this.table.list = res.data.list;
           this.page.totalPage = res.data.total;

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

@@ -427,9 +427,62 @@ export default {
           })
         })
     },
+    getSummaries2(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 === 'qtyOutstk') {
+          console.log('getSummaries qtyOutstk 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) {
+      // let unit = null;
       const { columns, data } = param;
       const sums = [];
+      const unitGroups = {}; 
+      data.forEach(item => {
+        const unit = item.stuffUnit; 
+        const qty = Number(item.qtyOutstk); 
+        if (!isNaN(qty) && unit) { 
+          if (unitGroups[unit]) {
+            unitGroups[unit] += qty; 
+          } else {
+            unitGroups[unit] = qty;
+          }
+        }
+      });
+      console.log('getSummaries column:', columns, 'data:', data)
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = '合计';
@@ -438,7 +491,14 @@ export default {
         if (index === 1) {
           sums[index] = data.length;
         }
-      });
+        console.log('getSummaries column:', column, 'data:', data)
+        if (column.property === 'qtyOutstk') {
+          const unitSummary = Object.entries(unitGroups).map(([unit, total]) => {
+            return `${total} ${unit}`; // 拼接单位和总和
+          }).join(', '); // 用逗号分隔多个单位
+          sums[index] = unitSummary || 'N/A'; // 无数据时显示 N/A
+        } 
+      })
       return sums;
     },
     // 页面刷新，重新加载表格数据