mt-fe-group/pms-aomei
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 数据字典 & add 料仓、设备类型

Browse Source
This commit is contained in:
lb 2023-01-30 16:46:18 +08:00
parent ff77ab8546
commit 508bc4e434
14 changed files with 687 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/index.html
View File

@ -38,7 +38,8 @@
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script>
// window.SITE_CONFIG['apiURL'] = 'http://192.168.1.103:8080/pms-am';
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am';
// window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tengyun
</script>
<% } %>
<!-- 集成测试环境 -->

3
src/mixins/basic-add.js
View File

@ -76,6 +76,7 @@ export default {
}
this.$http[!this.dataForm.id ? "post" : "put"](this.urlOptions.submitURL, this.dataForm)
.then(({ data: res }) => {
// console.log('[confirm] here...')
if (res.code !== 0) {
return this.$message.error(res.msg);
}
@ -85,7 +86,7 @@ export default {
duration: 500,
onClose: () => {
this.visible = false;
this.$emit("refreshDataList");
this.$emit("successSubmit");
},
});
})

21
src/mixins/basic-page.js
View File

@ -35,7 +35,7 @@ export default {
// 获取数据列表
getDataList() {
this.dataListLoading = true;
this.$http
return this.$http
.get(this.urlOptions.getDataListURL, {
params: this.listQuery,
})
@ -121,7 +121,10 @@ export default {
type: "success",
duration: 1500,
onClose: () => {
this.getDataList();
this.getDataList().then(() => {
// 刷新本地缓存
this.refreshLocalstorage()
})
},
});
} else {
@ -157,9 +160,23 @@ export default {
handleConfirm() {
this.$refs.addOrUpdate.dataFormSubmit()
},
refreshLocalstorage() {
// 刷新数据字典数据
this.$http("/sys/dict/type/all", { limit: 999, page: 1 }).then(({ data: res }) => {
// console.log("[dictData] loading...", res);
if (res.code === 0 && res.data) {
localStorage.setItem("dictList", JSON.stringify(res.data));
}
});
// end
},
successSubmit() {
this.handleCancel()
this.getDataList()
if (this.isDictTypePage || this.isDictValuePage) {
// 刷新本地缓存
this.refreshLocalstorage()
}
},
// 导出
exportHandle(name) {

4
src/utils/filters.js
View File

@ -22,3 +22,7 @@ export const pick = (obj, paths) => {
})
return result
}
export const dictFind = (which) => {
return () => 1
}

2
src/views/atomViews/ListViewWithHead.vue
View File

@ -113,7 +113,7 @@ export default {
limit: this.size,
};
if (!queryParams && this.listQueryExtra.length) {
if (!queryParams && this.listQueryExtra && this.listQueryExtra.length) {
this.listQueryExtra.map((name) => {
params[name] = "";
});

107
src/views/modules/pms/equipmentType/config.js Normal file
View File

@ -0,0 +1,107 @@
import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
import StatusComponent from "@/components/noTemplateComponents/statusComponent";
import request from "@/utils/request";
import { dictFind, timeFilter } from '@/utils/filters'
export default function () {
const tableProps = [
{ prop: "createTime", label: "添加时间", filter: timeFilter },
{ prop: "name", label: "类型名称" },
{ prop: "code", label: "类型编码" },
{ prop: "description", label: "描述" },
{ prop: "remark", label: "备注" },
{
prop: "operations",
name: "操作",
fixed: "right",
width: 120,
subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", permission: "pms:equipmentType:delete" }],
},
];
const headFormFields = [
{
prop: 'key',
label: "类型名称",
input: true,
default: { value: "" },
bind: {
// placeholder: '请输入产线名称或编码'
placeholder: '请输入类型名称'
}
},
{
button: {
type: "primary",
name: "查询",
},
},
{
button: {
type: "primary",
name: "新增",
permission: "pms:equipmentType:save"
},
bind: {
plain: true,
}
},
];
/**
* dialog config 有两个版本，一个适用于 DialogWithMenu 组件，另一个适用于 DialogJustForm 组件
* 适用于 DialogWithMenu 组件的配置示例详见 blenderStep/config.js
* 此为后者的配置:
*/
const dialogJustFormConfigs = {
form: {
rows: [
[
{
input: true,
label: "类型名称",
prop: "name",
rules: { required: true, message: "not empty", trigger: "blur" },
elparams: { placeholder: "请输入类型名称" },
},
{
input: true,
label: "类型编码",
prop: "code",
rules: { required: true, message: "not empty", trigger: "blur" },
elparams: { placeholder: "请输入类型编码" },
},
],
[{ textarea: true, label: "描述信息", prop: "description", elparams: { placeholder: "描述信息" } }],
[{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:equipmentType:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:equipmentType:update", showOnEdit: true },
{ name: "reset", label: "重置", type: "warning", showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],
},
};
// 备注：弹窗弹出的时间和网速有关......
return {
dialogConfigs: dialogJustFormConfigs,
tableConfig: {
table: null, // 此处可省略，el-table 上的配置项
column: tableProps, // el-column-item 上的配置项
},
headFormConfigs: {
rules: null, // 名称是由 BaseSearchForm.vue 组件固定的
fields: headFormFields, // 名称是由 BaseSearchForm.vue 组件固定的
},
urls: {
base: "/pms/equipmentType",
page: "/pms/equipmentType/page",
// subase: '/pms/blenderStepParam',
// subpage: '/pms/blenderStepParam/page',
// more...
},
};
}

32
src/views/modules/pms/equipmentType/index.vue Normal file
View File

@ -0,0 +1,32 @@
<template>
<ListViewWithHead :table-config="tableConfig" :head-config="headFormConfigs" :dialog-configs="dialogConfigs" />
</template>
<script>
import initConfig from './config';
import ListViewWithHead from '@/views/atomViews/ListViewWithHead.vue';
export default {
name: 'ProductionLineView',
components: { ListViewWithHead },
provide() {
return {
urls: this.allUrls
}
},
data() {
const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
return {
tableConfig,
headFormConfigs,
allUrls: urls,
dialogConfigs,
};
},
created() {},
mounted() {},
methods: {},
};
</script>
<style scoped></style>

118
src/views/modules/pms/materialStorage/config.js Normal file
View File

@ -0,0 +1,118 @@
import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent";
import StatusComponent from "@/components/noTemplateComponents/statusComponent";
import request from "@/utils/request";
import { dictFind } from '@/utils/filters'
export default function () {
const tableProps = [
{ prop: "name", label: "料仓名称" },
{ prop: "code", label: "料仓编码" },
{ prop: "typeDictValue", label: "料仓类型", filter: dictFind('料仓') },
{ prop: "status", label: "产线状态", subcomponent: StatusComponent }, // subcomponent
{ prop: "description", label: "描述" },
{ prop: "remark", label: "备注" },
{
prop: "operations",
name: "操作",
fixed: "right",
width: 120,
subcomponent: TableOperaionComponent,
options: ["edit", { name: "delete", permission: "pms:materialStorage:delete" }],
},
];
const headFormFields = [
{
prop: 'name',
label: "料仓名称",
input: true,
default: { value: "" },
bind: {
// placeholder: '请输入产线名称或编码'
placeholder: '请输入料仓名称'
}
},
{
button: {
type: "primary",
name: "查询",
},
},
{
button: {
type: "primary",
name: "新增",
permission: "pms:materialStorage:save"
},
bind: {
plain: true,
}
},
];
/**
* dialog config 有两个版本，一个适用于 DialogWithMenu 组件，另一个适用于 DialogJustForm 组件
* 适用于 DialogWithMenu 组件的配置示例详见 blenderStep/config.js
* 此为后者的配置:
*/
const dialogJustFormConfigs = {
form: {
rows: [
[
{
input: true,
label: "料仓名称",
prop: "name",
rules: { required: true, message: "not empty", trigger: "blur" },
elparams: { placeholder: "请输入料仓名称" },
},
{
input: true,
label: "料仓编码",
prop: "code",
rules: { required: true, message: "not empty", trigger: "blur" },
elparams: { placeholder: "请输入料仓编码" },
}, {
select: true,
label: "料仓类型",
prop: "typeDictValue",
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
options: [
{ label: '中间仓', value: 0 },
{ label: '日料仓', value: 1 },
],
rules: { required: true, message: "not empty", trigger: "change" },
},
],
[{ textarea: true, label: "描述信息", prop: "description", elparams: { placeholder: "描述信息" } }],
[{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
],
operations: [
{ name: "add", label: "保存", type: "primary", permission: "pms:materialStorage:save", showOnEdit: false },
{ name: "update", label: "更新", type: "primary", permission: "pms:materialStorage:update", showOnEdit: true },
{ name: "reset", label: "重置", type: "warning", showAlways: true },
// { name: 'cancel', label: '取消', showAlways: true },
],
},
};
// 备注：弹窗弹出的时间和网速有关......
return {
dialogConfigs: dialogJustFormConfigs,
tableConfig: {
table: null, // 此处可省略，el-table 上的配置项
column: tableProps, // el-column-item 上的配置项
},
headFormConfigs: {
rules: null, // 名称是由 BaseSearchForm.vue 组件固定的
fields: headFormFields, // 名称是由 BaseSearchForm.vue 组件固定的
},
urls: {
base: "/pms/materialStorage",
page: "/pms/materialStorage/page",
// subase: '/pms/blenderStepParam',
// subpage: '/pms/blenderStepParam/page',
// more...
},
};
}

32
src/views/modules/pms/materialStorage/index.vue Normal file
View File

@ -0,0 +1,32 @@
<template>
<ListViewWithHead :table-config="tableConfig" :head-config="headFormConfigs" :dialog-configs="dialogConfigs" :listQueryExtra="['name']" />
</template>
<script>
import initConfig from './config';
import ListViewWithHead from '@/views/atomViews/ListViewWithHead.vue';
export default {
name: 'ProductionLineView',
components: { ListViewWithHead },
provide() {
return {
urls: this.allUrls
}
},
data() {
const { tableConfig, headFormConfigs, urls, dialogConfigs } = initConfig.call(this);
return {
tableConfig,
headFormConfigs,
allUrls: urls,
dialogConfigs,
};
},
created() {},
mounted() {},
methods: {},
};
</script>
<style scoped></style>

2
src/views/modules/sys/dept-add-or-update.vue
View File

@ -133,7 +133,7 @@ export default {
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.$emit('successSubmit')
}
})
}).catch(() => {})

1
src/views/modules/sys/dict-data.vue
View File

@ -77,6 +77,7 @@ export default {
mixins: [basicPage],
data() {
return {
isDictValuePage: true,
urlOptions: {
getDataListURL: "/sys/dict/data/page",
deleteURL: "/sys/dict/data",

2
src/views/modules/sys/dict-type-add-or-update.vue
View File

@ -90,7 +90,7 @@ export default {
duration: 500,
onClose: () => {
this.visible = false
this.$emit('refreshDataList')
this.$emit('successSubmit')
}
})
}).catch(() => {})

44
src/views/modules/sys/dict-type.vue
View File

@ -2,33 +2,16 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__user">
<search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
<base-table
:table-props="tableProps"
:page="listQuery.page"
:limit="listQuery.limit"
:table-data="tableData"
>
<method-btn
v-if="tableBtn.length"
slot="handleBtn"
:width="100"
label="操作"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
<base-table :table-props="tableProps" :page="listQuery.page" :limit="listQuery.limit" :table-data="tableData">
<method-btn v-if="tableBtn.length" slot="handleBtn" :width="100" label="操作" :method-list="tableBtn" @clickBtn="handleClick" />
</base-table>
<pagination
:limit.sync="listQuery.limit"
:page.sync="listQuery.page"
:total="listQuery.total"
@pagination="getDataList"
/>
<pagination :limit.sync="listQuery.limit" :page.sync="listQuery.page" :total="listQuery.total" @pagination="getDataList" />
<!-- 弹窗, 新增 / 修改 -->
<base-dialog
:dialogTitle="addOrEditTitle"
:dialogVisible="addOrUpdateVisible"
@cancel="handleCancel"
@confirm="handleConfirm"
@confirm="handleConfirmEx"
:before-close="handleCancel"
>
<add-or-update ref="addOrUpdate" @successSubmit="successSubmit"></add-or-update>
@ -39,8 +22,8 @@
<script>
import basicPage from "@/mixins/basic-page";
import AddOrUpdate from './dict-type-add-or-update'
import toDictType from './dict-type-to'
import AddOrUpdate from "./dict-type-add-or-update";
import toDictType from "./dict-type-to";
import i18n from "@/i18n";
const tableProps = [
{
@ -50,7 +33,7 @@ const tableProps = [
{
prop: "dictType",
label: i18n.t("dict.dictType"),
subcomponent: toDictType
subcomponent: toDictType,
},
{
prop: "sort",
@ -79,6 +62,7 @@ export default {
mixins: [basicPage],
data() {
return {
isDictTypePage: true,
urlOptions: {
getDataListURL: "/sys/dict/type/page",
deleteURL: "/sys/dict/type",
@ -128,14 +112,18 @@ export default {
this.getDataList();
break;
case "add":
this.addOrEditTitle = '新增'
this.addOrEditTitle = "新增";
this.addOrUpdateVisible = true;
this.addOrUpdateHandle()
this.addOrUpdateHandle();
break;
default:
console.log(val)
console.log(val);
}
},
}
handleConfirmEx() {
this.handleConfirm();
},
},
};
</script>

72
src/views/pages/login.vue
View File

@ -11,32 +11,15 @@
<div class="login-background-container">
<div class="back-title">
Wel<span>come</span>
<p>
<span class="back-title-point" />奥镁耐火砖
</p>
<p><span class="back-title-point" />奥镁耐火砖</p>
</div>
<img
:src="require('../../assets/img/login.gif')"
style="width: 90%; margin-left: 5%"
alt=""
/>
<img :src="require('../../assets/img/login.gif')" style="width: 90%; margin-left: 5%" alt="" />
</div>
</div>
<el-form
ref="dataForm"
:model="dataForm"
:rules="dataRule"
class="login-form"
autocomplete="on"
label-position="left"
>
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" class="login-form" autocomplete="on" label-position="left">
<div class="title-container">
<h3 class="title" :title="'标题'">
<img
src="../../assets/img/cnbm.png"
style="width: 1em; height: 1em; position: relative; top: .15em; margin-right: 12px"
alt=""
/>
<img src="../../assets/img/cnbm.png" style="width: 1em; height: 1em; position: relative; top: 0.15em; margin-right: 12px" alt="" />
<!-- {{ "title" | i18nFilter }} -->
奥镁耐火砖PMS
</h3>
@ -54,12 +37,7 @@
/>
</el-form-item>
<el-tooltip
v-model="capsTooltip"
content="Caps lock is On"
placement="right"
manual
>
<el-tooltip v-model="capsTooltip" content="Caps lock is On" placement="right" manual>
<el-form-item prop="password" style="margin: 8px 8.3%">
<el-input
:key="passwordType"
@ -82,31 +60,31 @@
</el-form-item>
</el-tooltip>
<el-form-item prop="captcha" style="margin: 0px 8.3%">
<!-- <el-form-item prop="captcha" style="margin: 0px 8.3%">
<el-row :gutter="20">
<el-col :span="14">
<el-input
v-model="dataForm.captcha"
:placeholder="$t('login.captcha')"
>
<!-- <span slot="prefix" class="el-input__icon">
<svg class="icon-svg" aria-hidden="true">
<use xlink:href="#icon-safetycertificate"></use>
</svg>
</span> -->
</el-input>
</el-col>
<el-col :span="10" class="login-captcha">
<img :src="captchaPath" @click="getCaptcha()" />
</el-col>
</el-row>
</el-form-item>
</el-form-item> -->
<!-- <span slot="prefix" class="el-input__icon">
<svg class="icon-svg" aria-hidden="true">
<use xlink:href="#icon-safetycertificate"></use>
</svg>
</span> -->
<!-- <lang-select class="login-language" /> -->
<el-button
:loading="loading"
type="primary"
style="width: 83.4%; height: 6vh; background-color: #0B58FF; margin: 0px 8.3%; margin-top: 5vh"
style="width: 83.4%; height: 6vh; background-color: #0b58ff; margin: 0px 8.3%; margin-top: 5vh"
@click.native.prevent="dataFormSubmitHandle"
>
<!-- {{ "login.logIn" | i18nFilter }} -->
@ -114,21 +92,11 @@
</el-button>
<el-row class="login-footer">
<el-row class="login-language">
<el-col
:span="2"
:offset="8"
:class="['login-language-box', language === 'zh' ? 'isActive' : '']"
@click.native="changeLanguage('zh')"
>
<el-col :span="2" :offset="8" :class="['login-language-box', language === 'zh' ? 'isActive' : '']" @click.native="changeLanguage('zh')">
中文
</el-col>
<el-col :span="1" :offset="1" style="color: #DCDFE6">|</el-col>
<el-col
:span="2"
:offset="1"
:class="['login-language-box', language === 'en' ? 'isActive' : '']"
@click.native="changeLanguage('en')"
>
<el-col :span="1" :offset="1" style="color: #dcdfe6">|</el-col>
<el-col :span="2" :offset="1" :class="['login-language-box', language === 'en' ? 'isActive' : '']" @click.native="changeLanguage('en')">
English
</el-col>
</el-row>
@ -230,6 +198,14 @@ export default {
return this.$message.error(res.msg);
}
Cookies.set("token", res.data.token);
// 获取数据字典数据
this.$http('/sys/dict/type/all', { limit: 999, page: 1 }).then(({data: res}) => {
// console.log('[dictData] loading...', res)
if (res.code === 0 && res.data) {
localStorage.setItem('dictList', JSON.stringify(res.data))
}
})
// end
this.$router.replace({ name: "home" });
})
.catch(() => {});