From aa5ce8040d7010e0ff103b3de8c2abfe242edc75 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 4 Jun 2024 18:19:59 +0800
Subject: [PATCH] =?UTF-8?q?2024/06/04=20=E8=AE=A2=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/production/shopOrder.js        |   1 +
 src/views/modules/production/order.vue | 108 +++++++++++++++++++++++--
 2 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/src/api/production/shopOrder.js b/src/api/production/shopOrder.js
index c84b884..4522b00 100644
--- a/src/api/production/shopOrder.js
+++ b/src/api/production/shopOrder.js
@@ -1,6 +1,7 @@
 import {createAPI} from "../../utils/httpRequest";
 
 export const getDataList = (data) => createAPI(`/shop/order/list`,'post',data)
+export const getIFSDataList = (data) => createAPI(`/shop/order/ifs/list`,'post',data)
 export const getDataPageList = (data) => createAPI(`/shop/order/page/${data.no}/${data.size}`,'post',data)
 
 export const saveData = (data) => createAPI(`/shop/order/add`,'post',data)
diff --git a/src/views/modules/production/order.vue b/src/views/modules/production/order.vue
index ffcb73d..0da8fd1 100644
--- a/src/views/modules/production/order.vue
+++ b/src/views/modules/production/order.vue
@@ -3,12 +3,13 @@ import {
   deleteData,
   editData,
   getDataList,
-  getDataPageList,
+  getDataPageList, getIFSDataList,
   getPartDataList,
   saveData
-} from "../../../api/production/shopOrder";
+} from '../../../api/production/shopOrder'
 import dayjs from "dayjs";
 
+const os = require('os');
 export default {
   name: 'order',
   props:{
@@ -136,7 +137,7 @@ export default {
           tableName: "ShopOrder",
           columnProp: "status",
           headerAlign: "center",
-          align: "left",
+          align: "center",
           columnLabel: "状态",
           columnHidden: false,
           columnImage: false,
@@ -188,6 +189,12 @@ export default {
         partDesc: '',
       },
       partDataList:[],
+
+      importOpen:false,
+      importDataList:[],
+      importForm:{
+        orderNo: '',
+      },
     }
   },
   methods:{
@@ -324,9 +331,69 @@ export default {
       this.form.partNo = row.partNo
       this.form.partDesc = row.partDesc
       this.partOpen = false
+    },
+    ifsOrderRowClick(row){
+      this.form.orderNo = row.orderNo
+      this.form.partNo = row.partNo
+      this.form.partDesc = row.partDesc
+      this.form.lotSize = row.lotSize
+      this.form.planStartDate = row.planStartDate
+      this.importOpen = false
+    },
+    handleValidatePart(){
+      let params = {
+        partNo: this.form.partNo,
+        site: this.$store.state.user.site,
+      }
+      getPartDataList(params).then(({data})=>{
+        if (data && data.code === 0){
+          if (data.rows.length === 1){
+            this.partRowClick(data.rows[0])
+          }
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+    handleImportIFS(){
+      this.importOpen = true;
+      let params = {
+        ...this.importForm,
+        site: this.$store.state.user.site,
+      }
+      getIFSDataList(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.importDataList = data.rows
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+  },
+  watch:{
+    'form.partNo'(newVal,oldVal){
+      if (newVal){
+        this.partForm.partNo = newVal.toUpperCase()
+        this.partForm.partNo = this.form.partNo
+      }
+    },
+    'form.orderNo'(newVal,oldVal){
+      if (newVal){
+        this.form.orderNo = newVal.toUpperCase()
+      }
+    },
+    'importForm.orderNo'(newVal,oldVal){
+      if (newVal) {
+        this.importForm.orderNo = newVal.toUpperCase()
+      }
     }
   },
   created() {
+    console.log(os.homedir())
     this.getList();
   }
 }
@@ -431,7 +498,7 @@ export default {
           </el-col>
           <el-col :span="4">
             <el-form-item label=" " >
-              <el-button type="primary">从IFS导入</el-button>
+              <el-button v-if="!form.site" type="primary" @click="handleImportIFS">从IFS导入</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -439,7 +506,7 @@ export default {
           <el-col :span="10">
             <el-form-item label="产品编码" prop="partNo" :show-message="false">
               <span slot="label" style="" @click="handleQueryPart" ><a herf="#">产品编码</a></span>
-              <el-input v-model="form.partNo"></el-input>
+              <el-input v-model="form.partNo" @change="handleValidatePart"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="14">
@@ -476,12 +543,41 @@ export default {
       </el-footer>
     </el-dialog>
 
-    <el-dialog :title="`产品信息`" :visible.sync="partOpen" width="500px">
+    <el-dialog :title="`产品信息`" v-drag :visible.sync="partOpen" :close-on-click-modal="false" width="500px">
+      <el-form :model="partForm" :inline="true" ref="partForm" label-position="top">
+        <el-form-item label="产品编码" prop="partNo">
+          <el-input v-model="partForm.partNo"></el-input>
+        </el-form-item>
+        <el-form-item label="产品名称" prop="partDesc">
+          <el-input v-model="partForm.partDesc"></el-input>
+        </el-form-item>
+        <el-form-item label=" " >
+          <el-button type="primary" @click="handleQueryPart">查询</el-button>
+        </el-form-item>
+      </el-form>
       <el-table :data="partDataList" border height="300" @row-dblclick="partRowClick">
         <el-table-column label="产品编码" prop="partNo"></el-table-column>
         <el-table-column label="产品名称" prop="partDesc"></el-table-column>
       </el-table>
     </el-dialog>
+
+    <el-dialog :title="`IFS订单`" v-drag :visible.sync="importOpen" :close-on-click-modal="false" width="600px">
+      <el-form :model="importForm" :inline="true" ref="importForm" label-position="top">
+        <el-form-item label="订单号">
+          <el-input v-model="importForm.orderNo"></el-input>
+        </el-form-item>
+        <el-form-item label=" ">
+          <el-button type="primary" @click="handleImportIFS">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table :data="importDataList" border height="300" @row-dblclick="ifsOrderRowClick">
+        <el-table-column label="订单号" prop="orderNo"></el-table-column>
+        <el-table-column label="产品编码" prop="partNo"></el-table-column>
+        <el-table-column label="产品名称" prop="partDesc"></el-table-column>
+        <el-table-column label="订单数量" prop="lotSize"></el-table-column>
+        <el-table-column label="订单日期" prop="planStartDate"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>