123

src/views/page/Finish/detail.vue

@@ -128,6 +128,7 @@ export default {
     this.tableData = []
     // // const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
     // text = ['PG2023082800051','PG2023082800048','PG2023082800049']
+    // text=['PG2023083100056']
     text.forEach(v => {
       const data = {
         url: 'http://121.36.142.167:7774/jbl/api/module-data/dispatch_orders/page',

src/views/page/Finish/detailed.vue

@@ -56,9 +56,9 @@
             <div v-for="(_item, _index) in item.break" :key="_index"
               style="display: flex;flex-direction: column;gap: 1rem;margin-top: .5rem;">
               <div class="secd_input">
-                <div class="secd_input_l">不良品规格：</div>
+                <div class="secd_input_l">不良品缺陷：</div>
                 <div class="secd_input_r">
-                  <b-form-select id="input-3" v-model="_item.break_id" :options="breakList" class="inp select_list" required></b-form-select>
+                  <b-form-select id="input-3" v-model="_item.break_defect" :options="breakDefectList" class="inp select_list" required></b-form-select>
                 </div>
               </div>
               <div class="secd_input">
@@ -98,7 +98,8 @@ export default {
       employeeList: [],
       equipmentList: [],
       state: true,
-      breakList: []
+      breakList: [],
+      breakDefectList: []
     }
   },
   created () {
@@ -112,7 +113,7 @@ export default {
         "number": 0,
         "sorts": [],
         "rules": [],
-        "size": 15,
+        "size": 999,
         "specialConditions": [],
         "dynamicFormCode": "defective",
         "developmentSystemId": null,
@@ -120,7 +121,12 @@ export default {
       }
     }
     this.axios.post('/api/testdwy', { ...data2 }).then(res => {
-      this.breakList = res.data.content.filter(v => v.status)
+      this.breakList = res.data.content.filter(v => v.status).filter(c => c.defective_type === "REASON")
+      this.breakDefectList = res.data.content.filter(v => v.status).filter(c => c.defective_type === "DEFECT")
+      this.breakDefectList.forEach(v => {
+        v.value = v.defective_code
+        v.text = v.title
+      })
       this.breakList.forEach(v => {
         v.value = v.defective_code
         v.text = v.title
@@ -257,7 +263,8 @@ export default {
         v.break = [
           {
             break_id: '',
-            break_num: 0
+            break_num: 0,
+            break_defect:''
           }
         ]
       })
@@ -265,7 +272,8 @@ export default {
     handleBreakAdd (_index, item, index) {
       item.break.splice(_index + 1, 0, {
         break_id: '',
-        break_num: 0
+        break_num: 0,
+        break_defect:''
       })
       this.list.splice(index, 1, item)
     },
@@ -273,7 +281,8 @@ export default {
       if (_index === 0) {
         item.break = [{
           break_id: '',
-          break_num: 0
+          break_num: 0,
+          break_defect:""
         }]
       } else {
         item.break.splice(_index, 1)
@@ -307,6 +316,7 @@ export default {
     handleSure () {
       // console.log(this.list);return false;
       this.list.forEach((v, index) => {
+        v.not_finished_num = v.not_finished_num - v.finished_num
         const data3 = {
           url: 'http://121.36.142.167:7774/jbl/api/module-data/completion_orders/completion_orders',
           post: {
@@ -339,9 +349,12 @@ export default {
         }
         const data4Dtil = []
         v.break.forEach(vv => {
-          if (vv.break_id && vv.break_num) {
+          if (vv.break_id && vv.break_defect && vv.break_num) {
             v.defective_num = vv.break_num
             v.defective_remark = vv.break_id
+            v.defective_remark_show = vv.title
+            v.defective_defect = vv.break_defect
+            v.defective_defect_show = vv.title
             data4Dtil.push(v)
           }
         })

src/views/page/Home.vue

@@ -45,20 +45,20 @@
 
             </div>
           </div>
-          <div class="completion_con" @click="handleDispatch">
+          <div class="completion_con" @click="handlePackage">
             <div style="display: flex;align-items: center;gap: .84rem;">
-              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhomefha.png" alt="">
-              <p style="margin-bottom: 0;font-size: 1.13rem;color: #FFFFFF;">发货</p>
+              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhomebz.png" alt="">
+              <p style="margin-bottom: 0;font-size: 1.13rem;color: #FFFFFF;">包装</p>
             </div>
             <div style="display: flex;align-items: center;">
               <img style="width: 3.16rem; height: 2rem;" src="../../assets/home/bzhomer.png" alt="">
 
             </div>
           </div>
-          <div class="completion_con" @click="handlePackage">
+          <div class="completion_con" @click="handleDispatch">
             <div style="display: flex;align-items: center;gap: .84rem;">
-              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhomebz.png" alt="">
-              <p style="margin-bottom: 0;font-size: 1.13rem;color: #FFFFFF;">包装</p>
+              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhomefha.png" alt="">
+              <p style="margin-bottom: 0;font-size: 1.13rem;color: #FFFFFF;">发货</p>
             </div>
             <div style="display: flex;align-items: center;">
               <img style="width: 3.16rem; height: 2rem;" src="../../assets/home/bzhomer.png" alt="">
@@ -67,7 +67,7 @@
           </div>
           <div class="completion_con" @click="handleInventory">
             <div style="display: flex;align-items: center;gap: .84rem;">
-              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhomebz.png" alt="">
+              <img style="width: 3.19rem;height: 3.19rem" src="../../assets/home/bzhhomepd.png" alt="">
               <p style="margin-bottom: 0;font-size: 1.13rem;color: #FFFFFF;">盘点</p>
             </div>
             <div style="display: flex;align-items: center;">