# Conflicts:
#	src/views/Order/components/ShowMaterial.vue
master
Yang 3 years ago
commit 2d1abb7546

25
package-lock.json generated

@ -9,7 +9,8 @@
"version": "1.0.0", "version": "1.0.0",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.18.9", "@babel/runtime": "^7.18.9",
"@layui/layui-vue": "^1.6.4", "@layui/layer-vue": "^1.4.4",
"@layui/layui-vue": "^1.6.6",
"axios": "^0.24.0", "axios": "^0.24.0",
"commitizen": "^4.2.4", "commitizen": "^4.2.4",
"pinia": "^2.0.9", "pinia": "^2.0.9",
@ -860,18 +861,17 @@
}, },
"node_modules/@layui/layer-vue": { "node_modules/@layui/layer-vue": {
"version": "1.4.4", "version": "1.4.4",
"resolved": "https://registry.npmmirror.com/@layui/layer-vue/-/layer-vue-1.4.4.tgz", "resolved": "https://registry.npmjs.org/@layui/layer-vue/-/layer-vue-1.4.4.tgz",
"integrity": "sha512-OVRfwRtr9jI8KICWmzGbHcl2QAy2xke9PYi3A3UJBRH/H8kqc1FsEjVz8V+Dup29DXdWPa+7NkeFY3hUhSbpEA==" "integrity": "sha512-OVRfwRtr9jI8KICWmzGbHcl2QAy2xke9PYi3A3UJBRH/H8kqc1FsEjVz8V+Dup29DXdWPa+7NkeFY3hUhSbpEA=="
}, },
"node_modules/@layui/layui-vue": { "node_modules/@layui/layui-vue": {
"version": "1.6.4", "version": "1.6.6",
"resolved": "https://registry.npmmirror.com/@layui/layui-vue/-/layui-vue-1.6.4.tgz", "resolved": "https://registry.npmjs.org/@layui/layui-vue/-/layui-vue-1.6.6.tgz",
"integrity": "sha512-5B5l3SDW1R4jqAhMI5eb3f0quQ9QoZ2H8/I7A+lhEHxhMmxApd5FhImzyviUqbXnV9DsPf41/KXEPdz+Zze60A==", "integrity": "sha512-93deNYkW/j/E4rDTQmiOQzZNWK+o465iD0Yuk4uhGqlRogLhEDcxmP4v/eKlis2RCy18CWqyQiqMRD2MK6zLsQ==",
"license": "MIT",
"dependencies": { "dependencies": {
"@ctrl/tinycolor": "^3.4.1", "@ctrl/tinycolor": "^3.4.1",
"@layui/icons-vue": "^1.0.9", "@layui/icons-vue": "^1.0.9",
"@layui/layer-vue": "^1.4.4", "@layui/layer-vue": "^1.4.5",
"@umijs/ssr-darkreader": "^4.9.45", "@umijs/ssr-darkreader": "^4.9.45",
"@vueuse/core": "^9.2.0", "@vueuse/core": "^9.2.0",
"async-validator": "^4.1.1", "async-validator": "^4.1.1",
@ -881,6 +881,11 @@
"vue-i18n": "^9.1.10" "vue-i18n": "^9.1.10"
} }
}, },
"node_modules/@layui/layui-vue/node_modules/@layui/layer-vue": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@layui/layer-vue/-/layer-vue-1.8.0.tgz",
"integrity": "sha512-VdkI47dOfa72Mw6o//m5YVTAkEN8kYyH9fIqeDF+KJBYimD+SM5qpb4RPNkHNDQeCCTe7rp3UJrgKI8ANGO8Ig=="
},
"node_modules/@nodelib/fs.scandir": { "node_modules/@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@ -2062,9 +2067,9 @@
"license": "0BSD" "license": "0BSD"
}, },
"node_modules/dayjs": { "node_modules/dayjs": {
"version": "1.11.2", "version": "1.11.7",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz", "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz",
"integrity": "sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw==" "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
}, },
"node_modules/debug": { "node_modules/debug": {
"version": "4.3.4", "version": "4.3.4",

@ -9,7 +9,8 @@
}, },
"dependencies": { "dependencies": {
"@babel/runtime": "^7.18.9", "@babel/runtime": "^7.18.9",
"@layui/layui-vue": "^1.6.4", "@layui/layer-vue": "^1.4.4",
"@layui/layui-vue": "^1.6.6",
"axios": "^0.24.0", "axios": "^0.24.0",
"commitizen": "^4.2.4", "commitizen": "^4.2.4",
"pinia": "^2.0.9", "pinia": "^2.0.9",

@ -313,7 +313,6 @@
}, },
getData(data){ getData(data){
this.MaterialModel = data; this.MaterialModel = data;
debugger
for (let i = 0; i < this.showEditBox.length; i++) { for (let i = 0; i < this.showEditBox.length; i++) {
this.showEditBox[i] = false; this.showEditBox[i] = false;
} }
@ -326,7 +325,6 @@
}, },
_clickSetInfo(data, type) { _clickSetInfo(data, type) {
debugger
for (let i = 0; i < this.showEditBox.length; i++) { for (let i = 0; i < this.showEditBox.length; i++) {
this.showEditBox[i] = false; this.showEditBox[i] = false;
} }

@ -190,8 +190,6 @@
}, },
}, },
mounted() { mounted() {
debugger
this.objInfoObj=this.MaterialModel; this.objInfoObj=this.MaterialModel;
let objInfo = JSON.parse(JSON.stringify(this.objInfoObj)); let objInfo = JSON.parse(JSON.stringify(this.objInfoObj));
objInfo.choseData = { objInfo.choseData = {
@ -228,7 +226,6 @@
}, },
//- //-
async _getPageList(isFirst) { async _getPageList(isFirst) {
debugger
this.pageInfo.total = 0; this.pageInfo.total = 0;
if (isFirst) { if (isFirst) {
this.pageInfo.current = 1; this.pageInfo.current = 1;

@ -1,9 +1,8 @@
<template> <template>
<lay-container fluid="true" class="content-box"> <lay-container fluid="true" class="content-box">
<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView> <FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置"> <FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns" :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="tmpDataColumn" :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting>
</lay-layer> </lay-layer>
<lay-table id="dataTable" v-if="dataColumn.length>0" height="320px" :columns="dataColumn" <lay-table id="dataTable" v-if="dataColumn.length>0" height="320px" :columns="dataColumn"
:data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName"> :data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName">
@ -141,6 +140,7 @@
}; };
const showFreezingColumnSettingBox = ref(false); const showFreezingColumnSettingBox = ref(false);
const freezingColumnSetting = ref([]); const freezingColumnSetting = ref([]);
const originalColumns = ref([]);
const tmpDataColumn = ref([]); const tmpDataColumn = ref([]);
return { return {
dataColumn, dataColumn,
@ -159,6 +159,7 @@
changeVisible2, changeVisible2,
showFreezingColumnSettingBox, showFreezingColumnSettingBox,
freezingColumnSetting, freezingColumnSetting,
originalColumns,
tmpDataColumn tmpDataColumn
}; };
}, },
@ -269,6 +270,7 @@
this.editColumn = editColumn; this.editColumn = editColumn;
this.dataList = _data.rows; this.dataList = _data.rows;
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
this.originalColumns = this.deepCopy(dataColumn);
setTimeout(function() { setTimeout(function() {
layer.close(idx); layer.close(idx);
@ -358,52 +360,42 @@
} }
}, },
_clickFreezingColumnSetting() { _clickFreezingColumnSetting() {
this.tmpDataColumn = this.dataColumn;
this.dataColumn = ref([]); this.dataColumn = ref([]);
this.showFreezingColumnSettingBox = true; this.showFreezingColumnSettingBox = true;
console.log('before', this.tmpDataColumn);
}, },
setFreezingColumns() { setFreezingColumns() {
this.tmpDataColumn = this.deepCopy(this.originalColumns);
let freezingColumns = []; let freezingColumns = [];
if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) { if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
this.freezingColumnSetting.forEach(column => { this.freezingColumnSetting.forEach(column => {
let colIndex = this.tmpDataColumn.findIndex(d => d.key === column); let colIndex = this.tmpDataColumn.findIndex(d => d.key === column);
if (colIndex >= 0) { if (colIndex >= 0) {
let proxyFc = this.tmpDataColumn.splice(colIndex, 1)[0]; let fc = this.tmpDataColumn.splice(colIndex, 1)[0];
const {proxy, revoke} = Proxy.revocable(proxyFc, {});
const fc = {...proxy};
revoke();
console.log('fc', fc);
if (fc) { if (fc) {
fc.fixed = "left"; fc.fixed = "left";
freezingColumns.push(fc); freezingColumns.push(fc);
} }
} }
}) })
}
if (freezingColumns && freezingColumns.length > 0) { this.dataColumn = freezingColumns.concat(this.tmpDataColumn);
for(let i=freezingColumns.length-1; i>=0; i--) {
this.tmpDataColumn.unshift(freezingColumns[i]);
}
// freezingColumns = freezingColumns.concat(this.tmpDataColumn);
this.dataColumn = this.tmpDataColumn;
console.log('after', this.dataColumn);
} else { } else {
this.dataColumn = this.tmpDataColumn; this.dataColumn = this.tmpDataColumn;
} }
}, },
setFreezingColumnsSetting(fcs) { setFreezingColumnsSetting(fcs) {
this.freezingColumnSetting = fcs;
if (fcs && fcs.length > 0) { if (fcs && fcs.length > 0) {
this.freezingColumnSetting = fcs;
// this.freezingColumnSetting = ["FTestCode", "FMaterialGroup", "FWorkCenter"];
this.setFreezingColumns();
} else { } else {
this.dataColumn = this.tmpDataColumn; this.dataColumn = this.originalColumns;
} }
this.showFreezingColumnSettingBox = false; this.showFreezingColumnSettingBox = false;
},
closeFreezingSetting() {
this.setFreezingColumns();
},
deepCopy(arr) {
return JSON.parse(JSON.stringify(arr))
} }
} }
} }

@ -47,10 +47,10 @@
methods: { methods: {
initPage() { initPage() {
this.columnList = this.columns; this.columnList = this.columns;
this.checkedItem = this.freezingColumns this.checkedItem = this.freezingColumns.concat();
}, },
cancelClick() { cancelClick() {
this.$emit('cancelClick'); this.$emit('cancelClick', this.freezingColumns);
}, },
submitClick() { submitClick() {
this.$emit('cancelClick', this.checkedItem); this.$emit('cancelClick', this.checkedItem);

@ -167,9 +167,6 @@ export default {
item["FCraftExplain"]=item.FCraftDesc; item["FCraftExplain"]=item.FCraftDesc;
return item; return item;
}) || []; }) || [];
}, },
cancelClick() { cancelClick() {
this.$emit('cancelClick', false); this.$emit('cancelClick', false);

@ -87,7 +87,6 @@
userInfo.FFactoryID = (userInfo.FFactoryID || " ") + ""; userInfo.FFactoryID = (userInfo.FFactoryID || " ") + "";
userInfo.FState = (userInfo.FState || "1") + ""; userInfo.FState = (userInfo.FState || "1") + "";
userInfo.FRoleID = (userInfo.FRoleID || "") + ""; userInfo.FRoleID = (userInfo.FRoleID || "") + "";
debugger
this._getRoleList(); this._getRoleList();
this.userInfo = userInfo; this.userInfo = userInfo;
console.log(userInfo) console.log(userInfo)

@ -174,7 +174,6 @@ export default {
this.roleID1 = result[0].FRole; this.roleID1 = result[0].FRole;
this.fctoryID1 = result[0].FFactoryID; this.fctoryID1 = result[0].FFactoryID;
debugger
document.getElementsByClassName("sItem")[0].getElementsByClassName("form-select")[0].value=result[0].FFactoryID; document.getElementsByClassName("sItem")[0].getElementsByClassName("form-select")[0].value=result[0].FFactoryID;
document.getElementsByClassName("sItem")[0].getElementsByClassName("form-select")[1].value=result[0].FRole; document.getElementsByClassName("sItem")[0].getElementsByClassName("form-select")[1].value=result[0].FRole;
result.splice(0, 1); result.splice(0, 1);
@ -242,7 +241,6 @@ export default {
} }
this.userInfo.FFactoryList=","+arr1.join(",")+","; this.userInfo.FFactoryList=","+arr1.join(",")+",";
this.userInfo.FRoleList=","+arr2.join(",")+","; this.userInfo.FRoleList=","+arr2.join(",")+",";
debugger
result = await updateDataInfo(this.userInfo, "User") || 0; result = await updateDataInfo(this.userInfo, "User") || 0;
result = await CreatePower(arr) || 0; result = await CreatePower(arr) || 0;

@ -310,7 +310,6 @@ export default {
let val = this.searchObj[key]; let val = this.searchObj[key];
if (val != null && val != "") this.postData[key] = val; if (val != null && val != "") this.postData[key] = val;
} }
debugger
this._getPageList(true); this._getPageList(true);
}, },
//- //-

@ -328,7 +328,6 @@
} }
let idx = layer.load(2); let idx = layer.load(2);
let result = await getTeamworkView(postData); let result = await getTeamworkView(postData);
debugger
layer.close(idx); layer.close(idx);
if (type == 1) { if (type == 1) {
let list = []; let list = [];

@ -428,17 +428,22 @@
"@layui/layer-vue@^1.4.4": "@layui/layer-vue@^1.4.4":
version "1.4.4" version "1.4.4"
resolved "https://registry.npmmirror.com/@layui/layer-vue/-/layer-vue-1.4.4.tgz" resolved "https://registry.npmjs.org/@layui/layer-vue/-/layer-vue-1.4.4.tgz"
integrity sha512-OVRfwRtr9jI8KICWmzGbHcl2QAy2xke9PYi3A3UJBRH/H8kqc1FsEjVz8V+Dup29DXdWPa+7NkeFY3hUhSbpEA== integrity sha512-OVRfwRtr9jI8KICWmzGbHcl2QAy2xke9PYi3A3UJBRH/H8kqc1FsEjVz8V+Dup29DXdWPa+7NkeFY3hUhSbpEA==
"@layui/layui-vue@^1.6.4": "@layui/layer-vue@^1.4.5":
version "1.6.4" version "1.8.0"
resolved "https://registry.npmmirror.com/@layui/layui-vue/-/layui-vue-1.6.4.tgz" resolved "https://registry.npmjs.org/@layui/layer-vue/-/layer-vue-1.8.0.tgz"
integrity sha512-5B5l3SDW1R4jqAhMI5eb3f0quQ9QoZ2H8/I7A+lhEHxhMmxApd5FhImzyviUqbXnV9DsPf41/KXEPdz+Zze60A== integrity sha512-VdkI47dOfa72Mw6o//m5YVTAkEN8kYyH9fIqeDF+KJBYimD+SM5qpb4RPNkHNDQeCCTe7rp3UJrgKI8ANGO8Ig==
"@layui/layui-vue@^1.6.6":
version "1.6.6"
resolved "https://registry.npmjs.org/@layui/layui-vue/-/layui-vue-1.6.6.tgz"
integrity sha512-93deNYkW/j/E4rDTQmiOQzZNWK+o465iD0Yuk4uhGqlRogLhEDcxmP4v/eKlis2RCy18CWqyQiqMRD2MK6zLsQ==
dependencies: dependencies:
"@ctrl/tinycolor" "^3.4.1" "@ctrl/tinycolor" "^3.4.1"
"@layui/icons-vue" "^1.0.9" "@layui/icons-vue" "^1.0.9"
"@layui/layer-vue" "^1.4.4" "@layui/layer-vue" "^1.4.5"
"@umijs/ssr-darkreader" "^4.9.45" "@umijs/ssr-darkreader" "^4.9.45"
"@vueuse/core" "^9.2.0" "@vueuse/core" "^9.2.0"
async-validator "^4.1.1" async-validator "^4.1.1"
@ -1161,9 +1166,9 @@ cz-customizable@^6.6.0:
word-wrap "^1.2.3" word-wrap "^1.2.3"
dayjs@^1.11.0: dayjs@^1.11.0:
version "1.11.2" version "1.11.7"
resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.2.tgz" resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
debug@^3.2.6: debug@^3.2.6:
version "3.2.7" version "3.2.7"
@ -1288,10 +1293,10 @@ error-ex@^1.3.1:
dependencies: dependencies:
is-arrayish "^0.2.1" is-arrayish "^0.2.1"
esbuild-windows-32@0.14.39: esbuild-windows-64@0.14.39:
version "0.14.39" version "0.14.39"
resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz" resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz"
integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q== integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow==
esbuild@^0.14.27, esbuild@>=0.13: esbuild@^0.14.27, esbuild@>=0.13:
version "0.14.39" version "0.14.39"

Loading…
Cancel
Save