diff --git a/src/api/system/sysCustomConfig.js b/src/api/system/sysCustomConfig.js new file mode 100644 index 0000000..396f492 --- /dev/null +++ b/src/api/system/sysCustomConfig.js @@ -0,0 +1,41 @@ +import axios from "@/utils/request"; + +export function list(query) { + return axios({ + url: "/system/custom/config/list", + method: "get", + params: query + }); +} + + +// 保存 +export function saveCustomConfig(data, formName, method = "post") { + let url = + formName !== "edit" + ? "/system/custom/config/save" + : "/system/custom/config/edit"; + return axios({ + url: url, + method: method, + data: data + }); +} + +// 删除 +export function devCustomConfig(data) { + return axios({ + url: "/system/custom/config/delete", + method: "post", + data: data + }); +} + + +export function getConfigs(query) { + return axios({ + url: "/system/custom/config/getConfigs", + method: "post", + data: query + }); +} diff --git a/src/api/system/sysCustomConfigDetail.js b/src/api/system/sysCustomConfigDetail.js new file mode 100644 index 0000000..28505ea --- /dev/null +++ b/src/api/system/sysCustomConfigDetail.js @@ -0,0 +1,32 @@ +import axios from "@/utils/request"; + +export function list(query) { + return axios({ + url: "/system/custom/configDetail/list", + method: "get", + params: query + }); +} + + +// 保存 +export function saveCustomConfig(data, formName, method = "post") { + let url = + formName !== "edit" + ? "/system/custom/configDetail/save" + : "/system/custom/configDetail/edit"; + return axios({ + url: url, + method: method, + data: data + }); +} + +// 删除 +export function devCustomConfig(data) { + return axios({ + url: "/system/custom/configDetail/delete", + method: "post", + data: data + }); +} diff --git a/src/utils/customConfig.js b/src/utils/customConfig.js new file mode 100644 index 0000000..7ccea2b --- /dev/null +++ b/src/utils/customConfig.js @@ -0,0 +1,120 @@ +import {getConfigs} from "@/api/system/sysCustomConfig"; +import {Message} from "element-ui"; +function getColer(item,value){ + const colorRule = item.colorRule; + if(colorRule && colorRule.indexOf(",") != -1){ + var arr = colorRule.split("|"); + var reColor = ""; + arr.some(s => { + var arrTemp = s.split(","); + const type = arrTemp[0] + const valueT = arrTemp[1] + const color = arrTemp[2] + if(type == "=" && value == valueT){ + reColor = color; + }else if(type == ">=" && value >= valueT){ + reColor = color; + }else if(type == ">" && value > valueT){ + reColor = color; + }else if(type == "<" && value < valueT){ + reColor = color; + }else if(type == "<=" && value <= valueT){ + reColor = color; + } else if(type == "0"){ + reColor = color; + } + }) + return reColor; + }else{ + return colorRule; + } +} + + +export async function getHead(businessType,type){ + try { + var subData = {}; + subData.businessType = businessType; + subData.type = type; + const re = await getConfigs(subData); + if(re.code != 20000){ + Message.error("获取配置失败"); + } + return re; + } catch (error) { + console.error(error); + } +} + + +export function executeFuc(_this,row,number,type,clickFuc,value){ + if("1" == type){ + //按钮事件 + return callModelFun(_this,clickFuc,row); + }else if("3" == type){ + //按钮是否禁用事件 + if(clickFuc){ + return callModelFun(_this,clickFuc,row); + }else{ + return false; + } + }else if("4" == type){ + //颜色方法 + return getColer(clickFuc,value); + }else if("5" == type){ + //查询input方法 + if(clickFuc){ + return callModelFun(_this,clickFuc,row); + }else{ + return false; + } + }else if("6" == type){ + //查询input方法 + if(clickFuc){ + return callModelFun(_this,clickFuc,row); + }else{ + return false; + } + }else if("2" == type){ + if(number.clickFuc){ + //表单事件 + return callModelFun(_this,number.clickFuc,row); + }else{ + return true; + } + }else if(number != null && number >= 0){ + //复选框事件 + var checkSelectableFuc = "" + _this.tableObj.tableList.forEach(obj => { + if(obj.columnType == "selection"){ + checkSelectableFuc = obj.clickFuc; + } + }) + // + if(checkSelectableFuc){ + return callModelFun(_this,checkSelectableFuc,row); + }else{ + return true; + } + }else{ + console.log(row); + //表单点击事件 + if(_this.tableObj.handleChangeFuc){ + return callModelFun(_this,_this.tableObj.handleChangeFuc,row); + } + + return true; + } +} + + +/** + * 根据方法名称调用方法 + */ +function callModelFun(_this,funcName,row) { + let methods = _this.$options.methods; + // 解释说明一下, this需要传入目标方法, 否则,在目标方法中修改data中的值, 将不会重新渲染dom, 跟v-if结合使用的过程中需要注意 + return methods[funcName](_this,row); +} + + diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue index 9ebd90d..1c43108 100644 --- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue +++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue @@ -2,82 +2,142 @@
- - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -105,54 +165,139 @@ v-loading="loading" highlight-current-row="true" :row-class-name="tableRowClassName" - @current-change="handleErpChange" + @current-change="executeFuc" @selection-change="handleSelectionUdiChange" > - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - this.loading = false; - this.fromOptions = response.data || []; + _this.options.loading = false; + _this.options = { + findMethod: response.data || [] + }; }) .catch(() => { - this.loading = false; - this.fromOptions = []; + _this.options.loading = false; + _this.options = { + findMethod: [] + }; }); }, + executeFuc(row,number,type,clickFuc,value){ + return executeFuc(this,row,number,type,clickFuc,value); + } }, components: { selectDiDetail, }, created() { + getHead("UdiInfoSelectLocalUdi","1").then((re) => { + // 处理返回的数据 + this.tableObj = re.data; + this.tableHeader = re.data.tableList; + this.queryList = re.data.queryList; + this.fromList = re.data.fromList; + }); } }; diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue index 21a18be..40cf92e 100644 --- a/src/views/basic/product/product.vue +++ b/src/views/basic/product/product.vue @@ -38,147 +38,207 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -219,189 +279,275 @@ style="width: 100%" border key="1" - @selection-change="handleSelectionChange" + @current-change="executeFuc" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { - this.deleteOrders(rowId); + _this.deleteOrders(rowId); }) .catch(() => { }); @@ -1949,12 +2102,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() { @@ -1969,8 +2122,8 @@ export default { this.selectLocalVisible = true; }, - handleSelectionChange(val) { - this.multipleSelection = val; + handleSelectionChange(_this,val) { + _this.multipleSelection = val; }, cancelDialog() { @@ -1982,31 +2135,34 @@ 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 = { + disabledUdi(_this,row) { + return row.originUuid != null + }, + 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.checked = row.isUseDy == 1; - this.editQuery = row; + _this.editQuery = row; //获取产品标识列表 let ttquery = { id: row.id, }; - this.getDetailList(ttquery); + _this.getDetailList(ttquery); //获取关联第三方系统产品信息列表 - this.getThirdSysDetail(); + _this.getThirdSysDetail(); }, lockProducts(status) { @@ -2049,15 +2205,19 @@ export default { } }, - getSysFilter() { + getSysFilter(_this,query) { sysFilter() .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() { @@ -2070,27 +2230,27 @@ 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)); - if (this.editFormat.overStockNum == null) { - this.editFormat.overStockNum = 0; + _this.editFormat = JSON.parse(JSON.stringify(row)); + if (_this.editFormat.overStockNum == null) { + _this.editFormat.overStockNum = 0; } - if (this.editFormat.lowStockNum == null) { - this.editFormat.lowStockNum = 0; + if (_this.editFormat.lowStockNum == null) { + _this.editFormat.lowStockNum = 0; } - this.editDiDialogVisible = true; + _this.editDiDialogVisible = true; }, closeDialog() { this.selectErpDialogVisible = false; @@ -2259,6 +2419,9 @@ export default { .catch(() => { }); }, + executeFuc(row,number,type,clickFuc,value){ + return executeFuc(this,row,number,type,clickFuc,value); + } }, mounted() { }, @@ -2275,10 +2438,17 @@ export default { }, created() { this.findBasicProductSet(); - this.getList(); + getHead("maintain","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/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue new file mode 100644 index 0000000..2ea3e1b --- /dev/null +++ b/src/views/system/customConfig/configDetail.vue @@ -0,0 +1,599 @@ + + + diff --git a/src/views/system/customConfig/configFromDetail.vue b/src/views/system/customConfig/configFromDetail.vue new file mode 100644 index 0000000..4c89a3a --- /dev/null +++ b/src/views/system/customConfig/configFromDetail.vue @@ -0,0 +1,478 @@ + + + diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue new file mode 100644 index 0000000..4319a27 --- /dev/null +++ b/src/views/system/customConfig/configQueryDetail.vue @@ -0,0 +1,436 @@ + + + diff --git a/src/views/system/customConfig/index.vue b/src/views/system/customConfig/index.vue new file mode 100644 index 0000000..3f0bffd --- /dev/null +++ b/src/views/system/customConfig/index.vue @@ -0,0 +1,307 @@ + + +