mesplan order handel

components/orderOperator/orderSplit.vue

@@ -61,7 +61,7 @@
           type="daterange"
           placeholder="请选择日期"
           style="width:240px"
-          transfer="true"
+          :transfer="true"
           :options="optionsDate"
            @on-change="inputOrderCat(row,index)"
         ></DatePicker>

pages/mesPlan/index.vue

@@ -18,6 +18,7 @@
       <DataGrid
         :action="action"
         :columns="columns"
+        :conditions="easySearch"
         ref="grid"
         @on-selection-change="onSelect"
         :batch="true"
@@ -114,8 +115,10 @@ export default {
       easySearch: {
         keys: {
           op: "mesCode,productName",
-          value: null
-        }
+          value: null,
+          default: true
+        },
+        productId: { op: "In", value: "" }
       },
       addModal: false,
       editModal: false,
@@ -303,7 +306,14 @@ export default {
                 {
                   attrs: { oprate: "edit" },
                   on: { click: () => this.edit(params.row) },
-                  style: params.row._disabled||params.row.id!=params.row.rootId ? "display:none" : ""
+                  style:
+                    (params.row.status == 1 &&
+                      params.row.id == params.row.rootId &&
+                      params.row.divideMark != 0) ||
+                    params.row.id != params.row.rootId ||
+                    params.row.status != 1
+                      ? "display:none"
+                      : ""
                 },
                 "编辑"
               ),
@@ -312,7 +322,14 @@ export default {
                 {
                   attrs: { oprate: "remove" },
                   on: { click: () => this.remove(params.row) },
-                  style: params.row._disabled ? "display:none" : ""
+                  style:
+                    (params.row.status == 1 &&
+                      params.row.id == params.row.rootId &&
+                      params.row.divideMark != 0) ||
+                    params.row.status != 1
+                    // ||(params.row.id != params.row.rootId && this.sondeletecheck1(params.row.rootId)>0)
+                      ? "display:none"
+                      : ""
                 },
                 "删除"
               ),
@@ -321,7 +338,13 @@ export default {
                 {
                   attrs: { oprate: "detail" },
                   on: { click: () => this.split(params.row) },
-                  style: params.row._disabled&&params.row.status!=1 ? "display:none" : ""
+                  style:
+                    (params.row.divideMark != 0 &&
+                      params.row.id == params.row.rootId) ||
+                    params.row.status != 1 ||
+                    params.row.quantity <= 1
+                      ? "display:none"
+                      : ""
                 },
                 "分解"
               )
@@ -371,7 +394,8 @@ export default {
       metCodesStrTxt: "",
       actIds: [], //批量处理时ids
       actMescodes: [],
-      delNum: 0
+      delNum: 0, //判断是否可以进行修改
+      arrayIds: [] //选择列表后的ids
     };
   },
   created() {
@@ -560,12 +584,35 @@ export default {
     },
     //确定派发
     sendOk() {
-      this.$refs.orderSplit.$refs["formValidate"].validate(valid => {
+      this.$refs.orderSend.$refs["formValidate"].validate(valid => {
         if (valid) {
-          let objInfo = this.$refs.orderSplit.returnData();
-          let params = {
-            ids: this.delIds
-          };
+          let objInfo = this.$refs.orderSend.returnData();
+          let ids = this.arrayIds;
+          let parms = [];
+          ids.forEach(e => {
+            objInfo.id = e;
+            parms.push(objInfo);
+          });
+          Api.mesorderdistribute(parms)
+            .then(r => {
+              if (r.success) {
+                if (r.result) {
+                  this.$refs.grid.load();
+                  this.sendModal = false;
+                  this.$Message.success("派发成功");
+                } else {
+                  this.sendModal = false;
+                  this.$Message.error("派发失败");
+                }
+              } else {
+                this.sendModal = false;
+                this.$Message.error("派发失败");
+              }
+            })
+            .catch(err => {
+              this.sendModal = false;
+              this.$Message.error("操作失败");
+            });
         }
       });
     },
@@ -591,7 +638,7 @@ export default {
       let metCodesSingle = []; //没有子订单的订单
       let metCodesFather = []; //有子订单的原始订单
       this.actIds = [];
-      alert(JSON.stringify(this.rowDataArry))
+      //alert(JSON.stringify(this.rowDataArry));
       if (this.rowDataArry.length > 0) {
         this.rowDataArry.forEach(data => {
           this.delNum = 0;
@@ -599,13 +646,13 @@ export default {
           if (data.id != data.rootId) {
             //this.metCodesSingle.push(data.id);
             this.sondeletecheck(data.rootId);
-          } 
+          }
         });
 
         setTimeout(() => {
           if (this.delNum > 0) {
             this.$Message.error("删除的原始订单中有非新建状态的子订单！");
-             this.actIds = [];
+            this.actIds = [];
             return false;
           }
         }, 400);
@@ -629,6 +676,19 @@ export default {
           this.delNum += 1;
         }
       });
+    },
+     //删除前判断子订单
+    sondeletecheck1(code) {
+      let param = { id: code };
+      let delStaut=0
+      Api.sondeletecheck(param).then(res => {
+        if (res.result == 1) {//可以删除
+          delStaut = 0;
+        } else {
+          delStaut = 1;
+        }
+      });
+      return delStaut
     },
     //删除确定
     removeOk() {
@@ -694,7 +754,9 @@ export default {
           this.orderSearchForm.productId = "-1";
           this.orderSearchForm.productName = "";
         }
-        //this.$refs.CustomTable.easySearch(this.orderSearchForm);
+
+        this.easySearch.productId.value = this.orderSearchForm.productId;
+        this.$refs.grid.easySearch();
       }
     },
     //得到此树节点下所有是产品的productId
@@ -750,11 +812,11 @@ export default {
       //alert(JSON.stringify(a));
       //批量选择
       let selectRows = a;
-      this.arrPartPkId = [];
+      this.arrayIds = [];
       this.rowDataArry = a;
-      // selectRows.forEach(e => {
-      //   this.arrPartPkId.push(e.part_task_pk);
-      // });
+      selectRows.forEach(e => {
+        this.arrayIds.push(e.id);
+      });
     }
     //list end
   }

pages/mesPlan/send.vue

@@ -169,10 +169,23 @@ export default {
       return objStr;
     },
     getTimeProductPFD(value) {
-      this.orderForm.ProductingPreparationFinishDate = value;
+      this.orderForm.ProductingPreparationFinishDate = this.getFormatDateEnd(value);
     },
     getTimeQuotationFD(value) {
-      this.orderForm.QuotationFinishDate = value;
+      this.orderForm.QuotationFinishDate = this.getFormatDateEnd(value);
+    },
+     getFormatDateEnd(dates) {
+      const d = new Date(dates);
+      const resDate =
+        d.getFullYear() +
+        "-" +
+        this.p(d.getMonth() + 1) +
+        "-" +
+        this.p(d.getDate())+ " 23:59:59";
+      return resDate;
+    },
+    p(s) {
+      return s < 10 ? "0" + s : s;
     }
   },
   created() {

pages/mesPlan/split.vue

@@ -55,7 +55,7 @@
           type="daterange"
           placeholder="请选择日期"
           style="width:240px"
-          transfer="true"
+          :transfer="true"
           :options="optionsDate"
           @on-change="inputOrderCat(row,index)"
         ></DatePicker>