diff --git a/src/views/Team/components/ShowView.vue b/src/views/Team/components/ShowView.vue index 64263b1..9f83e10 100644 --- a/src/views/Team/components/ShowView.vue +++ b/src/views/Team/components/ShowView.vue @@ -54,7 +54,9 @@ this.initPage(); }, methods: { + initPage() { + debugger let dataColumn = [{ type: "number", title: "序号", diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue index 53a2f62..7fcfa94 100644 --- a/src/views/half/components/EditMateria.vue +++ b/src/views/half/components/EditMateria.vue @@ -40,7 +40,7 @@ 取消 - + @@ -154,7 +154,11 @@ export default { title: "物料描述", key: "FDesc", width: "110px", - width: "260px" + }, + { + title: "模式", + key: "FFactoryID", + width: "110px", }, { title: "产品分类", @@ -295,24 +299,22 @@ export default { this.showEditBox = true; }, _getSeachData(data) { - debugger if (this.dataType == 1) { this.formula1 = data.FTestCode; - this.formula1Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FDesc; + this.formula1Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FName; this.fVersion1Code=data.FVersionCode; - this.FDesc=data.FDesc; + this.FDesc=data.FName; this._getPageList(true); } else { this.formula2 = data.FTestCode; - this.formula2Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FDesc; + this.formula2Name = data.FTestCode+"+"+data.FVersionCode+"+"+data.FName; this.fVersion2Code=data.FVersionCode; - this.FNewDesc=data.FDesc; + this.FNewDesc=data.FName; } this.showEditBox = false; }, //配方接口 async _getPageList(isFirst) { - debugger if (isFirst) { this.pageInfo.current = 1; this.pageInfo.total = 0; @@ -329,8 +331,16 @@ export default { } if (this.formula1Name != "") { let result = await getPageList(postData, "Material"); + debugger + let factoryList=[]; + for(let i=0;i { + if(factoryList){ + item.FFactoryID=factoryList.find(s=>s.FID==item.FFactoryID).FName; + } let type = this.typeList.find(s => s.FValue == item.FType); item.FTypeName = type == null ? item.FType : type.FName; if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID @@ -366,7 +376,6 @@ export default { } let ids = layer.load(0) - debugger let result = await InsertDataModel(postData); if (result.Code == 200) { diff --git a/src/views/half/components/MaterialSelect.vue b/src/views/half/components/MaterialSelect.vue index a006d41..60bdfe7 100644 --- a/src/views/half/components/MaterialSelect.vue +++ b/src/views/half/components/MaterialSelect.vue @@ -57,6 +57,11 @@ key: "FName", align: 'center' }, + { + title: "版本号", + key: "FVersionCode", + align: 'center' + }, { title: "操作", key: "operator", @@ -110,10 +115,10 @@ this.postData.FPageIndex = this.pageInfo.current; this.postData.FPageSize = this.pageInfo.limit; let result = await getPageList(this.postData, "Formula"); + debugger result.Data.List = result.Data.List || []; this.pageInfo.total = result.Data.Total || 0; this.dataList = result.Data.List; - debugger }, //日期处理 dateFormat(dataStr) { @@ -121,7 +126,6 @@ }, _choseData(data) { let $this = this; - debugger layer.confirm("您确定要选择此子项吗？", { title: "提示", btn: [{ diff --git a/src/views/half/components/ShowData1.vue b/src/views/half/components/ShowData1.vue index 6f2d504..0492402 100644 --- a/src/views/half/components/ShowData1.vue +++ b/src/views/half/components/ShowData1.vue @@ -4,22 +4,32 @@ -
原配方：
 -
{{dataInfoObj.FTestCode}}+{{dataInfoObj.FVersionCode}}+{{dataInfoObj.FDesc}}
 + +
原配方：
+ + +
+ {{ dataInfoObj.FTestCode }}+{{ dataInfoObj.FVersionCode }}+{{ dataInfoObj.FDesc }}
+ -
变更后的配方：
 -
{{dataInfoObj.FNewTestCode}}+{{dataInfoObj.FNewVersionCode}}+{{dataInfoObj.FNewDesc}}
 + +
变更后的配方：
+ + +
+ {{ dataInfoObj.FNewTestCode }}+{{ dataInfoObj.FNewVersionCode }}+{{ dataInfoObj.FNewDesc }}
+ - 视图信息 - + 视图信息 + @@ -27,234 +37,244 @@ - - - - + diff --git a/src/views/half/half.vue b/src/views/half/half.vue index 582b233..93f396d 100644 --- a/src/views/half/half.vue +++ b/src/views/half/half.vue @@ -1,5 +1,6 @@ @@ -70,10 +71,13 @@ import { getBasicList, getPageList } from "/src/api/api/common"; +import{ + getFactoryList +}from "/src/api/api/factory"; import ShowData1 from '../half/components/ShowData1.vue'; import EditMateria from '../half/components/EditMateria.vue'; import EditView from '../half/components/EditView.vue'; -import {GetMaterialTeamworkPageList} from"/src/api/api/halfmaterialteamwork" +import { GetMaterialTeamworkPageList } from "/src/api/api/halfmaterialteamwork" import '@layui/layui-vue/es/checkbox/index.css'; import '@layui/layui-vue/es/radio/index.css'; @@ -119,12 +123,12 @@ export default { align: 'center' }, { - title: "产品分类", - key: "FType", + title: "模式", + key: "FCreateFactoryID", width: "150px", align: 'center' }, - + { title: "发起时间", key: "FAddDate", @@ -156,6 +160,7 @@ export default { const selectedKeys = ref(["1"]); const checkbox = ref(false); const defaultToolbar = ref(true); + const factoryLists = ref([]); const pageInfo = ref({ total: 0, limit: 10, @@ -196,7 +201,8 @@ export default { stateList, hasLoaded, MaterialModel, - dataItem + dataItem, + factoryLists }; }, props: { @@ -219,9 +225,14 @@ export default { this.dataColumn[7].hide = false; } this._getTypeList(); - this._getPageList(true); + this._getFactoryList(); + }, methods: { + async _getFactoryList(){ + this.factoryLists=await getFactoryList()||[]; + this._getPageList(true); + }, changePage(obj) { this.pageInfo.current = obj.current; this.pageInfo.limit = obj.limit; @@ -241,32 +252,37 @@ export default { }, //分页列表 async _getPageList(isFirst, showOk) { - - this.pageInfo.total = 0; - if (isFirst) { - this.pageInfo.current = 1; - this.pageInfo.total = 0; - } - this.postData.FPageIndex = this.pageInfo.current; - this.postData.FPageSize = this.pageInfo.limit; - if (this.dataInfoObj != undefined) { - this.postData.FDataType = this.dataInfoObj; - } + let factoryList=[]; + for(let i=0;is.FID==item.FCreateFactoryID).FName; } - else if(item.FState==1){ - item["FStateName"]="进行中"; + if (item.FState == 2) { + item["FStateName"] = "已完成"; + } + else if (item.FState == 1) { + item["FStateName"] = "进行中"; } return item; }); - debugger this.hasLoaded = true; }, @@ -283,13 +299,11 @@ export default { this.editType = 1; }, - showEditMaterial(i,data) { - debugger - if(data) - { - data["FTeamID"]=data.FID; + showEditMaterial(i, data) { + if (data) { + data["FTeamID"] = data.FID; } - this.objInfoObj=data; + this.objInfoObj = data; this.showEditBox[i] = true; },