diff --git a/src/api/basic/busType.js b/src/api/basic/busType.js index d46d72d1..555c75a9 100644 --- a/src/api/basic/busType.js +++ b/src/api/basic/busType.js @@ -27,6 +27,14 @@ export function getLocalJoinByUserOptimize(params) { }); } +export function getOrderDetailBusOptimize(params) { + return axios({ + url: "/udiwms/orderDetail/busTypesOptimize", + method: "get", + params: params + }); +} + export function getOrderDetailBus(params) { return axios({ diff --git a/src/api/system/invWarehouse.js b/src/api/system/invWarehouse.js index b921abec..f8de658c 100644 --- a/src/api/system/invWarehouse.js +++ b/src/api/system/invWarehouse.js @@ -259,6 +259,13 @@ export function findAllInvByUser(params) { }); } +export function findAllInvByUserOptimize(params) { + return axios({ + url: "/spms/inv/warehouse/findAllInvByUserOptimize", + method: "get", + params: params + }); +} diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 5abf0729..2132f795 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -37,159 +37,226 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -240,213 +307,300 @@ style="width: 100%" border key="1" - @selection-change="handleSelectionChange" + @selection-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" > - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - this.deleteOrders(rowId); + _this.deleteOrders(rowId); }) .catch(() => { }); @@ -1994,12 +2154,12 @@ export default { }); }); }, - intentSelectUdi(val) { - this.relId = val.id; - this.isImportUdi = true; - this.isImport = true; - this.thisData = val; - this.selectLocalVisible = true; + intentSelectUdi(_this,val) { + _this.relId = val.id; + _this.isImportUdi = true; + _this.isImport = true; + _this.thisData = val; + _this.selectLocalVisible = true; }, intentImportUdi() { @@ -2014,8 +2174,8 @@ export default { this.selectLocalVisible = true; }, - handleSelectionChange(val) { - this.multipleSelection = val; + handleSelectionChange(_this,val) { + _this.multipleSelection = val; }, cancelDialog() { @@ -2027,30 +2187,30 @@ export default { this.filterQuery.page = val.page; this.getList(); }, - handleModifyClick(row) { - this.uuid = row.uuid; - this.relId = row.id; - this.isImport = false; - this.thisData = row; - this.editDialogVisible = true; - - this.pId = row.id; - this.relevanceEdit = { + handleModifyClick(_this,row) { + _this.uuid = row.uuid; + _this.relId = row.id; + _this.isImport = false; + _this.thisData = row; + _this.editDialogVisible = true; + + _this.pId = row.id; + _this.relevanceEdit = { id: row.id, isUseDy: row.isUseDy, isDisable: row.isDisable, isLock: row.isLock, isAdavence: row.isAdavence, }; - this.checked = row.isUseDy == 1; - this.editQuery = row; + _this.checked = row.isUseDy == 1; + _this.editQuery = row; //获取产品标识列表 let ttquery = { id: row.id, }; - this.getDetailList(ttquery); + _this.getDetailList(ttquery); //获取关联第三方系统产品信息列表 - this.getThirdSysDetail(); + _this.getThirdSysDetail(); }, @@ -2119,15 +2279,15 @@ export default { } }, - getSysFilter() { - sysFilter() + getSysFilter(_this,query) { + sysFilterOptimize() .then((response) => { - this.loading = false; - this.filterList = response.data.list || []; + _this.loading = false; + _this.options.getSysFilter = response.data.list || [] }) .catch(() => { - this.loading = false; - this.filterList = []; + _this.loading = false; + _this.options.getSysFilter = [] }); }, singleDiEdit() { @@ -2140,21 +2300,21 @@ export default { this.editSingleFormat.nameCode = temp.nameCode; this.editSingleDiDialogVisible = true; }, - diEdit(row) { - this.uuid = row.uuid; - this.relId = row.id; - this.isImport = false; - this.thisData = row; - this.pId = row.id; - this.relevanceEdit = { + diEdit(_this,row) { + _this.uuid = row.uuid; + _this.relId = row.id; + _this.isImport = false; + _this.thisData = row; + _this.pId = row.id; + _this.relevanceEdit = { id: row.id, isUseDy: row.isUseDy, isDisable: row.isDisable, isLock: row.isLock, isAdavence: row.isAdavence, }; - this.editFormat = JSON.parse(JSON.stringify(row)); - this.editDiDialogVisible = true; + _this.editFormat = JSON.parse(JSON.stringify(row)); + _this.editDiDialogVisible = true; }, closeDialog() { this.selectErpDialogVisible = false; @@ -2265,6 +2425,15 @@ export default { .catch(() => { this.loading = false; }); + }, + executeFuc(row,type,clickFuc,value){ + return executeFuc(this,row,type,clickFuc,value); + }, + executeEval(row,expression,defaultRet){ + if(expression){ + return eval(expression); + } + return defaultRet; } }, mounted() { @@ -2283,10 +2452,17 @@ export default { created() { this.vueRouteSource = this.$route.query.vueRouteSource; this.findBasicProductSet(); - this.getList(); + getHead("product","1").then((re) => { + // 处理返回的数据 + this.tableObj = re.data; + this.tableHeader = re.data.tableList; + this.queryList = re.data.queryList; + this.fromList = re.data.fromList; + this.getList() + }); this.getTerrList(); // this.selectSysParam(); - this.getSysFilter(); + this.getSysFilter(this,""); }, }; diff --git a/src/views/inventory/InvPreProducts.vue b/src/views/inventory/InvPreProducts.vue index 291fbe27..c72be95c 100644 --- a/src/views/inventory/InvPreProducts.vue +++ b/src/views/inventory/InvPreProducts.vue @@ -1,145 +1,214 @@