修改首件两检的bug

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

@@ -218,6 +218,14 @@
           <el-tag v-if="row.status == 3">已完成</el-tag>
         </template>
 
+        <template v-slot:toolList="{ row }">
+          <div v-if="row.toolList && row.toolList.length != 0">
+            <div v-for="item in row.toolList" :key="item.name">
+              {{ item.name }}
+            </div>
+          </div>
+        </template>
+
         <template v-slot:havePleaseEntrust="{ row }">
           <el-tag v-if="row.havePleaseEntrust == 1">是</el-tag>
           <el-tag v-else>否</el-tag>
@@ -448,6 +456,13 @@
             label: '工艺参数',
             minWidth: 340
           },
+          {
+            prop: 'toolList',
+            slot: 'toolList',
+            align: 'center',
+            label: '工具名称',
+            minWidth: 120
+          },
           {
             prop: 'havePleaseEntrust',
             slot: 'havePleaseEntrust',

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

@@ -8,7 +8,7 @@
     v-if="visible"
     append-to-body
     custom-class="ele-dialog-form"
-    width="70vw"
+    width="90vw"
   >
     <el-form
       ref="form"
@@ -126,6 +126,14 @@
           <el-tag v-if="row.status == 3">已完成</el-tag>
         </template>
 
+        <template v-slot:toolList="{ row }">
+          <div v-if="row.toolList && row.toolList.length != 0">
+            <div v-for="item in row.toolList" :key="item.name">
+              {{ item.name }}
+            </div>
+          </div>
+        </template>
+
         <template v-slot:havePleaseEntrust="{ row }">
           <el-tag v-if="row.havePleaseEntrust == 1">是</el-tag>
           <el-tag v-else>否</el-tag>
@@ -299,6 +307,13 @@
             label: '工艺参数',
             minWidth: 280
           },
+          {
+            prop: 'toolList',
+            slot: 'toolList',
+            align: 'center',
+            label: '工具名称',
+            minWidth: 120
+          },
           {
             prop: 'havePleaseEntrust',
             slot: 'havePleaseEntrust',

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

@@ -215,7 +215,7 @@
               ? this.produceTaskInfo?.id
               : this.workOrder?.taskId,
             ...(isSourceTask
-              ? { type: 2, assigneedId: this.workOrder?.id }
+              ? { type: 2, assigneeId: this.workOrder?.id }
               : { workOrderId: this.workOrder?.id })
           };
 

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: {