From 6d56fcaf5d337ac700111055c7ee30a9cd4f4f88 Mon Sep 17 00:00:00 2001 From: Yang <903110162@qq.com> Date: Sat, 22 Apr 2023 16:19:53 +0800 Subject: [PATCH] commit by yzf --- src/api/api/material.ts | 3 +- src/api/api/materialType.ts | 9 + src/views/System/components/EditUser2.vue | 38 ++++- src/views/System/user.vue | 24 +-- src/views/half/components/EditMateria.vue | 45 +++-- src/views/half/components/EditView.vue | 138 +++++++-------- src/views/half/components/EditViewOFF.vue | 197 +++++----------------- src/views/half/components/FormulaView.vue | 2 +- src/views/half/components/ShowData1.vue | 4 +- src/views/half/half.vue | 23 ++- src/views/half/route.vue | 22 ++- 11 files changed, 225 insertions(+), 280 deletions(-) diff --git a/src/api/api/material.ts b/src/api/api/material.ts index 1a2f087..440a96d 100644 --- a/src/api/api/material.ts +++ b/src/api/api/material.ts @@ -54,4 +54,5 @@ export async function UpdateDataModel(param) result = data; }); return result; -} \ No newline at end of file +} + diff --git a/src/api/api/materialType.ts b/src/api/api/materialType.ts index c01dfab..6335083 100644 --- a/src/api/api/materialType.ts +++ b/src/api/api/materialType.ts @@ -19,3 +19,12 @@ export async function changeInfoData(param) { } +//获取物料分类 +export async function GetMaterialInfoList(param) +{ + let result = []; + await http.post('/api/Material/GetMaterialInfoList', param).then((data) => { + result = data; + }); + return result; +} \ No newline at end of file diff --git a/src/views/System/components/EditUser2.vue b/src/views/System/components/EditUser2.vue index 1eea7ec..3178b47 100644 --- a/src/views/System/components/EditUser2.vue +++ b/src/views/System/components/EditUser2.vue @@ -215,12 +215,24 @@ export default { if (this.userInfo.FUser == "" || this.userInfo.FPassword == "" || this.userInfo.FName == "") { return false; } + var str=""; if (this.userInfo.FID && this.userInfo.FID > 0) { - - for (let i = 0; i < sItemsCount; i++) { if (document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value > -1 && document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value > -1 &&document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value!=""&&document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value!="") { + let indexValue=document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].selectedIndex; + let indexName=document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].selectedIndex; + + let item =arr1.find(m=>m.FFactoryID==document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value); + if(item!=null) + { + layer.msg("已存在相同模式", { + time: 1000, + icon: 2 + }); + return false; + } + arr1.push(document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value); arr2.push(document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value); arr.push({ @@ -228,6 +240,8 @@ export default { FFactoryID: document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value, FRole: document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value }); + + str+=document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].options[indexValue].text+"=>"+document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].options[indexName].text+"\r\n"; } else { layer.msg("权限不能为空", { @@ -236,11 +250,10 @@ export default { }) return false; } - - } this.userInfo.FFactoryList=","+arr1.join(",")+","; this.userInfo.FRoleList=","+arr2.join(",")+","; + this.userInfo.FRoleName=str; result = await updateDataInfo(this.userInfo, "User") || 0; result = await CreatePower(arr) || 0; @@ -253,6 +266,19 @@ export default { for (let i = 0; i < sItemsCount; i++) { if (document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value > -1 && document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value > -1 &&document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value!=""&&document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value!="") { + let indexValue=document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].selectedIndex; + let indexName=document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].selectedIndex; + + let item =arr1.find(m=>m.FFactoryID==document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value); + if(item!=null) + { + layer.msg("已存在相同模式", { + time: 1000, + icon: 2 + }); + return false; + } + arr1.push(document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value); arr2.push(document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value); arr.push({ @@ -260,6 +286,8 @@ export default { FFactoryID: document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].value, FRole: document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].value }); + str+=document.querySelectorAll(".sItem")[i].querySelectorAll("select")[0].options[indexValue].text+"=>"+document.querySelectorAll(".sItem")[i].querySelectorAll("select")[1].options[indexName].text+"\r\n"; + } else { layer.msg("权限不能为空", { @@ -268,9 +296,9 @@ export default { }) return false; } - this.userInfo.FFactoryList=","+arr1.join(",")+","; this.userInfo.FRoleList=","+arr2.join(",")+","; + this.userInfo.FRoleName=str; } if(arr.length>0) diff --git a/src/views/System/user.vue b/src/views/System/user.vue index 37f3d25..2857ab9 100644 --- a/src/views/System/user.vue +++ b/src/views/System/user.vue @@ -227,20 +227,20 @@ export default { result.Data.List.forEach((item) => { let state = this.stateList.find(s => s.FValue == item.FState); item.FStateName = state == null ? "" : state.FName; - let str = ""; - var power = this.powerList.filter(function (p) { - return p.FUserID == item.FID; - }); + // let str = ""; + // var power = this.powerList.filter(function (p) { + // return p.FUserID == item.FID; + // }); - for (let i = 0; i < power.length; i++) { - if (power[i].FRole != "" && power[i].FFactoryID != "") { - let factory = this.factoryList.find(s => s.FID == power[i].FFactoryID); - let role = this.roleLists.find(s => s.FID == power[i].FRole); - str += factory.FName + "=>" + role.FName + "\r\n"; - } - } + // for (let i = 0; i < power.length; i++) { + // if (power[i].FRole != "" && power[i].FFactoryID != "") { + // let factory = this.factoryList.find(s => s.FID == power[i].FFactoryID); + // let role = this.roleLists.find(s => s.FID == power[i].FRole); + // str += factory.FName + "=>" + role.FName + "\r\n"; + // } + // } - item.FRoleName = str; + //item.FRoleName = str; item.FLoginDate = item.FLoginDate == null ? "" : this.dateFormat(item.FLoginDate); diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue index ad294b1..45ac712 100644 --- a/src/views/half/components/EditMateria.vue +++ b/src/views/half/components/EditMateria.vue @@ -193,6 +193,10 @@ export default { const formula2 = ref(-1); const formula2Name = ref(""); const factoryID = ref(""); + const fVersion1Code=ref(""); + const fVersion2Code=ref(""); + const FDesc=ref(""); + const FNewDesc=ref(""); return { dataInfo, formulaList, @@ -211,8 +215,12 @@ export default { formula2, formula1Name, formula2Name, + fVersion1Code, + fVersion2Code, dataType, - factoryID + factoryID, + FDesc, + FNewDesc } }, props: { @@ -284,19 +292,21 @@ export default { }, selectMaterial(str) { this.dataType = str; - this.showEditBox = true; - this.editDataInfo.FName = ""; }, _getSeachData(data) { debugger if (this.dataType == 1) { this.formula1 = data.FTestCode; this.formula1Name = data.FName; + this.fVersion1Code=data.FVersionCode; + this.FDesc=data.FDesc; this._getPageList(true); } else { this.formula2 = data.FTestCode; this.formula2Name = data.FName; + this.fVersion2Code=data.FVersionCode; + this.FNewDesc=data.FDesc; } this.showEditBox = false; }, @@ -324,7 +334,6 @@ export default { item.FTypeName = type == null ? item.FType : type.FName; if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID }); - debugger this.pageInfo.total = result.Data.Total || 0; this.dataList = result.Data.List; } @@ -332,7 +341,15 @@ export default { }, //数据-验证 async submitClick(isCreate) { - let postData = { "FTestCode": this.formula1, "FNewTestCode": this.formula2, "FCreateFactoryID": this.factoryID }; + let postData = { + "FTestCode": this.formula1, + "FNewTestCode": this.formula2, + "FVersionCode":this.fVersion1Code, + "FNewVersionCode":this.fVersion2Code, + "FCreateFactoryID": this.factoryID, + "FDesc":this.FDesc, + "FNewDesc":this.FNewDesc + }; if (this.formula1Name.trim() == "") { layer.msg('请选择试验号'); @@ -346,23 +363,17 @@ export default { layer.msg('请选择模式'); return false; } - - if (this.dataList.length <= 0) { - layer.msg('未找到需要变更的物料'); - return false; - } + let ids = layer.load(0) + debugger - - try { - let result = await InsertDataModel(postData); + let result = await InsertDataModel(postData); if (result.Code == 200) { layer.msg('创建成功'); this.cancelClick(true); } else { - layer.msg('创建失败'); + //layer.msg('创建失败'); } - } catch (e) { } layer.close(ids); @@ -403,9 +414,9 @@ export default { let result = 0; let idx = layer.load(2); if (postData.FID && postData.FID > 0) { - result = await updateDataInfo(postData, "Teamwork") || 0; + result = await updateDataInfo(postData, "HalfMaterialTeamwork") || 0; } else { - result = await insertDataInfo(postData, "Teamwork") || 0; + result = await insertDataInfo(postData, "HalfMaterialTeamwork") || 0; } if (result > 0) { this.cancelClick(true); diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue index 10f8347..5ee805b 100644 --- a/src/views/half/components/EditView.vue +++ b/src/views/half/components/EditView.vue @@ -1,12 +1,12 @@