Huabao
/
FactorySystemWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改物料路线BUG

Browse Source
master
leo 3 years ago
parent acced8a43f
commit 973fb752e4
13 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
src/views/System/components/EditUser.vue
Unescape View File

@ -80,7 +80,7 @@
mounted() {
this.factoryLists = JSON.parse(JSON.stringify(this.factoryList));
this.stateLists = JSON.parse(JSON.stringify(this.stateList));
debugger
let userInfo = JSON.parse(JSON.stringify(this.userInfoObj));
userInfo.FUser = userInfo.FUser || " ";
userInfo.FPassword = userInfo.FPassword || "123456";

4
src/views/System/components/EditUser2.vue
Unescape View File

@ -141,7 +141,7 @@ export default {
mounted() {
//this.factoryLists = JSON.parse(JSON.stringify(this.factoryList));
this.stateLists = JSON.parse(JSON.stringify(this.stateList));
debugger
let userInfo = JSON.parse(JSON.stringify(this.userInfoObj));
userInfo.FUser = userInfo.FUser || " ";
userInfo.FPassword = userInfo.FPassword || "123456";
@ -199,7 +199,7 @@ export default {
this.userInfo.FUser = this.userInfo.FUser.trim();
this.userInfo.FPassword = this.userInfo.FPassword.trim();
this.userInfo.FName = this.userInfo.FName.trim();
debugger
//this.userInfo.FFactoryID = this.userInfo.FFactoryID.trim();
//this.userInfo.FRoleID = this.userInfo.FRoleID || -1;
//this.userInfo.FRoleName = role == null ? "" : role.FName;

2
src/views/System/components/PowerRole.vue
Unescape View File

@ -302,7 +302,7 @@
return ids;
}
debugger
let result = await saveRolePower({
FRoleId: this.roleInfo.FID,
FMenuId: this.tabIndex == 1 ? getIds(this.menuList).join(',') : null,

2
src/views/Team/all.vue
Unescape View File

@ -266,7 +266,7 @@
item.FAddDate = item.FAddDate == null ? "" : this.dateFormat(item.FAddDate);
});
this.pageInfo.total = result.Data.Total || 0;
debugger
this.dataList = result.Data.List.map(function(item){
if(factoryList){

2
src/views/Team/components/ShowData1.vue
Unescape View File

@ -307,7 +307,7 @@
result.forEach((item) => {
let viewData = dataList.find(s => s.name == item.FName) || null;
debugger
if (viewData == null) {
if (hasType.indexOf(item.FCode) != -1) {
viewData = {

2
src/views/half/components/EditMateria.vue
Unescape View File

@ -330,7 +330,7 @@ export default {
item.FTypeName = type == null ? item.FType : type.FName;
if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID
});
debugger
this.dataList = result.Data;
}

3
src/views/half/components/EditView.vue
Unescape View File

@ -293,7 +293,6 @@ export default {
// it.cellClass = "edit-item"
// return it;
// });
debugger
if (editColumn.length > 0) {
if (this.selectDataMap == null) {
@ -487,7 +486,7 @@ export default {
console.log('this.editColumn', this.editColumn);
for (let col of this.dataColumn) {
let valTemp = row[col.key];
debugger
if (!dataObj[col.table]) {
dataObj[col.table] = {};
dataObj[col.table].FMaterialID = row["FMaterialID"];

6
src/views/half/components/EditViewOFF.vue
Unescape View File

@ -296,10 +296,6 @@ export default {
}
})
debugger
if (editColumn.length > 0) {
if (this.selectDataMap == null) {
let dataTypeIds = editColumn.filter(it => {
@ -508,7 +504,7 @@ export default {
console.log('this.editColumn', this.editColumn);
for (let col of this.dataColumn) {
let valTemp = row[col.key];
debugger
if (!dataObj[col.table]) {
dataObj[col.table] = {};
dataObj[col.table].FMaterialID = row["FMaterialID"];

4
src/views/half/components/ShowData1.vue
Unescape View File

@ -244,7 +244,7 @@ export default {
Type: 2
}) || [];
debugger
console.log('result', result);
console.log('this.dataInfoObj', this.dataInfoObj);
let dataList = [];
@ -252,7 +252,7 @@ export default {
result.forEach((item) => {
let viewData = dataList.find(s => s.name == item.FName) || null;
debugger
if (viewData == null) {
if (hasType.indexOf(item.FCode) != -1) {
viewData = {

2
src/views/half/route.vue
Unescape View File

@ -315,7 +315,7 @@ export default {
else {
return layer.msg("未知事项类型");
}
debugger
this.objInfoObj = data;
this.editType = type;
this.showEditBox[data.FBoxType] = true;

4
src/views/materia/all.vue
Unescape View File

@ -47,7 +47,7 @@
<span v-else style="color:#1E9FFF">已完成</span>
</template>
<template v-slot:operator="{ data }">
<lay-button size="xs" type="primary" @click="showEditMaterial(3, data)">视图</lay-button>
<lay-button v-if="data.FIsShowView" size="xs" type="primary" @click="showEditMaterial(3, data)">视图</lay-button>
</template>
</lay-table>
</lay-card>
@ -297,6 +297,8 @@
}
});
console.log('result', result);
this.hasLoaded = true;
},
//日期处理

6
src/views/materia/components/EditView.vue
Unescape View File

@ -7,13 +7,13 @@
<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" :data-source="dataList"
:cellStyle="cellStyle" :cellClassName="cellClassName">
<template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2">
<lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">保存
</lay-button>
<lay-button v-if="dataInfoObj.FDesc == '物料视图确认'" size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">确认</lay-button>
<lay-button v-else size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">保存</lay-button>
<lay-button size="sm" type="primary" style="float:right;" :disabled="editColumn.length === 0"
@click="_clickFreezingColumnSetting()">固定项
</lay-button>
</template>
<template v-slot:toolbar v-else>
<template v-slot:toolbar v-else-if="dataInfoObj.FIsDownloadView">
<lay-button size="sm" @click="downSAP" type="primary">导出SAP
</lay-button>
<lay-button size="sm" @click="downView" type="primary">导出视图

5
src/views/materia/route.vue
Unescape View File

@ -49,7 +49,7 @@
</lay-card>
</lay-col>
</lay-row>
<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" title="编辑物料">
<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" :title="objInfoObj.FDesc">
<EditView v-if="showEditBox[3]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView>
</lay-layer>
</lay-container>
@ -263,7 +263,7 @@
if (!("FType" in this.postData)) this.postData.FType = -1;
this.postData.FPageIndex = this.pageInfo.current;
this.postData.FPageSize = this.pageInfo.limit;
console.log('this.postData', this.postData);
let result = await getPageList(this.postData, "MaterialTask");
result.Data.List = result.Data.List || [];
@ -290,7 +290,6 @@
}
});
this.hasLoaded = true;
console.log('this.dataList', this.dataList);
},
//日期处理
dateFormat(dataStr) {

Write Preview
Loading…
Cancel
Save