Mes
/
middle-admin-ant
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MES优化

This commit is contained in:
xielue 2023-06-02 10:15:56 +08:00
parent 73b66c04f7
commit fa69689738
15 changed files with 748 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -22,6 +22,7 @@
"core-js": "^3.6.5", "core-js": "^3.6.5",
"date-fns": "^2.14.0", "date-fns": "^2.14.0",
"enquire.js": "^2.1.6", "enquire.js": "^2.1.6",
"file-saver": "^2.0.5",
"hevue-img-preview": "^6.1.0", "hevue-img-preview": "^6.1.0",
"highlight.js": "^10.2.1", "highlight.js": "^10.2.1",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",

63
src/application/mk/basic-pages/edit.vue
View File

@ -1,16 +1,20 @@
<template> <template>
<div class="page-body"> <div class="page-body">
<vxe-form :data="options.formOptions.data" ref="xForm" :title-width="options.formOptions.titleWidth" <vxe-form :data="options.formOptions.data" ref="xForm" :title-width="options.formOptions.titleWidth"
:title-align="options.formOptions.titleAlign" :rules="options.formOptions.rules" :items="options.formOptions.items" titleColon> :title-align="options.formOptions.titleAlign" :rules="options.formOptions.rules" :items="options.formOptions.items"
</vxe-form> titleColon>
</vxe-form>
<div class="footerbar">
<a-button type="primary" @click="ok">确定</a-button>
<a-button @click="cancel">取消</a-button>
</div>
<div class="footerbar">
<a-button type="primary" @click="save">确定</a-button>
<a-button @click="cancel">取消</a-button>
</div> </div>
</div>
</template> </template>
<script> <script>
@ -19,7 +23,7 @@
export default { export default {
name: 'BasicPageEdit', name: 'BasicPageEdit',
components: { }, components: {},
props: { props: {
options: { options: {
type: Object type: Object
@ -33,7 +37,8 @@ export default {
data() { data() {
return { return {
isEdit:false isEdit: false,
defaultFormData: {}
}; };
}, },
@ -44,7 +49,7 @@ export default {
created() { created() {
this.defaultFormData = JSON.parse(JSON.stringify(this.options.formOptions.data || {}))
}, },
// 函数 // 函数
@ -69,8 +74,10 @@ export default {
}, },
// 保存 // 保存
ok() { save({ afterSave }) {
let _this = this;
let save = () => { let save = () => {
this.isEdit = this.options.isEdit; this.isEdit = this.options.isEdit;
@ -96,10 +103,34 @@ export default {
data: postdata, data: postdata,
useBigInt: true, useBigInt: true,
}).then(() => { // 成功回调 }).then(() => { // 成功回调
this.$mk.success("保存成功"); if (afterSave) {
if (!this.isEdit) { // 如果是新增模式，关闭当前页面 afterSave();
this.back(); } else {
this.$mk.success("保存成功");
this.$emit("afterSave", { data: postdata });
if (!this.isEdit) { // 如果是新增模式，关闭当前页面
if (this.options.action_afterSave == "confirm") {
this.$confirm({
title: '提示',
content: '新增成功，是否继续',
okText: '确认',
cancelText: '返回',
onOk() {
_this.options.formOptions.data = _this.defaultFormData;
},
onCancel() {
_this.back();
},
});
} else {
this.back();
}
}
} }
}).catch((a) => { // 失败回调 }).catch((a) => { // 失败回调
this.$mk.error(a.data.msg); // 显示错误信息 this.$mk.error(a.data.msg); // 显示错误信息
}); });

231
src/application/mk/basic-pages/list.vue
View File

@ -22,6 +22,12 @@
<vxe-toolbar ref="xToolbar" custom> <vxe-toolbar ref="xToolbar" custom>
<template #buttons> <template #buttons>
<a-button type="primary" icon="delete" @click="pageDelete()">批量删除</a-button> <a-button type="primary" icon="delete" @click="pageDelete()">批量删除</a-button>
<a-button type="primary" style="margin-left: 5px;" icon="export" v-if="options.enabledExport"
@click="pageExport()">导出</a-button>
<a-button type="primary" style="margin-left: 5px;" icon="import" v-if="options.enabledImport"
@click="pageImport()">导入</a-button>
<a-button type="default" style="margin-left: 5px;" v-if="options.enabledImportTemplate"
@click="pageImportTemplate()">下载导入模板</a-button>
</template> </template>
</vxe-toolbar> </vxe-toolbar>
<!-- 表格区 --> <!-- 表格区 -->
@ -38,11 +44,26 @@
</div> </div>
<vxe-modal v-model="showSheetNameSelector" width="500" height="400" title="选择表名">
<template #default>
<div>
<vxe-select v-model="excelSheetName" placeholder="选择表名" style="width:100%">
<vxe-option v-for="n in excelSheetNames" :key="n" :value="n" :label="n"></vxe-option>
</vxe-select>
</div>
<div style="margin-top:10px;">
<vxe-button status="primary" content="确定" @click="importOk"></vxe-button>
</div>
</template>
</vxe-modal>
</div> </div>
</template> </template>
<script> <script>
import FileSaver from 'file-saver'
import * as XLSX from 'xlsx'
import { read, utils } from "xlsx"; // 注意处理方法引入方式
export default { export default {
@ -55,7 +76,7 @@ export default {
data() { data() {
return { return {
showSheetNameSelector: false, excelSheetName: '', excelSheetNames: [],
bindSearchData: null bindSearchData: null
}; };
@ -117,11 +138,120 @@ export default {
// 动作 // 动作
methods: { methods: {
pageExport() {
let jsonRows = [];
let headerCells = [];
// =============================== 基于status进行开关 自动生成 Start =============================== for (let i = 0; i < this.options.exportColumns.length; i++) {
let item = this.options.exportColumns[i];
headerCells.push(item.title);
}
// =============================== 基于status进行开关 自动生成 End ===============================
let details = JSON.parse(JSON.stringify(this.$refs.xGrid.getTableData().fullData));
details.forEach(row => {
let jsonRow = {
};
for (let i = 0; i < this.options.exportColumns.length; i++) {
let item = this.options.exportColumns[i];
jsonRow[item.title] = row[item.field] || '';
}
jsonRows.push(jsonRow);
});
var worksheet = XLSX.utils.json_to_sheet(jsonRows, { header: headerCells, skipHeader: false });
const workbook = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
/* get binary string as output */
var wbout = XLSX.write(workbook, { bookType: 'xlsx', bookSST: true, type: 'array' })
try {
FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), (this.options.exportFileTitle || '导出数据' )+ '.xlsx')
} catch (e) {
if (typeof console !== 'undefined') {
console.log(e, wbout)
}
}
},
pageImportTemplate() {
let jsonRows = [];
let headerCells = [];
for (let i = 0; i < this.options.exportColumns.length; i++) {
let item = this.options.exportColumns[i];
headerCells.push(item.title);
}
var worksheet = XLSX.utils.json_to_sheet(jsonRows, { header: headerCells, skipHeader: false });
const workbook = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
/* get binary string as output */
var wbout = XLSX.write(workbook, { bookType: 'xlsx', bookSST: true, type: 'array' })
try {
FileSaver.saveAs(new Blob([wbout], { type: 'application/octet-stream' }), '导入模板.xlsx')
} catch (e) {
if (typeof console !== 'undefined') {
console.log(e, wbout)
}
}
},
pageImport() {
let fileForm = document.createElement('form');
let fileInput = document.createElement('input');
fileForm.className = 'vxe-table--file-form';
fileInput.name = 'file';
fileInput.type = 'file';
fileForm.appendChild(fileInput);
document.body.appendChild(fileForm);
fileInput.multiple = false;
fileInput.accept = '';
fileInput.onchange = (evnt) => {
var files = evnt.target.files;
var file = files[0];
this.readExcel(file)
};
fileForm.reset();
fileInput.click();
},
readExcel(file) {
const fileReader = new FileReader();
this.$mk.loading("读取中...");
fileReader.onload = ev => {
try {
const data = ev.target.result;
const workbook = read(data, { type: "binary" });
this.workbook = workbook;
this.excelSheetNames = workbook.SheetNames;
this.showSheetNameSelector = true;
this.$mk.hideLoading();
} catch (e) {
console.log("error:" + e);
return false;
}
}
fileReader.readAsBinaryString(file);
},
importOk() {
this.showSheetNameSelector = false;
const { workbook, excelSheetName } = this;
if (!excelSheetName) {
return;
}
let tableData = utils.sheet_to_json(workbook.Sheets[excelSheetName]);
this.$emit("importData", { data: tableData });
},
// 修改日期 // 修改日期
onDateChange(date) { // 日期选择器事件 onDateChange(date) { // 日期选择器事件
if (date && date.length) { // 如果有值 if (date && date.length) { // 如果有值
@ -149,6 +279,9 @@ export default {
if (mode == "like") { // 如果是模糊搜索 if (mode == "like") { // 如果是模糊搜索
value = "%" + value + "%"; // 如果是模糊搜索就在两边加上% value = "%" + value + "%"; // 如果是模糊搜索就在两边加上%
} }
if(typeof(value) == "object" && value.id){
value = value.id;
}
rules.push({ // 添加搜索参数 rules.push({ // 添加搜索参数
column: key, // 字段名 column: key, // 字段名
mode: mode, // 搜索模式 mode: mode, // 搜索模式
@ -204,13 +337,103 @@ export default {
} }
}, },
getPageList() {
let target = [];
let find = (component) => {
if (component && component.pageList) {
target = component.pageList;
}
if (component.$parent) {
find(component.$parent)
}
}
find(this.$parent);
return target;
},
isEditPageOpen() {
let pageList = this.getPageList();
if (pageList.filter(a => a.keyPath && a.keyPath.indexOf(this.options.editPageUrl) == 0).length) {
return true;
}
return false;
},
getTabsViewPageComponent() {
let target = null;
let find = (component) => {
if (component && component.pageList) {
target = component;
}
if (component.$parent) {
find(component.$parent)
}
}
find(this.$parent);
return target;
},
//找到定义了beforeTabClose方法 的页面组件
findEditPageComponent(key) {
if (!key) {
return null;
}
let target = null;
let find = (children) => {
children.forEach(item => {
if (item.beforeTabClose && item.pageKeys && item.pageKeys.filter(a => key.indexOf(a) == 0).length) {
target = item;
return;
}
if (item.$children && item.$children.length) {
find(item.$children)
}
})
}
let tabsview = this.getTabsViewPageComponent();
if (tabsview == null) {
return null;
}
find(tabsview.$children);
return target;
},
// 编辑 // 编辑
pageEdit(row) { pageEdit(row) {
if (!row) { // 如果没有选中行 if (!row) { // 如果没有选中行
this.$mk.msg("请选择行"); // 提示 this.$mk.msg("请选择行"); // 提示
return; // 返回 return; // 返回
} }
this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面 if (this.isEditPageOpen()) {
let editPage = this.findEditPageComponent(this.options.editPageUrl);
if (editPage != null) {
editPage.beforeTabClose().then(() => {
this.$closePage(this.options.editPageUrl);
this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
});
} else {
this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
}
} else {
this.$openPage(this.options.editPageUrl + row[this.options.keyName]); // 打开页面
}
}, },
// 删除 // 删除

6
src/application/mk/index.js
View File

@ -88,7 +88,11 @@ VXETable.formats.mixin({
}, },
formatRef({ cellValue,column }) { // 格式化参照 formatRef({ cellValue,column }) { // 格式化参照
if(column && column.params && column.params.dataType == "object" && column.params.textField && typeof(cellValue) == "object"){ if(column && column.params
&& column.params.dataType == "object"
&& column.params.textField && typeof(cellValue) == "object"
){
return cellValue[column.params.textField]; return cellValue[column.params.textField];
} }
return cellValue && cellValue[1] ? cellValue[1] : '' return cellValue && cellValue[1] ? cellValue[1] : ''

73
src/application/mk/libs/function/form.js
View File

@ -3,44 +3,53 @@ export default {
// 格式化表单数据 // 格式化表单数据
formatFormData: function ({ data, rules }) { // 格式化表单数据 formatFormData: function ({ data, rules }) { // 格式化表单数据
rules.forEach(rule => { // 循环规则
if (!rule.dataRule){ let feachRules = (rules)=>{
return;
} rules.forEach(rule => { // 循环规则
if (rule.field in data) { // 如果字段在数据中 if(rule.children && rule.children.length){
let value = data[rule.field]; // 获取值 feachRules(rule.children);
if (rule.dataRule.fromField) {
value = value[rule.dataRule.fromField];
} }
let saveField = rule.field; if (!rule.dataRule){
if(rule.dataRule.saveField){ return;
saveField = rule.dataRule.saveField;
} }
if (rule.dataRule.type == "integer") { // 如果是整数 if (rule.field in data) { // 如果字段在数据中
data[saveField] = parseInt(value); // 转换为整数 let value = data[rule.field]; // 获取值
} if (rule.dataRule.fromField) {
else if (rule.dataRule.type == "number") { // 如果是整数 value = value[rule.dataRule.fromField];
data[saveField] = parseFloat(value); // 转换为整数
}
else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
}
else if (rule.dataRule.type == "string") { // 如果是字符串
if(data[saveField] === true){
data[saveField] = "true";
} }
else if(data[saveField] === false){ let saveField = rule.field;
data[saveField] = "false"; if(rule.dataRule.saveField){
saveField = rule.dataRule.saveField;
} }
else if(data[saveField]){ if (rule.dataRule.type == "integer") { // 如果是整数
data[saveField] = value + ""; data[saveField] = parseInt(value); // 转换为整数
}
else if (rule.dataRule.type == "number") { // 如果是整数
data[saveField] = parseFloat(value); // 转换为整数
}
else if (rule.dataRule.type == "timestamp") { // 如果是时间戳
data[saveField] = parseInt(new Date(value).getTime() / 1000); // 转换为时间戳
}
else if (rule.dataRule.type == "string") { // 如果是字符串
if(data[saveField] === true){
data[saveField] = "true";
}
else if(data[saveField] === false){
data[saveField] = "false";
}
else if(data[saveField]){
data[saveField] = value + "";
}
}
else {
data[saveField] =value ;
} }
} }
else { });
data[saveField] =value ; };
} feachRules(rules);
}
});
}, },

143
src/layouts/tabs/TabsView.vue
View File

@ -1,15 +1,8 @@
<template> <template>
<admin-layout> <admin-layout>
<contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" /> <contextmenu :itemList="menuItemList" :visible.sync="menuVisible" @select="onMenuSelect" />
<tabs-head <tabs-head v-if="multiPage" :active="activePage" :page-list="pageList" @change="changePage" @close="remove"
v-if="multiPage" @refresh="refresh" @contextmenu="onContextmenu" />
:active="activePage"
:page-list="pageList"
@change="changePage"
@close="remove"
@refresh="refresh"
@contextmenu="onContextmenu"
/>
<div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`"> <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
<page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction"> <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
<a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches"> <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
@ -25,17 +18,17 @@
import AdminLayout from '@/layouts/AdminLayout' // 加载布局组件 管理布局 import AdminLayout from '@/layouts/AdminLayout' // 加载布局组件 管理布局
import Contextmenu from '@/components/menu/Contextmenu' // 加载菜单组件 上下文菜单 import Contextmenu from '@/components/menu/Contextmenu' // 加载菜单组件 上下文菜单
import PageToggleTransition from '@/components/transition/PageToggleTransition' // 加载页面切换动画组件 import PageToggleTransition from '@/components/transition/PageToggleTransition' // 加载页面切换动画组件
import {mapState, mapMutations} from 'vuex' // 加载vuex mapState、mapMutations import { mapState, mapMutations } from 'vuex' // 加载vuex mapState、mapMutations
import {getI18nKey} from '@/utils/routerUtil' // 加载路由工具 getI18nKey 获取国际化key import { getI18nKey } from '@/utils/routerUtil' // 加载路由工具 getI18nKey 获取国际化key
import AKeepAlive from '@/components/cache/AKeepAlive' // 加载缓存组件 AKeepAlive import AKeepAlive from '@/components/cache/AKeepAlive' // 加载缓存组件 AKeepAlive
import TabsHead from '@/layouts/tabs/TabsHead' // 加载页签组件 TabsHead import TabsHead from '@/layouts/tabs/TabsHead' // 加载页签组件 TabsHead
export default { export default {
name: 'TabsView', // 组件名称 页签视图 name: 'TabsView', // 组件名称 页签视图
i18n: require('./i18n'), // 国际化 国际化配置 i18n: require('./i18n'), // 国际化 国际化配置
components: {TabsHead, PageToggleTransition, Contextmenu, AdminLayout , AKeepAlive }, components: { TabsHead, PageToggleTransition, Contextmenu, AdminLayout, AKeepAlive },
// 注册组件 页签头、页面切换动画组件、上下文菜单、管理布局、AKeepAlive // 注册组件 页签头、页面切换动画组件、上下文菜单、管理布局、AKeepAlive
data () { data() {
return { return {
clearCaches: [], // 清除缓存 clearCaches: [], // 清除缓存
pageList: [], // 页签列表 pageList: [], // 页签列表
@ -60,7 +53,7 @@ export default {
return this.multiPage ? 24 : 0 // 如果多页签 返回24 否则返回0 return this.multiPage ? 24 : 0 // 如果多页签 返回24 否则返回0
} }
}, },
created () { // 创建 created() { // 创建
this.loadCacheConfig(this.$router?.options?.routes) // 加载缓存配置 this.loadCacheConfig(this.$router?.options?.routes) // 加载缓存配置
this.loadCachedTabs() // 加载缓存页签 this.loadCachedTabs() // 加载缓存页签
const route = this.$route // 获取路由 const route = this.$route // 获取路由
@ -75,7 +68,7 @@ export default {
this.addListener() // 添加监听 this.addListener() // 添加监听
} }
}, },
mounted () { // 挂载 mounted() { // 挂载
this.correctPageMinHeight(-this.tabsOffset) // 修正页面最小高度 this.correctPageMinHeight(-this.tabsOffset) // 修正页面最小高度
}, },
beforeDestroy() { // 销毁前 beforeDestroy() { // 销毁前
@ -116,27 +109,72 @@ export default {
} }
}, },
methods: { methods: {
changePage (key) { // 切换页签 changePage(key) { // 切换页签
this.activePage = key // 激活页签为key this.activePage = key // 激活页签为key
const page = this.pageList.find(item => item.path === key) // 获取页签 const page = this.pageList.find(item => item.path === key) // 获取页签
this.$router.push(page.fullPath) // 跳转到页签的fullPath this.$router.push(page.fullPath) // 跳转到页签的fullPath
}, },
remove (key, next) { // 移除页签
//找到定义了beforeTabClose方法 的页面组件
findPageComponent(component , key ) {
if(!key){
return null;
}
let target = null;
let find = (children) => {
children.forEach(item => {
if (item.beforeTabClose && item.pageKeys && item.pageKeys.filter(a=> key.indexOf(a) == 0).length) {
target = item;
return;
}
if (item.$children && item.$children.length) {
find(item.$children)
}
})
}
find(component.$children);
return target;
},
remove(key, next,noCheck) { // 移除页签
if (this.pageList.length === 1) { // 如果页签列表长度为1 只有一个页签 if (this.pageList.length === 1) { // 如果页签列表长度为1 只有一个页签
return this.$message.warning(this.$t('warn')) // 提示警告 不能关闭最后一个页签 return this.$message.warning(this.$t('warn')) // 提示警告 不能关闭最后一个页签
} }
//清除缓存 let doRemove = () => {
let index = this.pageList.findIndex(item => item.path === key) // 获取页签索引 //清除缓存
this.clearCaches = this.pageList.splice(index, 1).map(page => page.cachedKey) // 清除缓存为页签的cachedKey let index = this.pageList.findIndex(item => item.path === key) // 获取页签索引
if (next) { // 如果next为true this.clearCaches = this.pageList.splice(index, 1).map(page => page.cachedKey) // 清除缓存为页签的cachedKey
this.$router.push(next) // 跳转到next if (next) { // 如果next为true
} else if (key === this.activePage) { // 如果key等于激活页签 this.$router.push(next) // 跳转到next
index = index >= this.pageList.length ? this.pageList.length - 1 : index // 如果索引大于等于页签列表长度 则索引为页签列表长度-1 否则为索引 } else if (key === this.activePage) { // 如果key等于激活页签
this.activePage = this.pageList[index].path // 激活页签为页签列表索引的path index = index >= this.pageList.length ? this.pageList.length - 1 : index // 如果索引大于等于页签列表长度 则索引为页签列表长度-1 否则为索引
this.$router.push(this.activePage) // 跳转到激活页签 this.activePage = this.pageList[index].path // 激活页签为页签列表索引的path
this.$router.push(this.activePage) // 跳转到激活页签
}
};
if(noCheck){
doRemove();
return;
} }
let pageComponent = this.findPageComponent(this,key);
if (pageComponent) {
pageComponent.beforeTabClose().then(()=>{
doRemove(); //通过了才调用关闭
});
return;
}
doRemove();
}, },
refresh (key, page) { // 刷新页签 refresh(key, page) { // 刷新页签
page = page || this.pageList.find(item => item.path === key) // 获取页签 page = page || this.pageList.find(item => item.path === key) // 获取页签
page.loading = true // 页签的loading为true page.loading = true // 页签的loading为true
this.clearCache(page) // 清除缓存 this.clearCache(page) // 清除缓存
@ -154,7 +192,7 @@ export default {
this.menuVisible = true // 菜单可见为true this.menuVisible = true // 菜单可见为true
} }
}, },
onMenuSelect (key, target, pageKey) { // 菜单选择 onMenuSelect(key, target, pageKey) { // 菜单选择
switch (key) { // switch key switch (key) { // switch key
case '1': this.closeLeft(pageKey); break // 关闭左侧页签 case '1': this.closeLeft(pageKey); break // 关闭左侧页签
case '2': this.closeRight(pageKey); break // 关闭右侧页签 case '2': this.closeRight(pageKey); break // 关闭右侧页签
@ -163,7 +201,7 @@ export default {
default: break // 默认 default: break // 默认
} }
}, },
closeOthers (pageKey) { // 关闭其他页签 pageKey为页签key closeOthers(pageKey) { // 关闭其他页签 pageKey为页签key
// 清除缓存 // 清除缓存
const clearPages = this.pageList.filter(item => item.path !== pageKey && !item.unclose) const clearPages = this.pageList.filter(item => item.path !== pageKey && !item.unclose)
// 清除页签为页签列表过滤出不等于页签key并且unclose为false的页签 // 清除页签为页签列表过滤出不等于页签key并且unclose为false的页签
@ -175,11 +213,11 @@ export default {
this.$router.push(this.activePage) // 跳转到激活页签 this.$router.push(this.activePage) // 跳转到激活页签
} }
}, },
closeLeft (pageKey) { // 关闭左侧页签 pageKey为页签key closeLeft(pageKey) { // 关闭左侧页签 pageKey为页签key
const index = this.pageList.findIndex(item => item.path === pageKey) // 获取页签索引 const index = this.pageList.findIndex(item => item.path === pageKey) // 获取页签索引
// 清除缓存 // 清除缓存
const clearPages = this.pageList.filter((item, i) => i < index && !item.unclose) // 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签 const clearPages = this.pageList.filter((item, i) => i < index && !item.unclose) // 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签
// 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签 // 清除页签为页签列表过滤出索引小于页签索引并且unclose为false的页签
this.clearCaches = clearPages.map(item => item.cachedKey) // 清除缓存为清除页签的cachedKey this.clearCaches = clearPages.map(item => item.cachedKey) // 清除缓存为清除页签的cachedKey
this.pageList = this.pageList.filter(item => !clearPages.includes(item)) // 页签列表为页签列表过滤出不包含清除页签的页签 this.pageList = this.pageList.filter(item => !clearPages.includes(item)) // 页签列表为页签列表过滤出不包含清除页签的页签
// 判断跳转 // 判断跳转
@ -188,7 +226,7 @@ export default {
this.$router.push(this.activePage) // 跳转到激活页签 this.$router.push(this.activePage) // 跳转到激活页签
} }
}, },
closeRight (pageKey) { // 关闭右侧页签 pageKey为页签key closeRight(pageKey) { // 关闭右侧页签 pageKey为页签key
// 清除缓存 // 清除缓存
const index = this.pageList.findIndex(item => item.path === pageKey) // 页签索引为页签列表找到页签key的索引 const index = this.pageList.findIndex(item => item.path === pageKey) // 页签索引为页签列表找到页签key的索引
const clearPages = this.pageList.filter((item, i) => i > index && !item.unclose) const clearPages = this.pageList.filter((item, i) => i > index && !item.unclose)
@ -241,25 +279,29 @@ export default {
}, },
closeOthersListener(event) { closeOthersListener(event) {
this.closeOthers( event.detail) // 移出页签 this.closeOthers(event.detail) // 移出页签
}, },
/** /**
* 页签关闭事件监听 * 页签关闭事件监听
* @param event 页签关闭事件 * @param event 页签关闭事件
*/ */
closePageListener(event) { // 页签关闭事件监听 event为页签关闭事件 closePageListener(event) { // 页签关闭事件监听 event为页签关闭事件
const {closeRoute, nextRoute} = event.detail // 页签关闭路由为页签关闭事件的detail的closeRoute，下一个路由为页签关闭事件的detail的nextRoute const { closeRoute, nextRoute } = event.detail // 页签关闭路由为页签关闭事件的detail的closeRoute，下一个路由为页签关闭事件的detail的nextRoute
const closePath = typeof closeRoute === 'string' ? closeRoute : closeRoute.path const closePath = typeof closeRoute === 'string' ? closeRoute : (closeRoute.path || closeRoute.closeRoute)
// 页签关闭路径为页签关闭路由为字符串时为页签关闭路由，否则为页签关闭路由的path // 页签关闭路径为页签关闭路由为字符串时为页签关闭路由，否则为页签关闭路由的path
const path = closePath && closePath.split('?')[0] // 路径等于为页签关闭路径并且以？分割的第一个 const path = closePath && closePath.split('?')[0] // 路径等于为页签关闭路径并且以？分割的第一个
this.remove(path, nextRoute) // 移出页签
this.remove(path, nextRoute, true) // 移出页签
}, },
/** /**
* 页面刷新事件监听 * 页面刷新事件监听
* @param event 页签关闭事件 * @param event 页签关闭事件
*/ */
refreshPageListener(event) { // 页面刷新事件监听 event为页签关闭事件 refreshPageListener(event) { // 页面刷新事件监听 event为页签关闭事件
const {pageKey} = event.detail // 页签key为页签关闭事件的detail的pageKey const { pageKey } = event.detail // 页签key为页签关闭事件的detail的pageKey
const path = pageKey && pageKey.split('?')[0] // 路径等于为页签key并且以？分割的第一个 const path = pageKey && pageKey.split('?')[0] // 路径等于为页签key并且以？分割的第一个
this.refresh(path) // 刷新页签 this.refresh(path) // 刷新页签
}, },
@ -267,7 +309,7 @@ export default {
* 页面 unload 事件监听器，添加页签到 session 缓存，用于刷新时保留页签 * 页面 unload 事件监听器，添加页签到 session 缓存，用于刷新时保留页签
*/ */
unloadListener() { // 页面 unload 事件监听器 unloadListener() { // 页面 unload 事件监听器
const tabs = this.pageList.map(item => ({...item, _init_: false})) const tabs = this.pageList.map(item => ({ ...item, _init_: false }))
// 页签列表为页签列表的map，map的参数为页签列表的每一项，返回值为页签列表的每一项的副本，初始化为false // 页签列表为页签列表的map，map的参数为页签列表的每一项，返回值为页签列表的每一项的副本，初始化为false
sessionStorage.setItem(process.env.VUE_APP_TBAS_KEY, JSON.stringify(tabs)) // 添加页签到session缓存 sessionStorage.setItem(process.env.VUE_APP_TBAS_KEY, JSON.stringify(tabs)) // 添加页签到session缓存
}, },
@ -329,17 +371,20 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
.tabs-view{ .tabs-view {
margin: -16px auto 8px; margin: -16px auto 8px;
&.head.fixed{
max-width: 1400px; &.head.fixed {
} max-width: 1400px;
} }
.tabs-view-content{ }
position: relative;
&.head.fixed{ .tabs-view-content {
width: 1400px; position: relative;
margin: 0 auto;
} &.head.fixed {
width: 1400px;
margin: 0 auto;
} }
}
</style> </style>

1
src/pages/Middle/Mes/BaseDepartment/BaseDepartment/List.vue
View File

@ -87,7 +87,6 @@ export default {
{ title: '操作', slots: { default: 'op' }, width: 120 }, { title: '操作', slots: { default: 'op' }, width: 120 },
{ field: 'code', sortable: true, title: '编码', width: 250 }, // 编码 { field: 'code', sortable: true, title: '编码', width: 250 }, // 编码
// { field: 'title', sortable: true, title: '部门名称', width: 250 }, // 部门名称
{ field: 'name', sortable: true, title: '部门名称', width: 250 }, // 部门英文名称 { field: 'name', sortable: true, title: '部门名称', width: 250 }, // 部门英文名称
{ field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间 { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
{ field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间 { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间

65
src/pages/Middle/Mes/MesBom/MesBom/List.vue
View File

@ -40,11 +40,11 @@ export default {
listFieldName: 'MesBom', listFieldName: 'MesBom',
addPageUrl: "/MesBom/MesBomAdd", addPageUrl: "/MesBom/MesBomAdd",
editPageUrl: "/MesBom/MesBomUpdate/", editPageUrl: "/MesBom/MesBomUpdate/",
// 接口动作 // 接口动作
actions: { // Api 接口地址 actions: { // Api 接口地址
MesBomList: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/list`, MesBomList: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/list`,
MesBomBatchDelete: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/batchDelete` MesBomBatchDelete: `${BASE_URL.BASE_URL}/MesBom/v1/mes/bom/batchDelete`
}, },
start_time: 0, // 开始时间 start_time: 0, // 开始时间
end_time: 0, // 结束时间 end_time: 0, // 结束时间
@ -57,14 +57,29 @@ export default {
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{ key: "title", mode: "like" }, { key: "title", mode: "equal" },
{ key: "desc", mode: "like" } { key: "version", mode: "like" }
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{ field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
{ field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, {
{ span: 8, slots: { default: 'date' } }, // 自定义列 title: '父件', span: 6,
field: 'material_id',
itemRender: {
name: 'MkFormDataSelector', props: {
params: {
dataType: "object",
valueField: "id",
textField: "name",
listdataFieldName: 'MesMaterials',
dataUrl: `${BASE_URL.BASE_URL}/MesMaterials/v1/mes/materials/list`
}
}
}
},
{ field: 'version', title: '版本号', span: 6, itemRender: { name: '$input', props: { placeholder: '请输入版本号' } } },
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, // 搜索按钮 name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } }, // 搜索按钮
@ -80,31 +95,31 @@ export default {
stripe: true, // 启用斑马纹 stripe: true, // 启用斑马纹
id: 'datagrid_1', // 表格唯一标识 id: 'datagrid_1', // 表格唯一标识
// 表格列配置 // 表格列配置
columns: [ columns: [
{ type: 'checkbox', width: 50 }, // 多选框 { type: 'checkbox', width: 50 }, // 多选框
{ type: 'seq', width: 30 }, // 序号 { type: 'seq', width: 30 }, // 序号
{ title: '操作', slots: { default: 'op' }, width: 120 }, { title: '操作', slots: { default: 'op' }, width: 120 },
// =============================== 表格列 自动生成 Start =============================== { field: 'mes_materials', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '父件', width: 250 },
{ field: 'version', sortable: true, title: 'BOM版本', width: 250 }, // BOM姓名 { field: 'version', sortable: true, title: 'BOM版本', width: 250 },
{ field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间 { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
{ field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间 { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
// =============================== 表格列 自动生成 Start =============================== // =============================== 表格列 自动生成 Start ===============================
] ]
} }
}; };
pageData.actions.getList = pageData.actions.MesBomList; pageData.actions.getList = pageData.actions.MesBomList;
pageData.actions.delete = pageData.actions.MesBomBatchDelete; pageData.actions.delete = pageData.actions.MesBomBatchDelete;
pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据 pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
this.pageOptions = pageData; this.pageOptions = pageData;

6
src/pages/Middle/Mes/MesEnum/MesEnum/index.vue
View File

@ -349,10 +349,16 @@ export default {
let save = () => { let save = () => {
if (!this.selectedKey || this.selectedKey == "root") { if (!this.selectedKey || this.selectedKey == "root") {
this.$mk.error("请先选择枚举分类"); this.$mk.error("请先选择枚举分类");
return; return;
} }
this.$refs.xTable.clearEdit();
let node = this.findTreeNode(this.selectedKey); let node = this.findTreeNode(this.selectedKey);
let ds = JSON.parse(JSON.stringify(this.detailsData)); let ds = JSON.parse(JSON.stringify(this.detailsData));

34
src/pages/Middle/Mes/MesMaterials/MesMaterials/index.vue
View File

@ -2,9 +2,8 @@
<div class="page-body"> <div class="page-body">
<a-row type="flex"> <div class="wrapper">
<a-col flex="200px"> <div class="left">
<div class="treepanel" :style="'height:' + tableHeight + 'px'"> <div class="treepanel" :style="'height:' + tableHeight + 'px'">
<div class="treepanel-header"> <div class="treepanel-header">
<a @click.stop="treeAdd(row)" title="新增"> <a @click.stop="treeAdd(row)" title="新增">
@ -24,15 +23,22 @@
</a-tree> </a-tree>
</div> </div>
</div> </div>
</a-col>
<a-col flex="auto">
</div>
<div class="right">
<basic-page-list ref="listPage" :options="pageOptions"></basic-page-list> <basic-page-list ref="listPage" :options="pageOptions"></basic-page-list>
</div>
</div>
</a-col>
</a-row>
@ -505,9 +511,23 @@ export default {
padding: 8px; padding: 8px;
} }
/* 左侧固定宽度 200px，右侧自适应 */
.wrapper {
display: flex;
}
.left {
width: 200px;
height: 100%;
}
.right {
flex-grow: 1;
height: 100%;
}
.treepanel { .treepanel {
width: calc(100% - 10px); width: calc(100% - 10px);
background: white;
margin-right: 10px; margin-right: 10px;
border: 1px solid #ccc; border: 1px solid #ccc;
} }

73
src/pages/Middle/Mes/MesProcesses/MesProcesses/Edit.vue
View File

@ -1,5 +1,6 @@
<template> <template>
<basic-page-edit :desc="desc" :dataId="getDataId()" :options="pageOptions"></basic-page-edit> <basic-page-edit :desc="desc" :dataId="getDataId()" ref="editpage" @afterSave="afterSave"
:options="pageOptions"></basic-page-edit>
</template> </template>
<script> <script>
@ -23,7 +24,11 @@ export default {
data() { data() {
return { return {
pageOptions: {}
pageKeys: ['/MesProcesses/MesProcessesUpdate/', '/MesProcesses/MesProcessesAdd'],
preventTabClose: true,
pageOptions: {},
lastFormDataJson: ""
}; };
}, },
@ -39,6 +44,10 @@ export default {
this.optionsInit(); this.optionsInit();
this.dataInit(); this.dataInit();
setTimeout(() => {
console.log(this)
}, 1000);
}, },
// 函数 // 函数
methods: { methods: {
@ -53,6 +62,9 @@ export default {
// 当前项目ID // 当前项目ID
currentBeid: 0, currentBeid: 0,
//保存后提示
action_afterSave: "confirm",
addPageUrl: "/MesProcesses/MesProcessesAdd", addPageUrl: "/MesProcesses/MesProcessesAdd",
editPageUrl: "/MesProcesses/MesProcessesUpdate/", editPageUrl: "/MesProcesses/MesProcessesUpdate/",
listPageUrl: "/MesProcesses/MesProcessesList", listPageUrl: "/MesProcesses/MesProcessesList",
@ -118,7 +130,7 @@ export default {
is_quality_inspection: 0, is_quality_inspection: 0,
quality_inspection_scheme_id: 0, quality_inspection_scheme_id: 0,
raw_material_type_id: 0, raw_material_type_id: 0,
status: 0, status: 1,
create_uid: 0, create_uid: 0,
update_uid: 0, update_uid: 0,
create_time: new Date(2100, 1, 1).getTime() / 10000, create_time: new Date(2100, 1, 1).getTime() / 10000,
@ -145,14 +157,14 @@ export default {
// 表单项 // 表单项
items: [ items: [
{ field: 'name', title: '工序名称', span: 12, itemRender: { name: '$input' } }, { field: 'name', title: '工序名称', span: 12, itemRender: { name: '$input' } },
// { field: 'title', title: '工序名称', span: 12, itemRender: { name: '$input' } }, // { field: 'title', title: '工序名称', span: 12, itemRender: { name: '$input' } },
{ field: 'code', title: '工序编码', span: 12, itemRender: { name: '$input' } }, { field: 'code', title: '工序编码', span: 12, itemRender: { name: '$input' } },
{ field: 'desc', title: '工序描述', span: 12, itemRender: { name: '$input' } }, { field: 'desc', title: '工序描述', span: 12, itemRender: { name: '$input' } },
{ field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } }, { field: 'remark', title: '工序备注', span: 12, itemRender: { name: '$input' } },
{ field: 'work_type', title: '计工方式', span: 12, itemRender: { name: '$select',props:{options:settings.options_work_type} } }, { field: 'work_type', title: '计工方式', span: 12, itemRender: { name: '$select', props: { options: settings.options_work_type } } },
{ field: 'car_limit', title: '领车限制数', span: 12, itemRender: { name: '$input',props:{type:'number'} } }, { field: 'car_limit', title: '领车限制数', span: 12, itemRender: { name: '$input', props: { type: 'number' } } },
{ field: 'is_quality_inspection', title: '是否质检工序', span: 12, itemRender: { name: '$select',props:{options:settings.options_yesorno} } }, { field: 'is_quality_inspection', title: '是否质检工序', span: 12, itemRender: { name: '$select', props: { options: settings.options_yesorno } } },
{ field: 'status', title: '状态', span: 12, itemRender: { name: '$select', props: { options: settings.options_status_process } } }, { field: 'status', title: '状态', span: 12, itemRender: { name: '$select', props: { options: settings.options_status_process } } },
] ]
}, },
@ -198,7 +210,7 @@ export default {
} }
this.pageOptions.formOptions.data = a.data[detailDataFieldName]; this.pageOptions.formOptions.data = a.data[detailDataFieldName];
this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
this.$forceUpdate() this.$forceUpdate()
}).catch((a) => { }).catch((a) => {
this.$mk.error(a.data.msg); this.$mk.error(a.data.msg);
@ -213,6 +225,8 @@ export default {
this.pageOptions.formOptions.items.push(item); this.pageOptions.formOptions.items.push(item);
}) })
this.lastFormDataJson = JSON.stringify(this.pageOptions.formOptions.data);
} }
}, },
@ -226,7 +240,48 @@ export default {
dataId = 0; dataId = 0;
} }
return dataId; return dataId;
} },
afterSave({ data }) {
this.lastFormDataJson = JSON.stringify(data);
},
isDataChanged() {
return this.lastFormDataJson != JSON.stringify(this.pageOptions.formOptions.data);
},
beforeTabClose() {
let _this = this;
return new Promise((resolve) => {
if (_this.isDataChanged()) {
_this.$confirm({
title: '提示',
content: '当前内容未保存，是否保存',
okText: '保存',
cancelText: '取消',
onOk() {
_this.$refs.editpage.save({
afterSave: () => {
resolve();
}
})
},
onCancel() {
resolve();
},
});
} else {
resolve();
}
});
},
}, },
// 监听属性 // 监听属性
watch: { watch: {

184
src/pages/Middle/Mes/MesProcesses/MesProcesses/List.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<basic-page-list :desc="desc" :options="pageOptions"></basic-page-list> <basic-page-list :desc="desc" @importData="pageImport" :options="pageOptions"></basic-page-list>
</template> </template>
<script> <script>
@ -33,6 +33,44 @@ export default {
// 动作 // 动作
methods: { methods: {
pageImport({ data }) {
let rows = [];
data.forEach(item => {
let row = {};
this.pageOptions.exportColumns.forEach(col => {
if (col.title in item) {
let v = item[col.title];
if(col.options){
col.options.forEach(op=>{
if(op.label == v){
row[col.field] = op.value;
}
})
}else{
row[col.field] = v;
}
}
})
rows.push(row);
});
this.$mk.post({
url: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchCreate`,
loading: "导入中...",
data: {
"list": rows
},
useBigInt: true
}).then((a) => { // 成功
this.$mk.success(a.data.msg || "导入成功"); // 提示成功
this.$refs.xGrid.commitProxy('query') // 提交搜索
}).catch((a) => { // 失败
this.$mk.error(a.data.msg); // 提示错误信息
});
},
optionsInit() { optionsInit() {
// 页面数据 // 页面数据
var pageData = { // 页面数据变量 var pageData = { // 页面数据变量
@ -40,49 +78,59 @@ export default {
keyName: 'id', // 主键字段名 keyName: 'id', // 主键字段名
listFieldName: 'MesProcesses', listFieldName: 'MesProcesses',
exportFileTitle :"工序",
enabledExport: true,
enabledImport: true,
enabledImportTemplate: true,
exportColumns: [
{ title: '编码',field:"code" },
{ title: '工序名称',field:"name" },
{ title: '工序描述',field:"desc" },
{ title: '计工方式',field:"work_type",options:settings.options_work_type }
],
addPageUrl: "/MesProcesses/MesProcessesAdd", addPageUrl: "/MesProcesses/MesProcessesAdd",
editPageUrl: "/MesProcesses/MesProcessesUpdate/", editPageUrl: "/MesProcesses/MesProcessesUpdate/",
// 接口动作 // 接口动作
actions: { // Api 接口地址 actions: { // Api 接口地址
// =============================== 接口地址 自动生成 Start =============================== // =============================== 接口地址 自动生成 Start ===============================
MesProcessesList: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`, // 工序列表 MesProcessesList: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/list`, // 工序列表
MesProcessesDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detail`, // 工序详情 MesProcessesDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detail`, // 工序详情
MesProcessesCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/create`, // 创建工序 MesProcessesCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/create`, // 创建工序
MesProcessesUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/update`, // 更新工序 MesProcessesUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/update`, // 更新工序
MesProcessesDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detele`, // 删除工序 MesProcessesDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/detele`, // 删除工序
MesProcessesBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchDelete`, // 批量删除工序 MesProcessesBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchDelete`, // 批量删除工序
MesProcessesBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchUpdate`, // 批量更新工序 MesProcessesBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchUpdate`, // 批量更新工序
MesProcessesBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchCreate`, // 批量创建工序 MesProcessesBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/batchCreate`, // 批量创建工序
MesProcessesExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/export/excel`, // 导出工序数据到EXCEL MesProcessesExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/export/excel`, // 导出工序数据到EXCEL
MesProcessesImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/import/excel`, // 批量导入EXCEL工序数据 MesProcessesImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/import/excel`, // 批量导入EXCEL工序数据
MesProcessesOpen: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/open`, // 打开工序 MesProcessesOpen: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/open`, // 打开工序
MesProcessesClose: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/close`, // 关闭工序 MesProcessesClose: `${BASE_URL.BASE_URL}/MesProcesses/v1/mes/processes/close`, // 关闭工序
ProcessProgrammeList: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/list`, // 工序方案列表 ProcessProgrammeList: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/list`, // 工序方案列表
ProcessProgrammeDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detail`, // 工序方案详情 ProcessProgrammeDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detail`, // 工序方案详情
ProcessProgrammeCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/create`, // 创建工序方案 ProcessProgrammeCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/create`, // 创建工序方案
ProcessProgrammeUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/update`, // 更新工序方案 ProcessProgrammeUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/update`, // 更新工序方案
ProcessProgrammeDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detele`, // 删除工序方案 ProcessProgrammeDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/detele`, // 删除工序方案
ProcessProgrammeBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchDelete`, // 批量删除工序方案 ProcessProgrammeBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchDelete`, // 批量删除工序方案
ProcessProgrammeBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchUpdate`, // 批量更新工序方案 ProcessProgrammeBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchUpdate`, // 批量更新工序方案
ProcessProgrammeBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchCreate`, // 批量创建工序方案 ProcessProgrammeBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/batchCreate`, // 批量创建工序方案
ProcessProgrammeExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/export/excel`, // 导出工序方案数据到EXCEL ProcessProgrammeExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/export/excel`, // 导出工序方案数据到EXCEL
ProcessProgrammeImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/import/excel`, // 批量导入EXCEL工序方案数据 ProcessProgrammeImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/process/programme/import/excel`, // 批量导入EXCEL工序方案数据
ProgrammeItemList: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/list`, // 工序方案工序ID列表 ProgrammeItemList: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/list`, // 工序方案工序ID列表
ProgrammeItemDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detail`, // 工序方案工序ID详情 ProgrammeItemDetail: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detail`, // 工序方案工序ID详情
ProgrammeItemCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/create`, // 创建工序方案工序ID ProgrammeItemCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/create`, // 创建工序方案工序ID
ProgrammeItemUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/update`, // 更新工序方案工序ID ProgrammeItemUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/update`, // 更新工序方案工序ID
ProgrammeItemDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detele`, // 删除工序方案工序ID ProgrammeItemDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/detele`, // 删除工序方案工序ID
ProgrammeItemBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchDelete`, // 批量删除工序方案工序ID ProgrammeItemBatchDelete: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchDelete`, // 批量删除工序方案工序ID
ProgrammeItemBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchUpdate`, // 批量更新工序方案工序ID ProgrammeItemBatchUpdate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchUpdate`, // 批量更新工序方案工序ID
ProgrammeItemBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchCreate`, // 批量创建工序方案工序ID ProgrammeItemBatchCreate: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/batchCreate`, // 批量创建工序方案工序ID
ProgrammeItemExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/export/excel`, // 导出工序方案工序ID数据到EXCEL ProgrammeItemExportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/export/excel`, // 导出工序方案工序ID数据到EXCEL
ProgrammeItemImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/import/excel`, // 批量导入EXCEL工序方案工序ID数据 ProgrammeItemImportExcel: `${BASE_URL.BASE_URL}/MesProcesses/v1/programme/item/import/excel`, // 批量导入EXCEL工序方案工序ID数据
// =============================== 接口地址 自动生成 End =============================== // =============================== 接口地址 自动生成 End ===============================
}, },
start_time: 0, // 开始时间 start_time: 0, // 开始时间
end_time: 0, // 结束时间 end_time: 0, // 结束时间
@ -93,13 +141,13 @@ export default {
}, },
// 搜索区配置 // 搜索区配置
searchRules: [ searchRules: [
{ key: "title", mode: "like" }, { key: "name", mode: "like" },
{ key: "desc", mode: "like" } { key: "code", mode: "like" }
], ],
//搜索区 //搜索区
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{ field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } }, { field: 'name', title: '工序名称', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入工序名称' } } },
{ field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, { field: 'code', title: '编码', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
{ span: 8, slots: { default: 'date' } }, // 自定义列 { span: 8, slots: { default: 'date' } }, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -116,43 +164,43 @@ export default {
stripe: true, // 启用斑马纹 stripe: true, // 启用斑马纹
id: 'datagrid_1', // 表格唯一标识 id: 'datagrid_1', // 表格唯一标识
// 表格列配置 // 表格列配置
columns: [ columns: [
{ type: 'checkbox', width: 50 }, // 多选框 { type: 'checkbox', width: 50 }, // 多选框
{ type: 'seq', width: 30 }, // 序号 { type: 'seq', width: 30 }, // 序号
{ title: '操作', slots: { default: 'op' }, width: 120 }, { title: '操作', slots: { default: 'op' }, width: 120 },
// =============================== 表格列 自动生成 Start =============================== // =============================== 表格列 自动生成 Start ===============================
//{ field: 'process_segment_id', sortable: true, title: '工序段id', width: 250 }, // 工序段id //{ field: 'process_segment_id', sortable: true, title: '工序段id', width: 250 }, // 工序段id
//{ field: 'title', sortable: true, title: '工序名称', width: 250 }, // 工序名称 //{ field: 'title', sortable: true, title: '工序名称', width: 250 }, // 工序名称
{ field: 'code', sortable: true, title: '工序编码', width: 250 }, // 工序编码 { field: 'code', sortable: true, title: '工序编码', width: 250 }, // 工序编码
{ field: 'name', sortable: true, title: '工序名称', width: 250 }, // 工序英文名称 { field: 'name', sortable: true, title: '工序名称', width: 250 }, // 工序英文名称
{ field: 'desc', sortable: true, title: '工序描述', width: 250 }, // 工序描述 { field: 'desc', sortable: true, title: '工序描述', width: 250 }, // 工序描述
{ field: 'remark', sortable: true, title: '工序备注', width: 250 }, // 工序备注 { field: 'remark', sortable: true, title: '工序备注', width: 250 }, // 工序备注
{ field: 'work_type',params:settings.options_work_type, formatter: 'formatEnum', sortable: true, title: '计工方式', width: 250 }, { field: 'work_type', params: settings.options_work_type, formatter: 'formatEnum', sortable: true, title: '计工方式', width: 250 },
{ field: 'car_limit', sortable: true, title: '领车限制数', width: 250 }, // 领车限制数 { field: 'car_limit', sortable: true, title: '领车限制数', width: 250 }, // 领车限制数
{ field: 'is_quality_inspection', sortable: true, title: '是否质检工序', width: 250 }, // 是否质检工序 { field: 'is_quality_inspection', sortable: true, title: '是否质检工序', width: 250 }, // 是否质检工序
//{ field: 'quality_inspection_scheme_id', sortable: true, title: '质检方案id', width: 250 }, // 质检方案id //{ field: 'quality_inspection_scheme_id', sortable: true, title: '质检方案id', width: 250 }, // 质检方案id
//{ field: 'raw_material_type_id', sortable: true, title: '坯体类型ID', width: 250 }, // 坯体类型ID //{ field: 'raw_material_type_id', sortable: true, title: '坯体类型ID', width: 250 }, // 坯体类型ID
{ field: 'status', slots: { default: 'status' }, width: 80, sortable: true, title: '状态', showHeaderOverflow: true }, // 状态 { field: 'status', slots: { default: 'status' }, width: 80, sortable: true, title: '状态', showHeaderOverflow: true }, // 状态
{ field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间 { field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
{ field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间 { field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
// =============================== 表格列 自动生成 Start =============================== // =============================== 表格列 自动生成 Start ===============================
] ]
} }
}; };
pageData.actions.getList = pageData.actions.MesProcessesList; pageData.actions.getList = pageData.actions.MesProcessesList;
pageData.actions.delete = pageData.actions.MesProcessesBatchDelete; pageData.actions.delete = pageData.actions.MesProcessesBatchDelete;
pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据 pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据
this.pageOptions = pageData; this.pageOptions = pageData;

41
src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
View File

@ -45,6 +45,13 @@ export default {
optionsInit() { optionsInit() {
let date = new Date();
let year = date.getFullYear();
let month = (date.getMonth() + 1).toString().padStart(2, '0');
let day = date.getDate().toString().padStart(2, '0');
let dateString = `${year}-${month}-${day}`;
// 页面数据变量 // 页面数据变量
var pageData = { var pageData = {
// 当前项目名称 // 当前项目名称
@ -130,11 +137,11 @@ export default {
department_id: 0, department_id: 0,
process_id: 0, process_id: 0,
process_scheme_id: 0, process_scheme_id: 0,
entry_date: new Date(2100, 1, 1).getTime() / 10000, entry_date: dateString,
departure_date: new Date(2100, 1, 1).getTime() / 10000, departure_date: "",
is_piecework: 0, is_piecework: 0,
remark: "", remark: "",
status: 0, status: 1,
create_uid: 0, create_uid: 0,
update_uid: 0, update_uid: 0,
create_time: new Date(2100, 1, 1).getTime() / 10000, create_time: new Date(2100, 1, 1).getTime() / 10000,
@ -167,6 +174,26 @@ export default {
children: [ children: [
{ field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } }, { field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } },
{ field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } }, { field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } },
{
title: '部门', span: 12,
field: 'base_department',
dataRule: {
fromField: "id",
saveField: "department_id" // 如果表单项存储的是对象，将从fromField中取得值保存到saveField
},
itemRender: {
name: 'MkFormDataSelector', props: {
params: {
dataType: "object",
valueField: "id",
textField: "name",
listdataFieldName: 'BaseDepartment',
dataUrl: `${BASE_URL.BASE_URL}/BaseDepartment/v1/base/department/list`
}
}
}
},
{ field: 'phone', title: '员工电话', span: 12, itemRender: { name: '$input' } }, { field: 'phone', title: '员工电话', span: 12, itemRender: { name: '$input' } },
{ field: 'email', title: '员工邮箱', span: 12, itemRender: { name: '$input' } }, { field: 'email', title: '员工邮箱', span: 12, itemRender: { name: '$input' } },
//{ field: 'password', title: '员工密码', span: 12, itemRender: { name: '$input' } }, //{ field: 'password', title: '员工密码', span: 12, itemRender: { name: '$input' } },
@ -233,16 +260,16 @@ export default {
let detailDataFieldName = this.pageOptions.detailDataFieldName; let detailDataFieldName = this.pageOptions.detailDataFieldName;
if (a.data[detailDataFieldName].entry_date) { if (a.data[detailDataFieldName].entry_date > 0) {
a.data[detailDataFieldName].entry_date = new Date(a.data[detailDataFieldName].entry_date * 1000); a.data[detailDataFieldName].entry_date = new Date(a.data[detailDataFieldName].entry_date * 1000);
} }
if (a.data[detailDataFieldName].departure_date) { if (a.data[detailDataFieldName].departure_date > 0) {
a.data[detailDataFieldName].departure_date = new Date(a.data[detailDataFieldName].departure_date * 1000); a.data[detailDataFieldName].departure_date = new Date(a.data[detailDataFieldName].departure_date * 1000);
} }
if (a.data[detailDataFieldName].create_time) { if (a.data[detailDataFieldName].create_time > 0) {
a.data[detailDataFieldName].create_time = new Date(a.data[detailDataFieldName].create_time * 1000); a.data[detailDataFieldName].create_time = new Date(a.data[detailDataFieldName].create_time * 1000);
} }
if (a.data[detailDataFieldName].update_time) { if (a.data[detailDataFieldName].update_time > 0) {
a.data[detailDataFieldName].update_time = new Date(a.data[detailDataFieldName].update_time * 1000); a.data[detailDataFieldName].update_time = new Date(a.data[detailDataFieldName].update_time * 1000);
} }

3
src/pages/Middle/Mes/MesStaff/MesStaff/List.vue
View File

@ -109,6 +109,8 @@ export default {
searchFormItems: [ // 子项 searchFormItems: [ // 子项
{ field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } }, { field: 'title', title: '标题', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入标题' } } },
{ field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } }, { field: 'desc', title: '描述', span: 5, itemRender: { name: '$input', props: { placeholder: '请输入描述' } } },
{ span: 8, slots: { default: 'date' } }, // 自定义列 { span: 8, slots: { default: 'date' } }, // 自定义列
{ {
align: 'right', span: 4, itemRender: { // 按钮列 align: 'right', span: 4, itemRender: { // 按钮列
@ -136,6 +138,7 @@ export default {
{ field: 'name', sortable: true, title: '员工姓名', width: 250 }, // 员工姓名 { field: 'name', sortable: true, title: '员工姓名', width: 250 }, // 员工姓名
{ field: 'code', sortable: true, title: '员工工号', width: 250 }, // 员工工号 { field: 'code', sortable: true, title: '员工工号', width: 250 }, // 员工工号
{ field: 'base_department', formatter: 'formatRef', params: { dataType: "object", textField: "name" }, title: '部门', width: 250 },
{ field: 'phone', sortable: true, title: '员工电话', width: 250 }, // 员工电话 { field: 'phone', sortable: true, title: '员工电话', width: 250 }, // 员工电话
{ field: 'email', sortable: true, title: '员工邮箱', width: 250 }, // 员工邮箱 { field: 'email', sortable: true, title: '员工邮箱', width: 250 }, // 员工邮箱
//{ field: 'password', sortable: true, title: '员工密码', width: 250 }, // 员工密码 //{ field: 'password', sortable: true, title: '员工密码', width: 250 }, // 员工密码

5
yarn.lock
View File

@ -4883,6 +4883,11 @@
"loader-utils" "^1.0.2" "loader-utils" "^1.0.2"
"schema-utils" "^1.0.0" "schema-utils" "^1.0.0"
"file-saver@^2.0.5":
"integrity" "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
"resolved" "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz"
"version" "2.0.5"
"file-uri-to-path@2": "file-uri-to-path@2":
"integrity" "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==" "integrity" "sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="
"resolved" "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz" "resolved" "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"