695593266@qq.com 10 luni în urmă
părinte
comite
c5d42e9c03

+ 8 - 0
src/views/produce/components/jobBooking/index.vue

@@ -596,6 +596,14 @@
                   obj.pickOutInList = [];
 
                   console.log('赋值了');
+                } else if (
+                  this.clientEnvironmentId == 3 &&
+                  obj.singleReport == 0
+                ) {
+                  if (obj.pickOutInList && obj.pickOutInList.length != 0) {
+                    obj.semiProductList = obj.pickOutInList;
+                    obj.pickOutInList = [];
+                  }
                 } else if (this.taskObj.type == 6 && obj.singleReport == 0) {
                   obj.product = obj.pickOutInList;
                   obj.pickOutInList = [];

+ 6 - 6
src/views/produce/components/outsourcing/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="index_box">
     <div class="c_header_title">
-      <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
+      <!-- <el-tabs type="card" v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="委外记录" name="1"></el-tab-pane>
-        <el-tab-pane label="请托记录" name="2"></el-tab-pane>
-        <!-- <div class="c_title">委外记录</div>
+        <el-tab-pane label="请托记录" name="2"></el-tab-pane> -->
+      <!-- <div class="c_title">委外记录</div>
         <div class="c_title">委外记录</div> -->
-      </el-tabs>
-      <!-- <div class="c_title">委外记录</div> -->
+      <!-- </el-tabs> -->
+      <div class="c_title">委外记录</div>
     </div>
-    <div v-if="activeName == '1'">
+    <div>
       <el-form
         label-width="100px"
         :rules="rules"

+ 7 - 7
src/views/produce/components/workPlan/index.vue

@@ -498,13 +498,13 @@
       },
 
       async openEdit(type, row) {
-        // if (type == 'edit') {
-        //   const code = await verificationQualityInspector(row.id);
-        //   if (code == '-1') {
-        //     console.log('不是报工人');
-        //     return;
-        //   }
-        // }
+        if (type == 'edit') {
+          const code = await verificationQualityInspector(row.id);
+          if (code == '-1') {
+            console.log('不是报工人');
+            return;
+          }
+        }
 
         const req = {
           workOrderId: row.id,