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 {
- 从IFS导入
+ 从IFS导入
@@ -439,7 +506,7 @@ export default {
产品编码
-
+
@@ -476,12 +543,41 @@ export default {
-
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+