This commit is contained in:
zxx 2023-05-07 22:39:54 +08:00
commit 295547c111
14 changed files with 1328 additions and 52 deletions

View File

@ -37,6 +37,7 @@
</template>
<template #op="{ row }">
<div class="oplinks">
<a @click.stop="pageEditSMS(row)" title="Sms配置"><a-icon type="setting" /></a>
<a @click.stop="pageEdit(row)" title="编辑"><a-icon type="edit" /></a>
<a @click.stop="pageDelete(row)" title="删除"><a-icon type="delete" /></a>
</div>
@ -282,7 +283,23 @@ export default {
this.$openPage("/BaseConfig/BaseConfigUpdate/" + row[this.keyName]);
},
pageEditSMS(row) {
if (!row) { //
this.$mk.msg("请选择行"); //
return; //
}
this.$mk.dialog.open({
page: () => import("./smsEdit"),
title: "修改SMS配置",
dataId: row[this.keyName],
callback: ({ success }) => {
success && this.$refs.xGrid.commitProxy('query')
}
})
},
//
pageDelete(row) {

View File

@ -0,0 +1,162 @@
<template>
<div class="page-body">
<vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
:title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
</vxe-form>
<div class="footerbar">
<a-button type="primary" @click="ok">确定</a-button>
<a-button @click="cancel">取消</a-button>
</div>
</div>
</template>
<script>
import BASE_URL from '@/services/base/api.js';
export default {
i18n: require('./i18n'),
props: {
pageMode: {
type: String,
default: "edit"
},
dataId: {
}
},
data() {
//
var pageData = {
actions: {
update: `${BASE_URL.BASE_URL}/SqlServer/v1/sql/server/update`,
get: `${BASE_URL.BASE_URL}/SqlServer/v1/sql/server/detail`,
update2: `${BASE_URL.BASE_URL}/Sms/v1/sms/update`,
get2: `${BASE_URL.BASE_URL}/Sms/v1/sms/detail`
},
formOptions: {
data: {
sign_name:'',
access_key_secret:'',
accessKey_id:'',
limit_count:0,
limit_count_warning:0,
endpoint:'',
},
titleWidth: 150,
titleAlign: 'right',
rules: {
},
items: [
{ field: 'sign_name', title: '签名', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入签名' } } },
{ field: 'access_key_secret', title: 'access_key_secret', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入access_key_secret' } } },
{ field: 'accessKey_id', title: 'accessKey_id', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入accessKey_id' } } },
{ field: 'limit_count', title: 'limit_count', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入limit_count',type:"number" } } },
{ field: 'limit_count_warning', title: 'limit_count_warning', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入limit_count_warning',type:"number" } } },
{ field: 'endpoint', title: 'endpoint', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入endpoint' } } }
]
}
};
pageData.formOptions = Object.assign({}, this.$mk.config.defaults.formOptions, pageData.formOptions);
return pageData;
},
created() {
if (this.dataId) {
this.$mk.post({
url: this.actions.get,
loading: "加载中...",
data: {
beid: this.dataId
}
}).then(a => {
if(a.data && a.data.sql_server){
this.formOptions.data = a.data.sql_server;
}else{
this.formOptions.data.beid = this.dataId;
}
}).catch((a) => {
console.log(a)
//this.$mk.error(a.data.msg);
});
} else {
this.formOptions.data.beid = this.dataId;
}
},
//
methods: {
loadData() {
},
ok() {
let save = () => {
let action = this.actions.update;
let postdata = Object.assign({}, this.formOptions.data);
postdata.beid = this.dataId;
this.$mk.post({
url: action,
loading: "保存中...",
data: postdata,
useBigInt: true
}).then(() => {
this.$mk.success("保存成功");
this.$emit("callback", { success: true });
}).catch((a) => {
this.$mk.error(a.data.msg);
});
};
this.$refs.xForm.validate((a) => {
if (a) {
let count = 0;
for (let name in a) {
a[name];
count++;
}
this.$mk.error(`存在${count}项错误,请检查`);
} else {
save();
}
});
},
cancel() {
this.$emit("callback", {});
}
},
//
watch: {
}
};
</script>
<style></style>

View File

@ -0,0 +1,482 @@
<template>
<div class="page-body">
<a-row type="flex">
<a-col flex="200px">
<div class="treepanel" :style="'height:' + tableHeight + 'px'">
<div class="treepanel-header">
<a @click.stop="treeAdd(row)" title="新增">
<a-icon type="plus-circle" />
</a>
<a @click.stop="treeEdit(row)" title="编辑">
<a-icon type="edit" />
</a>
<a @click.stop="treeDelete(row)" title="删除">
<a-icon type="delete" />
</a>
</div>
<div class="treepanel-content">
<a-tree :replaceFields="{children:'mes_enum', title:'title', key:'key'}" v-if="!treeLoading" show-line :tree-data="treeData" :default-expand-all="true" :block-node="true"
@select="onTreeSelect" :default-selected-keys="selectedKeys">
<a-icon slot="switcherIcon" type="down" />
</a-tree>
</div>
</div>
</a-col>
<a-col flex="auto">
<div class="toolbarbtns">
<a-button type="primary" @click="pageAdd">新增</a-button>
<a-button type="primary" @click="ok">保存</a-button>
</div>
<vxe-table border show-overflow keep-source ref="xTable" :height="tableHeight" :data="detailsData"
:export-config="{}" :edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false }">
<vxe-column width="80">
<template #default="{ row }">
<div class="oplinks">
<a @click.stop="pageAdd(row)" title="新增">
<a-icon type="plus-circle" />
</a>
<a @click.stop="pageDelete(row)" title="删除">
<a-icon type="delete" />
</a>
</div>
</template>
</vxe-column>
<vxe-column field="code" width="220" title="编号" :edit-render="{ name: '$input', props: {} }">
</vxe-column>
<vxe-column field="name" width="220" title="名称" :edit-render="{ name: '$input', props: {} }">
</vxe-column>
</vxe-table>
</a-col>
</a-row>
</div>
</template>
<script>
import BASE_URL from '@/services/mes/api.js';
let childrenFieldName = 'mes_enum';
export default {
props: {
pageMode: {
type: String,
default: "edit"
},
dataId: {
}
},
data() {
//
var pageData = {
modelName: "",
actions: {
treedata: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/list`,
delete: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/batchDelete`,
listdata: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/value/list`,
save: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/value/batchHandle`,
},
tipTimes: 0,
detailsData: [
],
sourceDetailsData :[
],
treeData: [],
treeLoading: true,
deletedDetailsData: [
],
selectedKeys: [],
selectedKey: null,
tableHeight: 500
};
return pageData;
},
created() {
this.$nextTick(() => {
this.tableHeight = this.$mk.getWindowSize().height - this.$mk.getOffsetTop(this.$refs.xTable.$el) - 200;
this.treeInit();
});
},
//
methods: {
treeInit() {
this.treeLoading = true;
this.$mk.post({
url: this.actions.treedata,
loading: "加载中...",
data: {
"page": 1,
"limit": 10000,
"end_time": 0,
"start_time": 0,
"order_bys": [
],
"search_rules": [
]
}
}).then(r => {
let treedata = {
title: "全部",
key: "root"
};
treedata[childrenFieldName] = r.data.MesEnum;
function formatTreedata(d) {
if (d.id) {
d.key = d.id.toString();
} else {
d.key = "root";
}
if (d.name) {
d.title = d.name;
}
if (d[childrenFieldName] && d[childrenFieldName].length) {
d[childrenFieldName].forEach(item => formatTreedata(item))
}
}
treedata[childrenFieldName].forEach(item => formatTreedata(item))
this.treeData = [treedata];
this.treeLoading = false;
});
},
treeAdd() {
this.$mk.dialog.open({
page: () => import("./treeEdit"),
title: "新增-枚举分类",
dataId: 0,
callback: ({ success }) => {
success && this.treeInit();
}
})
},
treeEdit() {
if (!this.selectedKey || this.selectedKey == "root") {
this.$mk.error("请先选择枚举分类");
return;
}
let node = this.findTreeNode(this.selectedKey);
this.$mk.dialog.open({
page: () => import("./treeEdit"),
title: "编辑-枚举分类",
dataId: node.id,
callback: ({ success }) => {
success && this.treeInit();
}
})
},
treeDelete() {
if (!this.selectedKey || this.selectedKey == "root") {
this.$mk.error("请先选择枚举分类");
return;
}
let node = this.findTreeNode(this.selectedKey);
let ids = [
node.id
]; // id
if (!ids.length) { //
this.$mk.error("请选择行"); //
return;
}
this.$mk.confirm('您确定要删除吗?').then(type => { //
if (type == 'confirm') { //
this.$mk.post({
url: this.actions.delete, //
loading: "删除中...", //
data: {
ids: ids // id
},
useBigInt: true
}).then(() => { //
this.$mk.success("删除成功"); //
this.treeInit(); //
}).catch((a) => { //
this.$mk.error(a.data.msg); //
});
}
});
},
getDataId() {
let dataId = this.dataId;
if (this.$route.params.id) {
dataId = this.$route.params.id;
}
return dataId;
},
onTreeSelect(selectedKeys) {
if (selectedKeys && selectedKeys[0]) {
this.selectedKey = selectedKeys[0];
this.loadData(selectedKeys[0]);
}
},
findTreeNode(key) {
var find = (items) => {
for (let i = 0; i < items.length; i++) {
if (items[i].key == key) {
return items[i];
}
if (items[i][childrenFieldName] && items[i][childrenFieldName].length) {
var xx = find(items[i][childrenFieldName]);
if (xx) {
return xx;
}
}
}
};
return find(this.treeData);
},
getAllChildrenIds(items) {
let ids = [];
let eachItems = (arr) => {
arr.forEach(item => {
if (item[childrenFieldName] && item[childrenFieldName].length) {
eachItems(item[childrenFieldName]);
} else if (item.model == "v_AA_PartnerClass") {
ids.push(item.id)
}
})
};
eachItems(items);
return ids;
},
reloadData() {
if (this.selectedKey) {
this.loadData(this.selectedKey);
}
},
loadData(key) {
let postLoad = (id) => {
this.$mk.post({
url: this.actions.listdata,
loading: "加载中...",
data: {
"page": 1,
"limit": 10000,
"start_time": 0,
"end_time": 0,
"search_rules": [
{
column: "enum_id", //
mode: "=", //
value: id.toString()
}
],
"order_bys": [
]
},
useBigInt: true
}).then(a => {
console.log(a.data.MesEnumValue)
this.sourceDetailsData = a.data.MesEnumValue || [];
let ds = [];
this.sourceDetailsData.forEach(item=>{
ds.push({
id : item.id.toString(),
code : item.code,
name : item.name
})
});
this.deletedDetailsData = [];
this.detailsData = ds;
});
}
if (key && key != "root") {
var node = this.findTreeNode(key);
postLoad(node.id);
}
},
findSourceInfo(idStr){
for(var i =0;i<this.sourceDetailsData.length;i++){
let o = this.sourceDetailsData[i];
if(o.id.toString() == idStr){
return o;
}
}
},
ok() {
let save = () => {
if (!this.selectedKey || this.selectedKey == "root") {
this.$mk.error("请先选择枚举分类");
return;
}
let node = this.findTreeNode(this.selectedKey);
let ds = JSON.parse(JSON.stringify(this.detailsData));
var postdata = {
insertList: [],
updateList: [],
deleteList: this.deletedDetailsData
};
ds.forEach(item => {
delete item._X_ROW_KEY;
item.enum_id = node.id;
if (item.id && item.id != "0") {
let source = this.findSourceInfo(item.id);
item.id = source.id;
postdata.updateList.push(item);
} else {
postdata.insertList.push(item);
}
})
this.$mk.post({
url: this.actions.save,
loading: "保存中...",
data: postdata,
useBigInt:true
}).then(a => {
if (a.code == "200") {
this.$mk.success("保存成功");
this.reloadData();
} else {
this.$mk.error(a.message);
}
}).catch((a) => {
this.$mk.error(a.data.msg);
});
};
save();
},
back() {
},
cancel() {
this.back();
},
pageAdd(row) {
const $table = this.$refs.xTable
const record = {
}
if (row) {
this.detailsData.splice($table.getRowSeq(row), 0, record);
} else {
this.detailsData.push(record)
}
},
pageDelete(row) {
const $table = this.$refs.xTable;
if (row.id) {
this.deletedDetailsData.push(row.id)
}
this.detailsData.splice($table.getRowSeq(row) - 1, 1);
},
},
//
watch: {
}
};
</script>
<style>
.page-body {
background: white;
padding: 8px;
}
.treepanel {
width: calc(100% - 10px);
margin-right: 10px;
border: 1px solid #ccc;
}
.treepanel-content {
padding: 7px;
}
.treepanel-header {
width: 100%;
background: #F8F8F9;
border-bottom: 1px solid #ccc;
height: 32px;
line-height: 32px;
margin: 0;
font-size: 14px;
color: #606266;
}
.treepanel-header .anticon {
margin-left: 5px;
cursor: pointer;
}
.toolbarbtns .ant-btn {
margin-right: 10px;
}
.toolbarbtns {
margin-bottom: 5px;
}
</style>

View File

@ -0,0 +1,185 @@
<template>
<div class="page-body">
<vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
:title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
</vxe-form>
<div class="footerbar">
<a-button type="primary" @click="ok">确定</a-button>
<a-button @click="cancel">取消</a-button>
</div>
</div>
</template>
<script>
import BASE_URL from '@/services/base/api.js';
export default {
props: {
dataId: {
}
},
data() {
//
var pageData = {
actions: {
create: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/create`,
update: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/update`,
get: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/detail`,
list: `${BASE_URL.BASE_URL}/MesEnum/v1/mes/enum/list`,
},
formOptions: {
data: {
"name": "",
"code": "",
enum_id:"0"
},
titleWidth: 150,
titleAlign: 'right',
rules: {
name: [
{ required: true, message: '请输入名称' }
]
},
items: [
{ field: 'name', title: '名称', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } },
{ field: 'code', title: '编号', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入编号' } } },
{ field: 'enum_id', title: '上级分类', span: 24, itemRender: { name: '$select', props: { placeholder: '请输入上级分类', options: [] } } }
]
}
};
pageData.formOptions = Object.assign({}, this.$mk.config.defaults.formOptions, pageData.formOptions);
return pageData;
},
created() {
if (this.dataId) {
this.$mk.post({
url: this.actions.get,
loading: "加载中...",
data: {
id: this.dataId
},
useBigInt: true
}).then(a => {
if(a.data.mes_enum.enum_id){
a.data.mes_enum.enum_id = a.data.mes_enum.enum_id.toString();
}else{
a.data.mes_enum.enum_id = "0"
}
this.formOptions.data = a.data.mes_enum;
}).catch((a) => {
this.$mk.error(a.data.msg);
});
}
this.loadEmuns();
},
//
methods: {
loadEmuns() {
this.$mk.post({
url: this.actions.list,
loading: "加载中...",
data: {
"page": 1,
"limit": 10000,
"end_time": 0,
"start_time": 0,
"order_bys": [
],
"search_rules": [
{
column: "enum_id", //
mode: "=", //
value: "0"
}
]
},
useBigInt: true
}).then(a => {
let options_emuns = [{ value: "0", label: "选择上级分类" }];
console.log(a.data.MesEnum)
if (a.data.MesEnum) {
a.data.MesEnum.forEach(item => {
options_emuns.push({ value: item.id.toString(), id:item.id, label: item.name });
});
}
this.formOptions.items[2].itemRender.props.options = options_emuns;
});
},
loadData() {
},
ok() {
let save = () => {
let action = !this.dataId ? this.actions.create : this.actions.update;
let postdata = Object.assign({ id: this.dataId }, this.formOptions.data);
let options = this.formOptions.items[2].itemRender.props.options;
options.forEach(item=>{
if(item.value == postdata.enum_id){
postdata.enum_id = item.id;
}
});
this.$mk.post({
url: action,
loading: "保存中...",
data: postdata,
useBigInt: true
}).then(() => {
this.$mk.success("保存成功");
this.$emit("callback", { success: true });
}).catch((a) => {
this.$mk.error(a.data.msg);
});
};
this.$refs.xForm.validate((a) => {
if (a) {
let count = 0;
for (let name in a) {
a[name];
count++;
}
this.$mk.error(`存在${count}项错误,请检查`);
} else {
save();
}
});
},
cancel() {
this.$emit("callback", {});
}
},
//
watch: {
}
};
</script>
<style></style>

View File

@ -769,7 +769,7 @@ export default {
currentConfigName: "",
// ID
currentBeid: 0,
settignsValues : {},
tabKey: 'main',
showAll: false,
showExp: false,
@ -1109,7 +1109,7 @@ export default {
created() {
this.loadSettings();
// id
let dataId = this.getDataId();
@ -1185,6 +1185,33 @@ export default {
//
methods: {
loadSettings() {
this.$mk.post({
url: `${BASE_URL.BASE_URL}/BathroomScheme/v1/settings/list`,
data: {
}
}).then(a => {
let data = {};
let getName = (info) => {
for (let name in info) {
return name;
}
return null;
}
a.data.settings.forEach(o => {
let name = getName(o.setting);
if (!name) return;
data[name] = o.setting[name];
});
this.settignsValues = data;
}).catch((a) => {
this.$mk.error(a.data.msg);
});
},
formatShowNumber(value, points) {
if (!value) {
return '<span style="color:red;">' + (0.0).toFixed(points || 0) + '</span>';
@ -1495,6 +1522,13 @@ export default {
row.height_formula = selectedData.spec;
}
}
if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
row.rate_materials = this.settignsValues.Main_material_utilization_rate;
}
if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
}
},
fittings_onPopupSelected({ rows, name, params }) {
console.log(rows, name, params);

View File

@ -349,8 +349,21 @@ export default {
if (e.name == "add") { //
this.$openPage("/BathroomQuotation/BathroomQuotationAdd"); //
}
if (e.name == "setting") {
this.openSettings();
}
},
openSettings() {
this.$mk.dialog.open({
page: () => import("@/pages/Middle/bathroom/basic/settings.vue"),
title: "参数配置",
pageOptions: {
},
width: 800,
height: 600,
dataId: 0
});
},
//
pageEdit(row) {
if (!row) { //

View File

@ -681,6 +681,7 @@ export default {
currentConfigName: "",
// ID
currentBeid: 0,
settignsValues : {},
showType: '1',
showExp: false,
@ -880,6 +881,7 @@ export default {
created() {
this.loadSettings();
let data = this.item;
this.formOptions.data = data;
this.fittings_detailsData = data.fittingsList || [];
@ -898,6 +900,34 @@ export default {
},
//
methods: {
loadSettings() {
this.$mk.post({
url: `${BASE_URL.BASE_URL}/BathroomScheme/v1/settings/list`,
data: {
}
}).then(a => {
let data = {};
let getName = (info) => {
for (let name in info) {
return name;
}
return null;
}
a.data.settings.forEach(o => {
let name = getName(o.setting);
if (!name) return;
data[name] = o.setting[name];
});
this.settignsValues = data;
}).catch((a) => {
this.$mk.error(a.data.msg);
});
},
formatShowNumber(value, points) {
if (!value) {
return '<span style="color:red;">'+(0.0).toFixed(points ||0)+'</span>';
@ -1049,6 +1079,12 @@ export default {
row.height_formula = selectedData.spec;
}
}
if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
row.rate_materials = this.settignsValues.Main_material_utilization_rate;
}
if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
}
},
fittings_onPopupSelected({ rows, name, params }) {
console.log(rows, name, params);

View File

@ -96,15 +96,13 @@
</vxe-column>
<vxe-column field="parts" title="配件" width="260" :params="editorParts" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="spec" title="规格" width="120"
:edit-render="{ name: '$input' }"></vxe-column>
<vxe-column field="spec" title="规格" width="120" :edit-render="{ name: '$input' }"></vxe-column>
<vxe-column field="quantity" title="数量" width="120"
:edit-render="{ name: '$input', props: { type: 'integer' } }"></vxe-column>
<vxe-column field="price" title="单价" width="120"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220"
:edit-render="{ name: 'EditExpressions' }">
<vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }">
</vxe-column>
</vxe-table>
@ -142,11 +140,11 @@
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="quantity_formula" title="数量(公式)" width="220"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="price" title="单价" width="120"
:edit-render="{ name: '$input', props: { type: 'number' } }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
</vxe-table>
@ -218,7 +216,8 @@
<vxe-column field="labor" title="项目" width="260" :params="editorLabor" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
</vxe-table>
@ -228,17 +227,18 @@
</a-collapse>
</div>
<div class="groupbox">
<h3>核算表油漆</h3>
<a-collapse v-model="groupbox3_activeKey">
<a-collapse-panel key="1" header="材料">
<vxe-table border show-overflow keep-source ref="paintMaterial_xTable" :data="paintMaterial_detailsData" :keyboard-config="{
isArrow: true, isDel: true,
isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
<vxe-table border show-overflow keep-source ref="paintMaterial_xTable" :data="paintMaterial_detailsData"
:keyboard-config="{
isArrow: true, isDel: true,
isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintMaterial_onPulldownSelected"
@popupSelected="paintMaterial_onPopupSelected" :export-config="{}" @edit-closed="paintMaterial_afterEditEvent"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintMaterial_beforeEditMethod }">
<vxe-column width="60" v-if="!isReadonly">
@ -269,10 +269,11 @@
</a-collapse-panel>
<a-collapse-panel key="2" header="人工" :disabled="false">
<vxe-table border show-overflow keep-source ref="paintLabor_xTable" :data="paintLabor_detailsData" :keyboard-config="{
isArrow: true, isDel: true,
isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
<vxe-table border show-overflow keep-source ref="paintLabor_xTable" :data="paintLabor_detailsData"
:keyboard-config="{
isArrow: true, isDel: true,
isEnter: false, isTab: true, isEdit: true, isChecked: true
}" :mouse-config="{ selected: true }" @pulldownSelected="paintLabor_onPulldownSelected"
@popupSelected="paintLabor_onPopupSelected" :export-config="{}" @edit-closed="paintLabor_afterEditEvent"
@edit-actived="paintLabor_beforeEditEvent"
:edit-config="{ trigger: 'click', mode: 'cell', icon: 'vxe-icon-edit', showStatus: false, beforeEditMethod: paintLabor_beforeEditMethod }">
@ -291,7 +292,8 @@
<vxe-column field="labor" title="项目" width="260" :params="editorLabor" formatter="formatRef"
:edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220" :edit-render="{ name: 'EditExpressions' }"></vxe-column>
<vxe-column field="amount_formula" title="金额(公式)" width="220"
:edit-render="{ name: 'EditExpressions' }"></vxe-column>
</vxe-table>
@ -352,8 +354,8 @@ export default {
currentConfigName: "",
// ID
currentBeid: 0,
groupbox1_activeKey: ["1","2"],
settignsValues : {},
groupbox1_activeKey: ["1", "2"],
groupbox2_activeKey: [],
groupbox3_activeKey: [],
isReadonly: false,
@ -460,7 +462,7 @@ export default {
detailDataFieldName: "bathroom_scheme",
actions: {
// =============================== Start ===============================
BathroomSchemeList: `${BASE_URL.BASE_URL}/BathroomScheme/v1/bathroom/scheme/list`, //
BathroomSchemeDetail: `${BASE_URL.BASE_URL}/BathroomScheme/v1/bathroom/scheme/detail`, //
@ -614,7 +616,7 @@ export default {
{ field: 'model', title: '型号', span: 24, itemRender: { name: '$input' } },
{ field: 'type', title: '类型', span: 24, itemRender: { name: '$radio', options: settings.options_schemeType } },
]
},
{
@ -661,8 +663,7 @@ export default {
},
created() {
this.loadSettings();
// id
let dataId = this.getDataId();
@ -691,7 +692,7 @@ export default {
let data = a.data[this.detailDataFieldName]
this.formOptions.data = data;
this.fittings_detailsData = JSON.parse(data.fittingsList || "[]");
@ -703,7 +704,7 @@ export default {
this.material_detailsData = JSON.parse(data.materialList || "[]");
this.paintLabor_detailsData = JSON.parse(data.paintLaborList || "[]");
this.paintMaterial_detailsData = JSON.parse(data.paintMaterialList || "[]");
@ -732,8 +733,33 @@ export default {
methods: {
loadSettings() {
this.$mk.post({
url: `${BASE_URL.BASE_URL}/BathroomScheme/v1/settings/list`,
data: {
}
}).then(a => {
let data = {};
let getName = (info) => {
for (let name in info) {
return name;
}
return null;
}
a.data.settings.forEach(o => {
let name = getName(o.setting);
if (!name) return;
data[name] = o.setting[name];
});
this.settignsValues = data;
}).catch((a) => {
this.$mk.error(a.data.msg);
});
},
detailDataInit() {
@ -805,16 +831,25 @@ export default {
}
}
if (column.field == "paint_material") {
this.resetPaintMaterial();
}
if (column.field == "material") {
this.resetMaterial();
if(selectedData.spec){
if (selectedData.spec) {
row.height_formula = selectedData.spec;
}
}
if (!row.rate_materials && this.settignsValues.Main_material_utilization_rate) {
row.rate_materials = this.settignsValues.Main_material_utilization_rate;
}
if (!row.paint_number && this.settignsValues.Default_rate_of_paint_surface) {
row.paint_number = this.settignsValues.Default_rate_of_paint_surface;
}
},
fittings_onPopupSelected({ rows, name, params }) {
@ -826,6 +861,8 @@ export default {
},
fittings_afterEditEvent({ column, row }) {
console.log(row, column);
},
fittings_beforeEditEvent({ column, row }) {
console.log(row, column);
@ -845,20 +882,20 @@ export default {
const $table = this.$refs.fittings_xTable;
this.fittings_detailsData.splice($table.getRowSeq(row) - 1, 1);
this.resetMaterial();
this.resetPaintMaterial();
this.resetPaintMaterial();
},
parts_onPulldownSelected({selectedData,row }) {
console.log(row, selectedData);
if(selectedData.spec){
parts_onPulldownSelected({ selectedData, row }) {
console.log(row, selectedData);
if (selectedData.spec) {
row.spec = selectedData.spec;
}
if(selectedData.price){
if (selectedData.price) {
row.price = selectedData.price;
}
},
parts_onPopupSelected({ rows, name, params }) {
@ -1082,8 +1119,8 @@ export default {
formatName(v){
return (v || "").replace("\r","").replace("\n","").replace("\t","").replace(" ","");
formatName(v) {
return (v || "").replace("\r", "").replace("\n", "").replace("\t", "").replace(" ", "");
},
@ -1103,7 +1140,7 @@ export default {
let material_list = [];
material_items.forEach(item => {
let name = this.formatName(item[1]);
let old = this.material_detailsData.filter(a => a.material && a.material[0] == item[0] ? true : false);
let info = {
@ -1113,7 +1150,7 @@ export default {
price: 0
};
if (old.length) {
info.quantity_formula = `{${name}的总用量}`;
info.quantity_formula = `{${name}的总用量}`;
info.price = old[0].price;
info.amount_formula = old[0].amount_formula;
}
@ -1177,7 +1214,7 @@ export default {
price: 0
};
if (old.length) {
info.quantity_formula = `{${name}的总用量}`;
info.quantity_formula = `{${name}的总用量}`;
info.price = old[0].price;
info.amount_formula = old[0].amount_formula;
}
@ -1220,11 +1257,11 @@ export default {
if (!data) return;
data.forEach(item => {
delete item._X_ROW_KEY;
if(!item.id){
if (!item.id) {
item.id = settings.getGuid();
}
});
},
},
//
ok() {
@ -1256,7 +1293,7 @@ export default {
postdata.laborList = postdata.laborList.filter(item => item.labor && item.labor[1] ? true : false);
postdata.materialList = postdata.materialList.filter(item => item.material && item.material[1] ? true : false);
postdata.paintLaborList = postdata.paintLaborList.filter(item => item.labor && item.labor[1] ? true : false);
postdata.paintMaterialList = postdata.paintMaterialList.filter(item => item.material && item.material[1] ? true : false);
@ -1353,7 +1390,7 @@ export default {
},
confirmSelectScheme() {
let row = this.$refs.scheme_grid.getCurrentRecord(); //
let fittingsList = JSON.parse(row.fittingsList || "[]");
fittingsList = fittingsList.filter(a => a.fittings && a.fittings[0]);
let partsList = JSON.parse(row.partsList || "[]");

View File

@ -303,8 +303,21 @@ export default {
if (e.name == "add") { //
this.$openPage("/BathroomScheme/BathroomSchemeAdd"); //
}
if (e.name == "setting") {
this.openSettings();
}
},
openSettings() {
this.$mk.dialog.open({
page: () => import("@/pages/Middle/bathroom/basic/settings.vue"),
title: "参数配置",
pageOptions: {
},
width: 800,
height: 600,
dataId: 0
});
},
//
pageEdit(row) {
if (!row) { //

View File

@ -0,0 +1,181 @@
<template>
<div class="page-body router-edit-page">
<vxe-form :data="formOptions.data" ref="xForm" :title-width="formOptions.titleWidth"
:title-align="formOptions.titleAlign" :rules="formOptions.rules" :items="formOptions.items" titleColon>
</vxe-form>
<div class="footerbar-bottom">
<a-button type="primary" @click="ok">确定</a-button>
</div>
</div>
</template>
<script>
import BASE_URL from '@/services/base/api.js';
export default {
props: {
pageMode: {
type: String,
default: "edit"
},
pageOptions: {
type: Object
},
dataId: {
}
},
data() {
//
var pageData = {
actions: {
save: `${BASE_URL.BASE_URL}/BathroomScheme/v1/settings/update`,
get: `${BASE_URL.BASE_URL}/BathroomScheme/v1/settings/list`
},
beid: 0,
parentName: '',
formOptions: {
data: {
},
titleWidth: 200,
titleAlign: 'right',
rules: {
},
items: [
]
},
};
pageData.formOptions = Object.assign({}, this.$mk.config.defaults.formOptions, pageData.formOptions);
return pageData;
},
created() {
this.$mk.post({
url: this.actions.get,
loading: "加载中...",
data: {
}
}).then(a => {
let items = [];
let data = {};
let getName = (info) => {
for (let name in info) {
return name;
}
return null;
}
a.data.settings.forEach(o => {
let name = getName(o.setting);
if (!name) return;
let item = { field: name, title: o.title, span: 24, itemRender: { name: '$input', props: { placeholder: o.desc } } };
if (o.type == "bool") {
item.itemRender.name = "$switch";
item.dataRule = { type: "string" };
data[name] = o.setting[name] === "true";
}
else if (o.type == "integer") {
item.itemRender.props.type = "integer";
item.dataRule = { type: "integer" };
data[name] = parseInt(o.setting[name]);
}
else {
data[name] = o.setting[name];
}
items.push(item);
});
this.formOptions.items = items;
this.formOptions.data = data;
}).catch((a) => {
this.$mk.error(a.data.msg);
});
},
//
methods: {
ok() {
let save = () => {
let action = this.actions.save;
let postdata = Object.assign({}, this.formOptions.data);
this.$mk.formatFormData({ data: postdata, rules: this.formOptions.items });
let saveData = {
"settings": [
postdata
]
};
this.$mk.post({
url: action,
loading: "保存中...",
data: saveData,
}).then(() => {
this.$mk.success("保存成功");
}).catch((a) => {
this.$mk.error(a.data.msg);
});
};
this.$refs.xForm.validate((a) => {
if (a) {
let count = 0;
for (let name in a) {
a[name];
count++;
}
this.$mk.error(`存在${count}项错误,请检查`);
} else {
save();
}
});
},
cancel() {
this.$emit("callback", {});
},
},
//
watch: {
}
};
</script>
<style scoped lang="less">
.router-edit-page .vxe-pulldown {
width: 100%;
}
</style>

View File

@ -0,0 +1,60 @@
const FunName = 'MesEnum';
const FunTitle = '枚举';
const InvisibleRouters = 'Detail,Delete,BatchDelete,BatchUpdate,BatchCreate,ExportExcel,LogDetail,LogList,Settings,SettingsUpdate,ImportExcel'.split(',')
const InvisibleRouters2 = ''.split(',')
// 视图组件
const view = {
tabs: () => import('@/layouts/tabs'),
blank: () => import('@/layouts/BlankView'),
page: () => import('@/layouts/PageView')
}
// 路由组件注册
const routerMap = {
};
routerMap[FunName]= {
name: FunTitle,
icon: 'idcard',
component: view.blank,
meta: {
},
authority: {
permission: [],
}
};
routerMap[FunName + 'List']= {
name: FunTitle,
icon: 'idcard',
path: `/${FunName}/${FunName}List`,
meta:{
page:{ cacheAble:false}
},
component: () => import(`@/pages/Middle/Mes/MesEnum/MesEnum/`),
authority: {
permission: [],
}
};
InvisibleRouters.forEach(item => {
let name = FunName + item;
if (!(name in routerMap)) {
routerMap[name] = {
meta: {
invisible: true
}
}
}
})
InvisibleRouters2.forEach(item => {
let name = item;
if (!(name in routerMap)) {
routerMap[name] = {
meta: {
invisible: true
}
}
}
})
export default routerMap

View File

@ -0,0 +1,51 @@
// 视图组件
const view = {
tabs: () => import('@/layouts/tabs'),
blank: () => import('@/layouts/BlankView'),
page: () => import('@/layouts/PageView')
}
// 路由组件注册
const routerMap = {
};
routerMap['basic']= {
name: 'basic',
icon: 'idcard',
component: view.blank,
meta: {
},
authority: {
permission: [],
}
};
routerMap['basic_materials']= {
name: '基础档案',
icon: 'idcard',
path: `/MesMaterials/MesMaterialsList`,
meta:{
page:{ cacheAble:false}
},
component: () => import(`@/pages/Middle/Mes/MesMaterials/MesMaterials/List`),
authority: {
permission: [],
}
};
routerMap['basic_unit']= {
name: '基础档案',
icon: 'idcard',
path: `/MesUnit/MesUnitList`,
meta:{
page:{ cacheAble:false}
},
component: () => import(`@/pages/Middle/Mes/MesUnit/MesUnit/List`),
authority: {
permission: [],
}
};
export default {}

View File

@ -14,8 +14,11 @@ import MesStock from '@/router/Middle/Mes/MesStock/router.map.js'
import MesWarehouse from '@/router/Middle/Mes/MesWarehouse/router.map.js'
import MesEnum from '@/router/Middle/Mes/MesEnum/router.map.js'
import MesUnitRouterMap from '@/router/Middle/Mes/MesUnit/router.map.js'
import basic from '@/router/Middle/Mes/basic/router.map.js'
const routerMap = Object.assign({},
MesUnitRouterMap,
MesCeramicsMaterialClassification,
@ -28,7 +31,10 @@ const routerMap = Object.assign({},
MesProductionOrder,
MesStaff,
MesStock,
MesWarehouse
MesWarehouse,
MesEnum,
basic
)

View File

@ -14,8 +14,7 @@ const routesConfig = [
router: 'exp403',
path: '/403',
name: '403'
},
},
]
const options = {
routes: parseRoutes(routesConfig, routerMap)