sendOk

pages/mesPlan/index.vue

@@ -65,7 +65,7 @@
         <Send :row="rowDataArry" ref="orderSplit" />
         <div slot="footer">
           <Button @click="sendModal = false">取消</Button>
-          <Button type="primary">确定派发</Button>
+          <Button type="primary" @click="sendOk">确定派发</Button>
         </div>
       </Modal>
       <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
@@ -707,7 +707,9 @@ export default {
       rowDataArry: [],
       ModalInfoStaut: "",
       sendList: [],
-      metCodesStrTxt: ""
+      metCodesStrTxt: "",
+      actIds: [], //批量处理时ids
+      actMescodes:[],
     };
   },
   created() {
@@ -867,30 +869,57 @@ export default {
     openSendModal() {
       if (this.rowDataArry.length > 0) {
         this.sendModal = true;
+        this.actIds = [];
+        this.rowDataArry.forEach(data => {
+          this.actIds.push(data.id);
+        });
       } else {
         this.$Message.error("请选择订单");
       }
     },
-    remove(id) {
-      this.deletelModal = true;
-      this.curId = id;
-    },
-    removeOk() {
-      Api.delete({ id: this.curId }).then(r => {
-        if (r.success) {
-          this.$refs.grid.load();
-          this.deletelModal = false;
-          this.$Message.success("删除成功");
+    //确定派发
+    sendOk() {
+      this.$refs.orderSplit.$refs["formValidate"].validate(valid => {
+        if (valid) {
+          let objInfo = this.$refs.orderSplit.returnData();
+          let params = {
+            ids: this.delIds
+          };
         }
       });
     },
+    //单条删除
+    remove(id) {
+      this.deletelModal = true;
+      //this.curId = id;
+      this.actIds = [];
+      this.actIds.push(id);
+    },
+    //批量删除
     removeList() {
       if (this.rowDataArry.length > 0) {
         this.deletelModal = true;
+        this.deactIdslIds = [];
+        this.rowDataArry.forEach(data => {
+          this.actIds.push(data.id);
+        });
       } else {
         this.$Message.error("请选择订单");
       }
     },
+    //删除确定
+    removeOk() {
+      let params = {
+        ids: this.delIds
+      };
+      // Api.delete({ id: this.curId }).then(r => {
+      //   if (r.success) {
+      //     this.$refs.grid.load();
+      //     this.deletelModal = false;
+      //     this.$Message.success("删除成功");
+      //   }
+      // });
+    },
     removeCancel() {
       this.deletelModal = false;
     },

pages/mesPlan/send.vue

 <template>
-  <div style="width:100%;margin:0 auto" >
-    <Detail  ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
+  <div style="width:100%;margin:0 auto">
+    <Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
     <Table
       border
       :columns="columns1"
@@ -20,10 +20,7 @@
         <Row>
           <Col span="6">
             <FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
-              <WorkShopSelect
-                ref="userSelected"
-                v-model="orderForm.ProductingPreparationPeople"
-              />
+              <WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" />
             </FormItem>
           </Col>
           <Col span="6">
@@ -38,10 +35,7 @@
           </Col>
           <Col span="6">
             <FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
-              <UserSelect
-                ref="userSelected"
-                v-model="orderForm.QuotationPeople"
-              />
+              <UserSelect ref="userSelected" v-model="orderForm.QuotationPeople" />
             </FormItem>
           </Col>
           <Col span="6">
@@ -71,21 +65,9 @@ export default {
   data() {
     return {
       divHeight: "400px",
-      osrOneList: false, //一条数据显示详细
-      osrMoreList: false, //多条数据只显示列表
-      info: {
-        status: true,
-        orderInfo: []
-      },
       roleTitle: "工艺员",
       orderForm: {
-        DistributeMainRouting: null, //主工艺人员
-        MainRoutingFinishDate: "", //主工艺人员完成时间
-        MajorRoutingPeople: null, //专业工艺人员
-        MajorRoutingFinishDate: "", //专业工艺人员完成时间
-        CheckUpPeople: 1, //校对人员 暂时不用
-        CheckUpFinishDate: "2019-12-19", //校对人员完成时间
-        ProductingPreparationPeople: null, //生产准备人员
+        ProductingPreparationPeople: null, //生产准备
         ProductingPreparationFinishDate: "", //生产准备完成时间
         QuotationPeople: null, //订单报价人员
         QuotationFinishDate: "" //订单报价完成时间
@@ -128,7 +110,7 @@ export default {
         }
       ],
       dataList: [],
-      row1:{},
+      row1: {},
       dataListRetrun: [], //确定后返回数据
 
       ruleValidate: {
@@ -164,8 +146,8 @@ export default {
         ]
       },
       rowList: [],
-      row1:{},
-      tbHeight:0,
+      row1: {},
+      tbHeight: 0
     };
   },
   props: {
@@ -177,35 +159,14 @@ export default {
     }
   },
   methods: {
-    returnDataList() {
-      this.dataListRetrun = [];
-      this.dataList.forEach(item => {
-        let objStr = {};
-        objStr.id = item.id;
-        objStr.mesCode = item.mesCode;
-        objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting;
-        objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate;
-        objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople;
-        objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate;
-        objStr.CheckUpPeople = this.orderForm.CheckUpPeople;
-        objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate;
-        objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
-        objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
-        objStr.QuotationPeople = this.orderForm.QuotationPeople;
-        objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
-        this.dataListRetrun.push(objStr);
-      });
+    returnData() {
+      let objStr = {};
+      objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
+      objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
+      objStr.QuotationPeople = this.orderForm.QuotationPeople;
+      objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
       //返回审批数据
-      return this.dataListRetrun;
-    },
-    getTimeMainRFD(value) {
-      this.orderForm.MainRoutingFinishDate = value;
-    },
-    getTimeMajorRFD(value) {
-      this.orderForm.MajorRoutingFinishDate = value;
-    },
-    getTimeCheckFD(value) {
-      this.orderForm.CheckUpFinishDate = value;
+      return objStr;
     },
     getTimeProductPFD(value) {
       this.orderForm.ProductingPreparationFinishDate = value;
@@ -216,7 +177,7 @@ export default {
   },
   created() {
     //var theight = window.innerHeight - 400 + "px";
-   // this.divHeight = theight;
+    // this.divHeight = theight;
   },
   mounted() {
     // window.onresize = () => {
@@ -231,11 +192,10 @@ export default {
     row(v) {
       if (v != []) {
         this.dataList = this.$u.clone(this.row);
-        this.row1=this.dataList[0]
-        this.tbHeight=0
-        if(this.dataList.length>3)
-        {
-          this.tbHeight=200
+        this.row1 = this.dataList[0];
+        this.tbHeight = 0;
+        if (this.dataList.length > 3) {
+          this.tbHeight = 200;
         }
       }
     }