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

commit by yzf

Browse Source
master
Yang 3 years ago
parent 81d0bd6931
commit 81f236087f
4 changed files with 412 additions and 346 deletions
Show Stats Download Patch File Download Diff File

13
src/styles/admin.css
Unescape View File

@ -121,3 +121,16 @@
.layui-table-main td{ .layui-table-main td{
white-space: pre-line!important; white-space: pre-line!important;
} }
.one{
background: #00B0F0 !important;;
}
.twe{
background: #00FF00!important;
}
.three{
background:#FF6464!important;
}
.four{
background: #FF64FF!important;
}

182
src/views/Need/components/EditView.vue
Unescape View File

@ -2,12 +2,13 @@
<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="固定列设置" :end="closeFreezingSetting">
<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns" :freezingColumns="freezingColumnSetting" @cancelClick="setFreezingColumnsSetting"></FreezingColumnSetting> <FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
: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"
:data-source="dataList" :cellStyle="cellStyle" :cellClassName="cellClassName"> :cellStyle="cellStyle" :cellClassName="cellClassName">
<template v-slot:toolbar v-if="dataInfoObj.FCanEdit!=2"> <template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2">
<lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length===0">保存 <lay-button size="sm" @click="saveBatch" type="primary" :disabled="editColumn.length === 0">保存
</lay-button> </lay-button>
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true"> <lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputCodeValue" :readonly="true">
<template #prepend>半成品编号：</template> <template #prepend>半成品编号：</template>
@ -15,22 +16,23 @@
<lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputDescValue" :readonly="true"> <lay-input :class="this.isShow ? 'isShow' : 'isHidden'" v-model="inputDescValue" :readonly="true">
<template #prepend>描述：</template> <template #prepend>描述：</template>
</lay-input> </lay-input>
<lay-button size="sm" type="primary" style="float:right;" :disabled="editColumn.length===0" @click="_clickFreezingColumnSetting()">固定项 <lay-button size="sm" type="primary" style="float:right;" :disabled="editColumn.length === 0"
@click="_clickFreezingColumnSetting()">固定项
</lay-button> </lay-button>
</template> </template>
<template v-for="item in editColumn" v-slot:[item.key]="{ data }"> <template v-for="item in editColumn" v-slot:[item.key]="{ data }">
<lay-select v-if="item.key=='FTypeID1'" size="sm" v-model="data['FTypeID1']" <lay-select v-if="item.key == 'FTypeID1'" size="sm" v-model="data['FTypeID1']"
@change="_changeType(data,1)" :showEmpty="false"> @change="_changeType(data, 1)" :showEmpty="false">
<lay-select-option v-for="(tIdv,tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID" <lay-select-option v-for="(tIdv, tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID"
:label="tIdv.FName"></lay-select-option> :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
<lay-select v-else-if="item.key=='FTypeID2'" size="sm" v-model="data['FTypeID2']" <lay-select v-else-if="item.key == 'FTypeID2'" size="sm" v-model="data['FTypeID2']"
@change="_changeType(data,2)" :showEmpty="false"> @change="_changeType(data, 2)" :showEmpty="false">
<lay-select-option v-show="data.FTypeID1==tIdv.FParentID" v-for="(tIdv,tIdx) in typeList[1]" <lay-select-option v-show="data.FTypeID1 == tIdv.FParentID" v-for="(tIdv, tIdx) in typeList[1]"
:key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option> :key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
<lay-select v-else-if="item.selectType" size="sm" v-model="data[item.key]" :showEmpty="false"> <lay-select v-else-if="item.selectType" size="sm" v-model="data[item.key]" :showEmpty="false">
<lay-select-option v-for="(tIdv,tIdx) in selectDataMap['FType'+item.selectTypeId]" :key="tIdx" <lay-select-option v-for="(tIdv, tIdx) in selectDataMap['FType' + item.selectTypeId]" :key="tIdx"
:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option> :value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
</lay-select> </lay-select>
<lay-input v-else-if="!item.dataType" size="sm" v-model="data[item.key]"></lay-input> <lay-input v-else-if="!item.dataType" size="sm" v-model="data[item.key]"></lay-input>
@ -41,72 +43,76 @@
</template> </template>
<style scoped> <style scoped>
.content-box { .content-box {
margin: 30px 10px; margin: 30px 10px;
display: block; display: block;
position: relative; position: relative;
clear: both; clear: both;
float: none; float: none;
min-height: 740px; min-height: 740px;
} }
.row-select td { .row-select td {
overflow: inherit; overflow: inherit;
} }
.layui-select { .layui-select {
width: 100%; width: 100%;
} }
.edit { .edit {
color: green; color: green;
} }
:deep(.edit-item .layui-input) { :deep(.edit-item .layui-input) {
border-color: #5FB878 !important; border-color: #5FB878 !important;
} }
:deep(.edit-item .layui-input:hover) { :deep(.edit-item .layui-input:hover) {
border-color: #009688 !important; border-color: #009688 !important;
color: #009688; color: #009688;
} }
.isShow{
.isShow {
width: 370px; width: 370px;
height:30px; height: 30px;
border: none; border: none;
} }
.isHidden{
.isHidden {
display: none; display: none;
} }
.isBomHidden{
.isBomHidden {
display: none; display: none;
} }
</style> </style>
<script> <script>
import { import {
ref ref
} from 'vue'; } from 'vue';
import { import {
getListByTeamId, getListByTeamId,
updateBatchById2 updateBatchById2
} from "/src/api/api/view"; } from "/src/api/api/view";
import { import {
getBasicRoleList getBasicRoleList
} from "/src/api/api/user"; } from "/src/api/api/user";
import { import {
getDataCode, getDataCode,
commonSave commonSave
} from "/src/api/api/common"; } from "/src/api/api/common";
import { import {
getInfoData, getInfoData,
changeInfoData changeInfoData
} from "/src/api/api/materialType"; } from "/src/api/api/materialType";
import OperateLog from "./OperateLog.vue"; import OperateLog from "./OperateLog.vue";
import FormulaView from "./FormulaView.vue"; import FormulaView from "./FormulaView.vue";
import FreezingColumnSetting from './FreezingColumnSetting.vue'; import FreezingColumnSetting from './FreezingColumnSetting.vue';
export default { export default {
components: { components: {
OperateLog, OperateLog,
FormulaView, FormulaView,
@ -125,17 +131,17 @@
[], [],
[] []
]); ]);
const cellStyle = function(row, column, rowIndex, columnIndex) { const cellStyle = function (row, column, rowIndex, columnIndex) {
let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246) !important;" : "" let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : ""
return back; return back;
} }
const cellClassName = function(row, column, rowIndex, columnIndex) { const cellClassName = function (row, column, rowIndex, columnIndex) {
return column.cellClass || ""; return column.cellClass || "";
} }
const inputCodeValue = ref(""); const inputCodeValue = ref("");
const inputDescValue = ref(""); const inputDescValue = ref("");
const visible2 = ref(false) const visible2 = ref(false)
const changeVisible2 = function() { const changeVisible2 = function () {
visible2.value = !visible2.value visible2.value = !visible2.value
}; };
const showFreezingColumnSettingBox = ref(false); const showFreezingColumnSettingBox = ref(false);
@ -154,7 +160,7 @@
inputCodeValue, inputCodeValue,
inputDescValue, inputDescValue,
isShow: false, isShow: false,
isBomShow :false, isBomShow: false,
visible2, visible2,
changeVisible2, changeVisible2,
showFreezingColumnSettingBox, showFreezingColumnSettingBox,
@ -166,7 +172,7 @@
props: { props: {
dataInfoObj: { dataInfoObj: {
type: Object, type: Object,
default: () => {}, default: () => { },
}, },
viewDataList: { viewDataList: {
type: Object, type: Object,
@ -195,12 +201,11 @@
teamId: this.dataInfoObj.FTeamID, teamId: this.dataInfoObj.FTeamID,
viewType: this.dataInfoObj.FViewType viewType: this.dataInfoObj.FViewType
}); });
if (this.dataInfoObj.FViewType == 1) {
if(this.dataInfoObj.FViewType == 1){
this.inputCodeValue = _data.rows[0].HalfCode; this.inputCodeValue = _data.rows[0].HalfCode;
this.inputDescValue = _data.rows[0].HalfDesc; this.inputDescValue = _data.rows[0].HalfDesc;
this.isShow = true; this.isShow = true;
}else if(this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4){ } else if (this.dataInfoObj.FViewType == 2 || this.dataInfoObj.FViewType == 3 || this.dataInfoObj.FViewType == 4) {
this.isBomShow = true; this.isBomShow = true;
} }
@ -208,6 +213,7 @@
this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || []; this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
let dataColumn = _data.columns || []; let dataColumn = _data.columns || [];
let editColumn = dataColumn.filter(it => { let editColumn = dataColumn.filter(it => {
let b = false; let b = false;
if (this.dataInfoObj.FCanEdit != 2) { if (this.dataInfoObj.FCanEdit != 2) {
if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0; if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
@ -241,19 +247,40 @@
// dataColumn = [...tempColumn1, ...tempColumn2]; // dataColumn = [...tempColumn1, ...tempColumn2];
// } // }
} }
let columnsList = [];
let col7 = dataColumn.filter(s => s.fieldType == 7) || []; let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
_data.rows.forEach((item) => { debugger
_data.rows.forEach((item, i) => {
columnsList = _data.columns.map(function (items) {
let str = _data.infos[i][items.key + "Type"];
if (typeof (str) != "undefined") {
switch (str) {
case "1":
return items.cellClass = items.cellClass + " one";
case "2":
return items.cellClass = items.cellClass + " twe";
case "3":
return items.cellClass = items.cellClass + " three";
case "4":
return items.cellClass = items.cellClass + " four";
}
}
return items;
})
let k3Code = item.FBaseMaterialDesc; let k3Code = item.FBaseMaterialDesc;
if(k3Code.indexOf("@") > 0){ if (k3Code.indexOf("@") > 0) {
item.FK3Code = k3Code.substr(0, k3Code.indexOf("@")); item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
item.FK3Name = k3Code.substr(k3Code.indexOf("@") +1); item.FK3Name = k3Code.substr(k3Code.indexOf("@") + 1);
}else{ } else {
item.FK3Code = ""; item.FK3Code = "";
item.FK3Name = ""; item.FK3Name = "";
} }
if(k3Code.lastIndexOf(".") > 0){ if (k3Code.lastIndexOf(".") > 0) {
item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".")+1); item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".") + 1);
}else{ } else {
item.FK3ShortCode = ""; item.FK3ShortCode = "";
} }
let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null; let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
@ -267,12 +294,16 @@
}); });
let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
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); this.originalColumns = this.deepCopy(dataColumn);
debugger
setTimeout(function() { setTimeout(function () {
layer.close(idx); layer.close(idx);
}, 500); }, 500);
}, },
@ -289,6 +320,7 @@
"FDataID": data.FTypeID2, "FDataID": data.FTypeID2,
"FType": 1 "FType": 1
}) || null; }) || null;
if (result != null && result.FID) { if (result != null && result.FID) {
let col7 = this.dataColumn.filter(s => s.fieldType == 7) || []; let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
col7.forEach((item) => { col7.forEach((item) => {
@ -296,6 +328,26 @@
data[item.key] = result[item.key] || data[item.key] || ""; data[item.key] = result[item.key] || data[item.key] || "";
} }
}); });
this.dataColumn.map(function (item) {
debugger
let str = result[item.key + "Type"];
if (typeof (str) != "undefined") {
switch (str) {
case "1":
return item.cellClass = item.cellClass.split(" ")[0] + " one";
case "2":
return item.cellClass = item.cellClass.split(" ")[0] + " twe";
case "3":
return item.cellClass = item.cellClass.split(" ")[0] + " three";
case "4":
return item.cellClass = item.cellClass.split(" ")[0] + " four";
}
}
return item;
})
} }
} }
} }
@ -347,7 +399,7 @@
let $this = this; let $this = this;
//$this.initPage(); //$this.initPage();
localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList)); localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
setTimeout(function() { setTimeout(function () {
layer.close(idx); layer.close(idx);
layer.msg('保存成功'); layer.msg('保存成功');
$this.$emit('cancelClick', true, true); $this.$emit('cancelClick', true, true);
@ -398,5 +450,5 @@
return JSON.parse(JSON.stringify(arr)) return JSON.parse(JSON.stringify(arr))
} }
} }
} }
</script> </script>

1
src/views/Order/components/ShowMaterial.vue
Unescape View File

@ -139,6 +139,7 @@ export default {
}); });
} }
}); });
debugger
this.dataColumn = dataColumn; this.dataColumn = dataColumn;
let result2 = await getPageList({ let result2 = await getPageList({
FPageSize: 99, FPageSize: 99,

6
yarn.lock
Unescape View File

@ -1293,10 +1293,10 @@ error-ex@^1.3.1:
dependencies: dependencies:
is-arrayish "^0.2.1" is-arrayish "^0.2.1"
esbuild-windows-64@0.14.39: esbuild-windows-32@0.14.39:
version "0.14.39" version "0.14.39"
resolved "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.39.tgz" resolved "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.39.tgz"
integrity sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow== integrity sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q==
esbuild@^0.14.27, esbuild@>=0.13: esbuild@^0.14.27, esbuild@>=0.13:
version "0.14.39" version "0.14.39"

Write Preview
Loading…
Cancel
Save