From d4f4376ab5aef071cb841de0f9a9b7f6cb16c651 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 20 五月 2024 09:39:48 +0800
Subject: [PATCH] 增加380新产品

---
 jcdm-ui/src/views/main/om/productionOrde/index.vue |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 5e8cb58..f3ddc64 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <div v-if="!showDetailFlag">
     <el-card class="box-card">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label-width="100" label="鐢熶骇閫氱煡鍗�" prop="productName">
@@ -113,6 +114,16 @@
           @click="CreatehandleUpdate"
           v-hasPermi="['om:productionOrde:createUpdate']"
         >鐢熸垚</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :disabled="!single"
+          @click="goToPage"
+        >寮�濮嬩綔涓�</el-button>
       </el-col>
 
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -301,7 +312,8 @@
         <el-button @click="cancel">鍙� 娑�</el-button>
       </div>
     </el-dialog>
-
+    </div>
+    <Detail v-if="showDetailFlag" :singleSelect="singleSelect"></Detail>
   </div>
 </template>
 
@@ -322,15 +334,19 @@
 } from "@/api/main/bs/orderScheduling/orderScheduling";
 import {listMaterial} from "@/api/main/bs/material/material";
 import {listModelNumber} from "@/api/main/bs/modelNumber/modelNumber";
+import Detail from "./detail.vue";
 
 export default {
   name: "ProductionOrde",
   dicts: ['order_state','year','month','day','subscription_type', 'sys_yes_no', 'data_type','sys_normal_disable'],
   components: {
     ItemSelect ,
+    Detail
   },
   data() {
     return {
+      showDetailFlag: false,
+      singleSelect:{},
       titleName: '',
       options: [],
       lineOptions: [],
@@ -495,10 +511,10 @@
         dateTimeRule = dateTimeRule + day;
         dateTimeRule = dateTimeRule + this.markNo;
         this.form.dateTimeRule = dateTimeRule;//姝ゅ璧嬪�间笉鍔犳満鍨�
-        dateTimeRule = dateTimeRule + this.form.typeZ;//姝ゅ鍔犳満鍨嬶紝椤哄簭涓嶈兘棰犲��
+        dateTimeRule = this.form.typeZ +" "+dateTimeRule;//姝ゅ鍔犳満鍨嬶紝椤哄簭涓嶈兘棰犲��
 
         //璧嬪�艰捣濮嬬紪鐮�
-        this.form.startEndCode = dateTimeRule +  String(parseInt(startCode)).padStart(3, '0') + "         " + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
+        this.form.startEndCode =   dateTimeRule + String(parseInt(startCode)).padStart(3, '0') + "         " + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
       }
     },
 
@@ -638,7 +654,8 @@
         spareField3: null,
         typeZ: null,
         spareField4: null,
-        adds:null
+        adds:null,
+        idNums:null
       };
       this.resetForm("form");
     },
@@ -652,7 +669,7 @@
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 澶氶�夋閫変腑鏁版嵁
+    /** 澶氶�夋閫変腑鏁版嵁 */
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
       this.move = selection.length!==1
@@ -664,8 +681,10 @@
           this.single = false
           this.multiple = false
         }
+        if(selection[0].orderStatus === '2' && selection.length === 1){
+          this.singleSelect = selection[0]
+        }
       }
-
     },
 
     /** 鏂板鎸夐挳鎿嶄綔 */
@@ -689,6 +708,7 @@
           this.form.typeL = response.rows[0].typeL;
         });
         this.form = response.data;
+        this.form.idNums=id;
         this.Createopen = true;
         this.titleName = "鐢熸垚绠变綋鏉＄爜";
         // return Array.from({ length: parseInt(this.actualQty) }, (_, index) => index + 1);
@@ -758,7 +778,7 @@
     saveBoxCode(){
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          if (this.form.idNums != null) {
             addOrderSchedulingForBoxCode(this.form).then(response => {
               this.$modal.msgSuccess("淇濆瓨鎴愬姛");
               this.Createopen = false;
@@ -785,7 +805,12 @@
         ...this.queryParams
       }, `productionOrde_${new Date().getTime()}.xlsx`)
     },
-
+    goToPage() {
+      this.showDetailFlag=true
+      console.log('this.showDetailFlag',this.showDetailFlag)
+      //鏇存柊瀹為檯鐢熶骇鏃ユ湡
+      //updateOrderInfo(this.singleSelect)
+    },
   }
 };
 </script>

--
Gitblit v1.9.3