mushencc 3 سال پیش
والد
کامیت
3a8fe06b70

+ 6 - 6
src/views/BidSystem/DeepeningOrder/edit.vue

@@ -436,14 +436,14 @@ export default {
           title: "序号",
           type: "index",
           align: "center",
-          width: 80,
+          width: 60,
           resizable: true,
         },
         {
           title: "楼栋",
           key: "house",
           align: "center",
-          width: 100,
+          width:80,
           slot: "houseSet",
           resizable: true,
         },
@@ -451,7 +451,7 @@ export default {
           title: "楼单元",
           key: "unit",
           align: "center",
-          width: 100,
+          width: 80,
           slot: "unitSet",
           resizable: true,
         },
@@ -459,7 +459,7 @@ export default {
           title: "楼层",
           key: "layer",
           align: "center",
-          width: 100,
+          width: 80,
           slot: "layerSet",
           resizable: true,
         },
@@ -475,7 +475,7 @@ export default {
           title: "产品分类",
           key: "title",
           align: "center",
-         width:80,
+         width:140,
           slot: "type_titleSet",
           resizable: true,
         },
@@ -539,7 +539,7 @@ export default {
               title: "操作",
               key: "set",
               align: "center",
-              minWidth: 60,
+              minWidth: 80,
               fixed: "right",
               slot: "set",
               resizable: true,

+ 0 - 3
src/views/BidSystem/DeepeningOrder/list.vue

@@ -376,9 +376,6 @@ export default {
       this.page_index = 1;
       //1 深化   换接口 弃用
       // row.sub_status = 1;
-      if (!row.deep_status && row.deep_status != 0) {
-        row.deep_status = 99;
-      }
       row.page_index = this.page_index;
       row.page_size = this.page_size;
       this.proxyObj = row;

+ 0 - 28
src/views/BidSystem/ProductDeOrder/deorderdetail.vue

@@ -3,12 +3,6 @@
     <Toptitle :title="type == 1 ? '拆单编辑' : '拆单详情'">
       <slot name="titleButton">
         <Button
-          @click="handleFinish()"
-          type="primary"
-          style="margin-right: 10px"
-          >完成</Button
-        >
-        <Button
           @click="goback()"
           type="primary"
           ghost
@@ -2321,28 +2315,6 @@ export default {
     goback() {
       this.$router.go(-1);
     },
-    handleFinish() {
-      this.$Modal.confirm({
-        title: "确认完成?",
-        // content: "此操作确认后不可恢复,请确认!",
-        onOk: () => {
-          this.axios({
-            method: "post",
-            url: "/api/order_area_product_status",
-            data: {
-              orders_area_product_detail_id: this.$route.query
-                .orders_area_product_detail_id,
-            },
-          }).then((res) => {
-            if (res.doce == 200) {
-              this.$Message.success(res.msg);
-              this.initData(this.order_no, this.orders_area_product_detail_id);
-            }
-          });
-        },
-        onCancel: () => {},
-      });
-    },
     successKey(str) {
       if (this.keyUseType == 1) {
         this.formData.parts[this.attrParentindex].partsWoodTableData[

+ 54 - 3
src/views/BidSystem/ProductDeOrder/detail.vue

@@ -3,6 +3,12 @@
     <Toptitle title="拆单页">
       <slot name="titleButton">
         <Button
+          @click="handleFinish()"
+          type="primary"
+          style="margin-right: 10px"
+          >完成</Button
+        >
+        <Button
           @click="showSupModal = true"
           type="primary"
           style="margin-right:10px;"
@@ -120,7 +126,7 @@
     </div>
     <div class="addArea">
       <div class="addAreaTable">
-        <Table :columns="tableColumns" :data="formData.detail" border>
+        <Table :columns="tableColumns" :data="formData.detail" border @on-selection-change='changeSelection'>
           <template slot="set" slot-scope="{ row, index }">
             <a
               :disabled="row.status != 0"
@@ -185,6 +191,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      detail_id:[],
       showSupModal: false,
       showPDTModal: false,
       formData: {
@@ -226,6 +233,11 @@ export default {
       searchData: {},
       tableColumns: [
         {
+              type: 'selection',
+              width: 60,
+              align: 'center'
+        },
+        {
           title: "序号",
           type: "index",
           align: "center",
@@ -343,17 +355,27 @@ export default {
           minWidth: 80,
           render: (h, params) => {
             const { row } = params;
-            return h("span", {}, row.status == 0 ? "未完成" : "已完成");
+            return h("span", {}, row.explode_status == 0 ? "未完成" : "已完成");
           },
         },
         {
+          title:"是否下生产",
+          key:'',
+          align:"center",
+          resizable:true,
+          width:80,
+          render:(h,params) =>{
+            return h("span",{},params.status == 0? "否":"是")
+          }
+        },
+        {
           title: "操作",
           key: "name",
           align: "center",
           width: "120",
           slot: "set",
           minWidth: 80,
-          fixed: "right",
+          // fixed: "right",
           resizable: true,
         },
       ],
@@ -414,6 +436,35 @@ export default {
     );
   },
   methods: {
+    changeSelection(e){
+      e.forEach(item=>{
+        this.detail_id.push(item.id)
+      })
+    },
+     handleFinish() {
+      this.$Modal.confirm({
+        title: "确认完成?",
+        // content: "此操作确认后不可恢复,请确认!",
+        onOk: () => {
+          this.axios({
+            method: "post",
+            url: "/api/order_area_product_status",
+            data: {
+              orders_area_product_detail_id: this.detail_id
+            },
+          }).then((res) => {
+            if (res.code == 200) {
+              this.$Message.success(res.msg);
+               this.initData(
+      this.formData.order_no,
+      this.formData.orders_area_product_detail_id
+    );
+            }
+          });
+        },
+        onCancel: () => {console.log(this.$refs.selection)},
+      });
+    },
     //项目辅料新增
     handleAddSup() {
       this.supTableData.push({ id: "" });