695593266@qq.com hace 5 meses
padre
commit
8a7bba6d7a
Se han modificado 3 ficheros con 31 adiciones y 5 borrados
  1. 8 2
      src/views/taskList/components/Ddtails.vue
  2. 21 1
      src/views/taskList/index.vue
  3. 2 2
      vue.config.js

+ 8 - 2
src/views/taskList/components/Ddtails.vue

@@ -234,7 +234,10 @@
           qualifiedQuantity: '',
           remark: '',
           reportQuantity: '',
-          lossQuantity: ''
+          lossQuantity: '',
+          workOrderCode: '',
+          workOrderId: '',
+          taskId: ''
         },
         rules: {
           // qualifiedQuantity: [
@@ -358,7 +361,10 @@
           qualifiedQuantity: '',
           remark: '',
           reportQuantity: '',
-          lossQuantity: ''
+          lossQuantity: '',
+          workOrderCode: '',
+          workOrderId: '',
+          taskId: ''
         };
         this.$refs.form.resetFields();
         this.detailsVisible = false;

+ 21 - 1
src/views/taskList/index.vue

@@ -90,6 +90,22 @@
             >报工
           </el-link>
 
+          <el-link
+            :underline="false"
+            type="primary"
+            @click="selfRequest(row)"
+            v-if="
+              (row.disposalStatus == '1' &&
+                row.hasFirstArticleDualInspection == '0' &&
+                tabValue != '4') ||
+              (row.disposalStatus == '1' &&
+                row.totalFirstArticleDualInspectionStatus == 2 &&
+                row.hasFirstArticleDualInspection == '1' &&
+                tabValue != '4')
+            "
+            >首工两检详情
+          </el-link>
+
           <el-link
             :underline="false"
             type="primary"
@@ -862,6 +878,7 @@
           assignCode: row.assignCode,
           mesWorkOrderCode: row.mesWorkOrderCode,
           workOrderCode: row.workOrderCode,
+          workOrderId: row.workOrderId,
           productionPlanCode: row.productionPlanCode,
           produceRoutingName: row.produceRoutingName,
           formingNum: row.formingNum,
@@ -903,7 +920,10 @@
           reportQuantity: row.reportQuantity
             ? remainingQuantity
             : row.formingNum,
-          lossQuantity: 0
+          lossQuantity: 0,
+          workOrderCode: row.workOrderCode,
+          workOrderId: row.workOrderId,
+          taskId: row.taskId
         };
         if (this.tabValue == '4') {
           const data = {

+ 2 - 2
vue.config.js

@@ -32,9 +32,9 @@ 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:18186',
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',