mushencc пре 2 година
родитељ
комит
99ce7d6a85

+ 1 - 3
src/views/page/Finish/detail.vue

@@ -126,6 +126,7 @@ export default {
     }
     this.tableData = []
     // const fyyTarget = ('PG2023081000025,PG2023081000024').split(',')
+    text = ['PG2023082800039']
     text.forEach(v => {
       const data = {
         url: 'http://121.36.142.167:7774/jbl/api/module-data/dispatch_orders/page',
@@ -136,10 +137,7 @@ export default {
   },
   methods: {
     initData(row) {
-
       this.axios.post('/api/testdwy', { ...row }).then(res => {
-
-
         res.data.content.forEach(v => {
           v.is_choose = false
           v.dispatch_no = v.dispatch_orders.dispatch_no

+ 16 - 11
src/views/page/Finish/detailed.vue

@@ -6,11 +6,6 @@
       <div class="home_con_body">
 
         <div class="send_work" v-for="(item, index) in list" :key="index">
-          <div class="check_box">
-            <div @click="handleChoose(item, index)" class="check_box_c">
-            </div>
-          </div>
-
           <div class="secd_flex">
             <div class="secd_title">
               <span>派工单号:</span><span>{{ item.dispatch_order_no }}</span>
@@ -21,7 +16,7 @@
               <div class="secd_input">
                 <div class="secd_input_l">数量:</div>
                 <div class="secd_input_r">
-                  <input type="text" v-model="item.finished_num" @on-change="handleChangeNumber($event, index)"
+                  <input type="text" v-model="item.finished_num" @blur="handleChangeNumber(index)"
                     placeholder="请输入数量">
                 </div>
               </div>
@@ -36,8 +31,10 @@
               <div class="secd_input">
                 <div class="secd_input_l">人员:</div>
                 <div class="secd_input_r">
-                  <b-form-select id="input-3" :options="employeeList" v-model="item.employee_id" class="inp select_list"
-                    required placeholder="请选择站点" @on-change="handleChangeEmployee($event, index)"></b-form-select>
+                  <Select id="input-3" multiple v-model="item.employee_id" class="inp select_list"
+                    required @on-change="handleChangeEmployee($event, index)">
+                    <Option v-for="item in employeeList" :key="item.value" :label="item.text" :value="item.value"/>
+                  </Select>
                 </div>
               </div>
               <div class="secd_input">
@@ -217,8 +214,12 @@ export default {
     this.initData(id)
   },
   methods: {
-    handleChangeNumber (e, index) {
-      this.list[index].not_finished_num = this.list[index].dispatch_num - (e.target.value * 1)
+    handleChangeNumber (index) {
+      console.log(this.list)
+      if(this.list[index].finished_num>this.list[index].not_finished_num){
+        this.$Message.warning('不能超过未完工数量!')
+        this.list[index].finished_num = this.list[index].not_finished_num
+      }
     },
     handleChangeEmployee (e, index) {
       this.list[index].employee_id_show = this.employeeList.filter(v => e.indexOf(v.no) !== -1).map(v => v.name).toString().replace(/,/g, '/$/$/$').replace(/\//g, '')
@@ -237,8 +238,12 @@ export default {
         v.team_id_show = v.dispatch_orders.team_id_show
         v.equipment_id = v.dispatch_orders.equipment_id
         v.equipment_id_show = v.dispatch_orders.equipment_id_show
+        v.not_finished_num = v.dispatch_num - v.finished_num
         v.finished_num = v.not_finished_num
-        v.dispatch_order_no = v.dispatch_no
+        v.dispatch_order_no = v.dispatch_orders.dispatch_no
+        v.dispatch_item_id = v.id
+        v.dispatch_item_no = v.item_num
+        v.site = null
         v.id = null
         v.employee_id = v.dispatch_orders.employee_id.split(',')
         v.employee_id_show = v.dispatch_orders.employee_id_show

+ 4 - 3
src/views/page/Package/detailed.vue

@@ -61,7 +61,7 @@
   <!-- <div>
     <div class="content">
       <div v-for="(item, index) in list" :key="index" class="item">
-       
+
         <div class="unit" style="display: flex">
           <label style="width: 50%">销售订单号:</label>
           <div style="width: 50%;word-break: break-all">{{ item.no }}</div>
@@ -236,10 +236,11 @@ export default {
           "customer_name": v.exe_sale_order_b.customer_code_show,
           "dealer_no": v.exe_sale_order_b.jingxiaoshang,
           "dealer_name": v.exe_sale_order_b.jingxiaoshang_show,
-          "box_num": v.un_box_num
+          "box_num": v.un_box_num,
+          "site":null
         }
         team_id = v.team_id
-        box_orders_products.push(box_orders_product);
+        box_orders_products.push(box_orders_product)
       })
       const box_orders = {
         "defective_order_no": null,