修改质检名称的显示和任务报工首件两检不显示的问题

src/views/produce/components/footBtn.vue

@@ -45,6 +45,12 @@
             bjColor: '#920077',
             isShow: 'mes:firstarticledualinspection'
           },
+          // {
+          //   name: '首件两检',
+          //   type: 'qualityInspection',
+          //   bjColor: '#920077',
+          //   isShow: 'mes:workorder:inspection'
+          // },
           {
             name: '产前准备',
             type: 'prenatalExamination',
@@ -282,7 +288,12 @@
             bjColor: '#920077',
             isShow: 'mes:firstarticledualinspection'
           },
-
+          // {
+          //   name: '首件两检',
+          //   type: 'qualityInspection',
+          //   bjColor: '#920077',
+          //   isShow: 'mes:taskorder:inspection'
+          // },
           {
             name: '报工',
             type: 'job',
@@ -290,6 +301,13 @@
             isShow: 'mes:workreport:save'
           },
 
+          // {
+          //   name: '报工',
+          //   type: 'job',
+          //   bjColor: '#157A2C',
+          //   isShow: 'mes:taskreport:save'
+          // },
+
           {
             name: 'BOM',
             type: 'bom',

src/views/produce/components/qualityInspection/components/selfInspectionReporting.vue

@@ -435,7 +435,7 @@
             align: 'center'
           },
           {
-            prop: 'categoryLevelClassName',
+            prop: 'inspectionName',
             label: '质检名称',
             showOverflowTooltip: true,
             align: 'center',

src/views/produce/components/qualityInspection/components/selfInspectionRequest.vue

@@ -286,7 +286,7 @@
           },
 
           {
-            prop: 'categoryLevelClassName',
+            prop: 'inspectionName',
             label: '质检名称',
             showOverflowTooltip: true,
             align: 'center',

src/views/produce/components/qualityInspection/index.vue

@@ -208,13 +208,15 @@
           const isSourceTask = this.type == 1;
 
           const params = {
-            workOrderId: this.workOrder?.id,
             produceTaskId: isSourceTask
               ? this.produceTaskInfo?.sourceTaskId
               : this.produceTaskInfo?.id,
             produceTaskInstanceId: isSourceTask
               ? this.produceTaskInfo?.id
-              : this.workOrder?.taskId
+              : this.workOrder?.taskId,
+            ...(isSourceTask
+              ? { type: 2, assigneedId: this.workOrder?.id }
+              : { workOrderId: this.workOrder?.id })
           };
 
           const { list = [] } = await getQualityInspectionList(params);

vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086', // 开发环境
@@ -45,7 +45,7 @@ module.exports = {
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://116.163.22.90:86/api', // 嘉实生产
-        // target: 'http://aiot.zoomwin.com.cn:51001/api',
+        target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://f222326r53.imwork.net',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {