工藝設置

pages/processManage/setProcess/components/orderMaterialNew.vue

@@ -4,7 +4,7 @@
 <template>
   <div class="new_box">
     <span class="mr10">订单编号：{{mescodes}}</span>
-    <Button v-if="materialbillStatuss!=1" type="primary" @click="saveBill">生成料单</Button>
+    <Button v-if="materialBillSetStatus!=1" type="primary" @click="saveBill">生成料单</Button>
     <Table stripe ref="table" border :columns="columns" :data="datas" class="tableCommon mt5"></Table>
   </div>
 </template>
@@ -100,7 +100,10 @@ export default {
   },
   props: {
     mesCode: String,
-    materialBillSetStatus: Number,
+    materialBillSetStatus: {
+      type: Number,
+      default: -1
+    },
     mainRoutingID: Number,
     id: Number,
     quantity: Number
@@ -116,9 +119,9 @@ export default {
       };
       Api.post(`${technologyUrl}materiallist/createnew`, params).then(res => {
         if (res.success) {
-          this.materialbillStatuss = 1;
           this.$emit("on-ok");
           this.loaddata(this.orderId);
+          this.materialBillSetStatus = 1;
         }
       });
     },
@@ -146,16 +149,16 @@ export default {
   watch: {
     mainRoutingID(v) {
       this.routingHeaderId = v;
-      this.loaddata();
+      this.loaddata(this.orderId);
     },
     mesCode(v) {
       this.mescodes = v;
     },
     materialBillSetStatus(v) {
       if (v == 1) {
-        this.materialbillStatuss = v;
+         this.materialBillSetStatus =v;
       } else {
-        this.materialbillStatuss = -1;
+        this.materialBillSetStatus = -1;
       }
     },
     id(v) {
@@ -164,6 +167,7 @@ export default {
         this.loaddata(v);
       } else {
         this.datas = [];
+        this.materialBillSetStatus = -1;
       }
     },
     quantity(v) {

pages/processManage/setProcess/index.vue

@@ -298,6 +298,7 @@
       fullscreen
       :mask-closable="false"
       :loading="myloading"
+      :closable="false"
     >
       <orderMaterial
         ref="orderMaterial"
@@ -309,7 +310,7 @@
          @on-ok="ok" 
       ></orderMaterial>
       <div slot="footer">
-        <Button type="text" size="large" @click="saveCancelModel">关闭</Button>
+        <Button type="primary"  size="large" @click="saveCancelModel">关闭窗口</Button>
       </div>
     </Modal>
 
@@ -1003,6 +1004,11 @@ export default {
       this.modalliao = false;
       // this.$refs.orderMaterial.cleardata()
       this.dataListRetrunNew.idList = [];
+      this.mainRoutingID= null;
+      this.id= null;
+      this.materialBillSetStatus=null
+      this.mesCode= "";
+      this.quantity= null;
     },
     modalOk() {
       if (this.createtype == 2 && this.headerid == 0) {