更新
This commit is contained in:
parent
3f8f5b5893
commit
297561ff8f
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2022-08-22 14:57:50
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-04-10 13:55:02
|
||||
* @LastEditTime: 2023-06-20 16:49:12
|
||||
* @Description:
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
@ -37,7 +37,7 @@
|
||||
<!-- 开发环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.44:8080/ym-spc';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.1.44:8999/ym-spc';
|
||||
//http://demo.open.renren.io/renren-security-server
|
||||
//http://192.168.1.44:8080/ym-spc
|
||||
</script>
|
||||
@ -45,19 +45,19 @@
|
||||
<!-- 集成测试环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
|
||||
</script>
|
||||
<% } %>
|
||||
<!-- 验收测试环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
|
||||
</script>
|
||||
<% } %>
|
||||
<!-- 生产环境 -->
|
||||
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
|
||||
<script>
|
||||
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin';
|
||||
window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
|
||||
</script>
|
||||
<% } %>
|
||||
</head>
|
||||
|
@ -1,4 +1,4 @@
|
||||
import module from './en'
|
||||
import module from './eng'
|
||||
const t = {}
|
||||
|
||||
t.module = module
|
||||
@ -14,6 +14,8 @@ t.public.operation = 'operation'
|
||||
|
||||
t.add = 'add'
|
||||
t.delete = 'delete'
|
||||
t.edit = 'edit'
|
||||
t.detail = 'detail'
|
||||
t.deleteBatch = 'deleteBatch'
|
||||
t.update = 'update'
|
||||
t.query = 'query'
|
||||
@ -28,6 +30,11 @@ t.createDate = 'createDate'
|
||||
t.keyword = 'keyword:'
|
||||
t.choose = 'choose'
|
||||
|
||||
t.placeholder = {}
|
||||
t.placeholder.name = 'Please enter name'
|
||||
t.placeholder.code = 'Please enter code'
|
||||
t.placeholder.sampleSize = 'Please enter sample size'
|
||||
|
||||
t.prompt = {}
|
||||
t.prompt.title = 'Tips'
|
||||
t.prompt.info = '确定进行[{handle}]操作?'
|
||||
|
@ -1,14 +0,0 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2023-02-28 14:21:52
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-02-28 14:24:19
|
||||
* @Description:
|
||||
*/
|
||||
|
||||
export default {
|
||||
name: 'name',
|
||||
code: 'code',
|
||||
status: 'status',
|
||||
createTime: 'create time',
|
||||
}
|
27
src/i18n/eng/basicData.js
Normal file
27
src/i18n/eng/basicData.js
Normal file
@ -0,0 +1,27 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2023-02-28 14:21:52
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-02-28 14:24:19
|
||||
* @Description:
|
||||
*/
|
||||
|
||||
export default {
|
||||
name: 'name',
|
||||
code: 'code',
|
||||
type: 'type',
|
||||
address: 'address',
|
||||
descs: 'description',
|
||||
status: 'status',
|
||||
site: 'site',
|
||||
machine: 'machine',
|
||||
specs: 'specs',
|
||||
drawing: 'drawing',
|
||||
productType: 'product type',
|
||||
inspectionStandard: 'standard',
|
||||
inspectionStage: 'stage',
|
||||
platformGroup: 'site grouping',
|
||||
measureType: 'measure type',
|
||||
sampleSize: 'sample size',
|
||||
createTime: 'create time',
|
||||
}
|
@ -11,6 +11,8 @@ t.brand.mini = 'spc'
|
||||
|
||||
t.add = '新增'
|
||||
t.delete = '删除'
|
||||
t.edit = '编辑'
|
||||
t.detail = '详情'
|
||||
t.deleteBatch = '删除'
|
||||
t.update = '修改'
|
||||
t.query = '查询'
|
||||
@ -25,6 +27,12 @@ t.createDate = '创建时间'
|
||||
t.keyword = '关键字:'
|
||||
t.choose = '请选择'
|
||||
|
||||
|
||||
t.placeholder = {}
|
||||
t.placeholder.name = '请输入名称'
|
||||
t.placeholder.code = '请输入编码'
|
||||
t.placeholder.sampleSize = '请输入样本大小'
|
||||
|
||||
t.prompt = {}
|
||||
t.prompt.title = '提示'
|
||||
t.prompt.info = '确定进行[{handle}]操作?'
|
||||
|
@ -2,13 +2,26 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2023-02-28 14:21:52
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-02-28 14:24:19
|
||||
* @LastEditTime: 2023-06-21 13:56:25
|
||||
* @Description:
|
||||
*/
|
||||
|
||||
export default {
|
||||
name: '名称',
|
||||
code: '编码',
|
||||
type: '类型',
|
||||
address: '联系地址',
|
||||
descs: '描述',
|
||||
status: '状态',
|
||||
site: '站点',
|
||||
machine: '机台',
|
||||
specs: '规格',
|
||||
drawing: '图纸',
|
||||
productType: '产品类型',
|
||||
inspectionStandard: '检验标准',
|
||||
inspectionStage: '检验阶段',
|
||||
platformGroup: '站点分组',
|
||||
measureType: '测量类型',
|
||||
sampleSize: '样本大小',
|
||||
createTime: '添加时间',
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2022-08-24 11:19:43
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-04-20 10:48:23
|
||||
* @LastEditTime: 2023-06-21 16:28:38
|
||||
* @Description:
|
||||
*/
|
||||
export default {
|
||||
@ -68,7 +68,7 @@ export default {
|
||||
// 新增 / 修改
|
||||
addOrUpdateHandle(id) {
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrEditTitle = "编辑";
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id);
|
||||
});
|
||||
@ -100,7 +100,7 @@ export default {
|
||||
handleClick(val) {
|
||||
if (val.type === "edit") {
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrEditTitle = "编辑";
|
||||
this.addOrEditTitle = this.$t('edit');
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(val.data.id);
|
||||
});
|
||||
@ -147,7 +147,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -13,7 +13,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="200"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -72,7 +72,7 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "pause",
|
||||
@ -88,7 +88,7 @@ const tableBtn = [
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -115,13 +115,13 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -149,7 +149,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -21,7 +21,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -61,11 +61,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -81,7 +81,7 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -66,11 +66,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -98,13 +98,13 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -130,7 +130,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -68,11 +68,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -100,13 +100,13 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -128,7 +128,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -68,7 +68,7 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
},
|
||||
|
@ -76,7 +76,7 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "select",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
selectOptions: [
|
||||
{ id: "0", name: i18n.t("logLogin.status0") },
|
||||
{ id: "1", name: i18n.t("logLogin.status1") },
|
||||
@ -89,7 +89,7 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
@ -108,7 +108,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -84,7 +84,7 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "select",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
selectOptions: [
|
||||
{ id: "0", name: i18n.t("logOperation.status0") },
|
||||
{ id: "1", name: i18n.t("logOperation.status1") },
|
||||
@ -96,7 +96,7 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
@ -114,7 +114,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -21,7 +21,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -75,11 +75,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -95,7 +95,7 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -58,11 +58,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -84,13 +84,13 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -111,7 +111,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -58,11 +58,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -84,13 +84,13 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -111,7 +111,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="100"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -77,11 +77,11 @@ const tableProps = [
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -104,13 +104,13 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -131,7 +131,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-18 14:16:25
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-01-06 14:30:12
|
||||
* @LastEditTime: 2023-06-21 13:31:02
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -143,24 +143,25 @@ export default {
|
||||
// label: "批次号",
|
||||
// },
|
||||
];
|
||||
this.featuresList.forEach((item) => {
|
||||
this.featuresList.forEach((item,index) => {
|
||||
let obj = {
|
||||
prop: item.name,
|
||||
prop: item.name + index,
|
||||
label: item.name,
|
||||
fType: item.type,
|
||||
lsl: item.lsl,
|
||||
usl: item.usl,
|
||||
|
||||
};
|
||||
this.tableProps.push(obj);
|
||||
this.dataList[0][item.name] = this.workingProcedureName
|
||||
this.dataList[0][item.name + index] = this.workingProcedureName
|
||||
? this.workingProcedureName
|
||||
: item.workingProcedureName;
|
||||
this.dataList[1][item.name] = { 1: "计量型", 2: "计数型" }[item.type];
|
||||
this.dataList[2][item.name] = item.lsl;
|
||||
this.dataList[3][item.name] = item.usl;
|
||||
this.dataList[4][item.name] = item.sampleSize;
|
||||
this.dataList[5][item.name] = item.specifications;
|
||||
this.dataList[6][item.name] = item.samplingFrequency;
|
||||
this.dataList[1][item.name + index] = { 1: "计量型", 2: "计数型" }[item.type];
|
||||
this.dataList[2][item.name + index] = item.lsl;
|
||||
this.dataList[3][item.name + index] = item.usl;
|
||||
this.dataList[4][item.name + index] = item.sampleSize;
|
||||
this.dataList[5][item.name + index] = item.specifications;
|
||||
this.dataList[6][item.name + index] = item.samplingFrequency;
|
||||
});
|
||||
this.getInfluxdb();
|
||||
this.dataListLoading = false;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2022-09-15 10:44:29
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-04-20 10:58:45
|
||||
* @LastEditTime: 2023-06-21 16:27:24
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -148,7 +148,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -172,6 +172,7 @@
|
||||
import basicPage from "@/mixins/basic-page";
|
||||
import AddOrUpdate from './components/generalOperation-add'
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
@ -193,7 +194,7 @@ const tableProps = [
|
||||
},
|
||||
{
|
||||
prop: "machineName",
|
||||
label: "机台",
|
||||
label: i18n.t("module.basicData.machine"),
|
||||
},
|
||||
{
|
||||
prop: "workingProcedureName",
|
||||
@ -221,17 +222,17 @@ const tableProps = [
|
||||
},
|
||||
{
|
||||
prop: "remark",
|
||||
label: "备注",
|
||||
label: i18n.t("schedule.remark"),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2021-11-18 14:16:25
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-04-10 15:09:23
|
||||
* @LastEditTime: 2023-06-21 16:26:26
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -13,7 +13,7 @@
|
||||
>
|
||||
<template #title>
|
||||
<slot name="title">
|
||||
<div class="titleStyle">{{ !dataForm.id ? '新增' : '修改' }}</div>
|
||||
<div class="titleStyle">{{ !dataForm.id ? $t('add') : $t('edit') }}</div>
|
||||
</slot>
|
||||
</template>
|
||||
<el-row :gutter="5">
|
||||
|
@ -31,19 +31,20 @@
|
||||
<script>
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from '@/filters/basic-filter'
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "type",
|
||||
label: "类型",
|
||||
label: i18n.t("oss.type"),
|
||||
filter: basicFilter("tType"),
|
||||
},
|
||||
];
|
||||
@ -62,7 +63,7 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "select",
|
||||
label: "类型",
|
||||
label: i18n.t("oss.type"),
|
||||
selectOptions: [
|
||||
{ id: 1, name: "计量" },
|
||||
{ id: 2, name: "计数" },
|
||||
@ -72,7 +73,7 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
@ -91,7 +92,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2022-12-01 14:52:41
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2023-04-10 15:00:17
|
||||
* @LastEditTime: 2023-06-21 16:32:15
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -13,12 +13,12 @@
|
||||
@keyup.enter.native="getDataList()"
|
||||
>
|
||||
<span class="blue-block"></span>
|
||||
<el-form-item label="样本大小:">
|
||||
<el-input size="small" type="number" v-model="dataForm.name" placeholder="请输入样本大小" clearable />
|
||||
<el-form-item :label="$t('sampleSize')">
|
||||
<el-input size="small" type="number" v-model="dataForm.name" :placeholder="$t('placeholder.sampleSize')" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button size="small" type="primary" @click="getDataList()">
|
||||
查询
|
||||
{{$t('query')}}
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -36,25 +36,26 @@
|
||||
<script>
|
||||
import AddOrUpdate from './components/interpretationScheme-add'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
]
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
];
|
||||
export default {
|
||||
@ -72,32 +73,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -119,7 +120,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -110,7 +110,7 @@
|
||||
header-align="center"
|
||||
align="center"
|
||||
width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
|
||||
|
@ -48,7 +48,7 @@
|
||||
<el-table-column prop="sl" align="center" label="SL"></el-table-column>
|
||||
<el-table-column prop="usl" align="center" label="USL"></el-table-column>
|
||||
<el-table-column prop="remark" align="center" label="备注"></el-table-column>
|
||||
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
|
||||
<el-table-column fixed="right" header-align="center" align="center" width="150" :label="$t('handle')">
|
||||
<template slot-scope="scope">
|
||||
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
|
||||
<el-tooltip class="item" effect="dark" content="修改" placement="top">
|
||||
|
@ -35,7 +35,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="workingProcedureName" align="center" label="工序名称"> </el-table-column>
|
||||
<el-table-column prop="workingProcedureCode" align="center" label="工序编码"> </el-table-column>
|
||||
<el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
|
||||
<el-table-column fixed="right" header-align="center" align="center" width="150" :label="$t('handle')">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="text"
|
||||
|
@ -41,7 +41,7 @@
|
||||
header-align="center"
|
||||
align="center"
|
||||
width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -46,7 +46,7 @@ import i18n from "@/i18n";
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: i18n.t("module.basicData.name"),
|
||||
label: i18n.t('module.basicData.name'),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
@ -54,31 +54,31 @@ const tableProps = [
|
||||
},
|
||||
{
|
||||
prop: "type",
|
||||
label: "类型",
|
||||
label: i18n.t("module.basicData.type"),
|
||||
filter: basicFilter("fType"),
|
||||
},
|
||||
{
|
||||
prop: "address",
|
||||
label: "联系地址",
|
||||
label: i18n.t("module.basicData.address"),
|
||||
},
|
||||
{
|
||||
prop: "descs",
|
||||
label: "描述",
|
||||
label: i18n.t("module.basicData.descs"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter("status"),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -102,19 +102,19 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "select",
|
||||
label: "性别",
|
||||
label: i18n.t("oss.type"),
|
||||
selectOptions: [
|
||||
{ id: 1, name: "内部工厂" },
|
||||
{ id: 2, name: "供应商" },
|
||||
@ -124,20 +124,20 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -159,8 +159,8 @@ export default {
|
||||
this.listQuery.page = 1;
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
case "add":
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -38,41 +38,42 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AddOrUpdate from './components/machineManage-add'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from '@/filters/basic-filter'
|
||||
import AddOrUpdate from "./components/machineManage-add";
|
||||
import basicPage from "@/mixins/basic-page";
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "platformName",
|
||||
label: "站点",
|
||||
label: i18n.t("module.basicData.site"),
|
||||
},
|
||||
{
|
||||
prop: "remark",
|
||||
label: "描述",
|
||||
label: i18n.t("module.basicData.descs"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
filter: basicFilter('status'),
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter("status"),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -85,10 +86,10 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
urlOptions: {
|
||||
getDataListURL: '/basic/machine/page',
|
||||
deleteURL: '/basic/machine',
|
||||
statusUrl: '/basic/machine/status',
|
||||
exportUrl: '/basic/machine/export'
|
||||
getDataListURL: "/basic/machine/page",
|
||||
deleteURL: "/basic/machine",
|
||||
statusUrl: "/basic/machine/status",
|
||||
exportUrl: "/basic/machine/export",
|
||||
},
|
||||
tableProps,
|
||||
tableBtn,
|
||||
@ -96,32 +97,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -143,17 +144,17 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t("add");
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
this.addOrUpdateHandle();
|
||||
break;
|
||||
case "export":
|
||||
this.exportHandle('机台管理')
|
||||
this.exportHandle("机台管理");
|
||||
break;
|
||||
default:
|
||||
console.log(val)
|
||||
}
|
||||
console.log(val);
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
</script>
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="220"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -47,38 +47,39 @@ import AddOrUpdate from './components/processDefine-add'
|
||||
import BindMachine from './components/processDefine-machine'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "workingProcedureTypeName",
|
||||
label: "类型",
|
||||
label: i18n.t("oss.type"),
|
||||
},
|
||||
{
|
||||
prop: "machineName",
|
||||
label: "机台",
|
||||
label: i18n.t("module.basicData.machine"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter("status"),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -107,32 +108,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -155,7 +156,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -41,30 +41,31 @@
|
||||
import AddOrUpdate from './components/processType-add'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter('status'),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -88,32 +89,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -135,7 +136,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -24,73 +24,74 @@
|
||||
@pagination="getDataList"
|
||||
/>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
<add-or-update
|
||||
v-if="addOrUpdateVisible"
|
||||
ref="addOrUpdate"
|
||||
@successSubmit="getDataList"
|
||||
></add-or-update>
|
||||
<add-or-update
|
||||
v-if="addOrUpdateVisible"
|
||||
ref="addOrUpdate"
|
||||
@successSubmit="getDataList"
|
||||
></add-or-update>
|
||||
</div>
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import AddOrUpdate from "./components/productList-add";
|
||||
import inspectionStage from "./inspectionStage"
|
||||
import inspectionStage from "./inspectionStage";
|
||||
import basicPage from "@/mixins/basic-page";
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "specifications",
|
||||
label: "规格",
|
||||
label: i18n.t("module.basicData.specs"),
|
||||
},
|
||||
{
|
||||
prop: "drawing",
|
||||
label: "图纸",
|
||||
label: i18n.t("module.basicData.drawing"),
|
||||
},
|
||||
{
|
||||
prop: "productType",
|
||||
label: "产品类型",
|
||||
label: i18n.t("module.basicData.productType"),
|
||||
},
|
||||
{
|
||||
prop: "remark",
|
||||
label: "备注",
|
||||
label: i18n.t("schedule.remark"),
|
||||
},
|
||||
{
|
||||
prop: "descs",
|
||||
label: "描述",
|
||||
label: i18n.t("module.basicData.descs"),
|
||||
},
|
||||
{
|
||||
prop: "inspectionStandard",
|
||||
label: "检验标准",
|
||||
label: i18n.t("module.basicData.inspectionStandard"),
|
||||
},
|
||||
{
|
||||
prop: "inspectionStage",
|
||||
label: "检验阶段",
|
||||
subcomponent: inspectionStage
|
||||
label: i18n.t("module.basicData.inspectionStage"),
|
||||
subcomponent: inspectionStage,
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter("status"),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -114,27 +115,26 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "select",
|
||||
label: "产品类型",
|
||||
selectOptions: [
|
||||
],
|
||||
label: i18n.t("module.basicData.productType"),
|
||||
selectOptions: [],
|
||||
param: "product_type_id",
|
||||
defaultSelect: "",
|
||||
},
|
||||
{
|
||||
type: "select",
|
||||
label: "检验阶段",
|
||||
label: i18n.t("module.basicData.inspectionStage"),
|
||||
selectOptions: [
|
||||
{ id: 1, name: "进货检验" },
|
||||
{ id: 2, name: "过程检验" },
|
||||
@ -146,20 +146,20 @@ export default {
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -186,16 +186,16 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t("add");
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
this.addOrUpdateHandle();
|
||||
break;
|
||||
case "export":
|
||||
this.exportHandle('产品列表')
|
||||
this.exportHandle("产品列表");
|
||||
break;
|
||||
default:
|
||||
console.log(val)
|
||||
}
|
||||
console.log(val);
|
||||
}
|
||||
},
|
||||
getArr() {
|
||||
this.$http
|
||||
|
@ -19,7 +19,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -48,30 +48,31 @@
|
||||
import AddOrUpdate from './components/productType-add'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from '@/filters/basic-filter'
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter('status'),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -95,32 +96,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -142,7 +143,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -42,34 +42,35 @@
|
||||
import AddOrUpdate from './components/siteManage-add'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "platformGroup",
|
||||
label: "站点分组",
|
||||
label: i18n.t("module.basicData.platformGroup"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter('status'),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -93,32 +94,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -140,7 +141,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="180"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -42,39 +42,39 @@ import AddOrUpdate from "./components/toolsType-add";
|
||||
import Detail from "./components/toolsType-detail";
|
||||
import basicPage from "@/mixins/basic-page";
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "type",
|
||||
label: "测量类型",
|
||||
filter: basicFilter("tType"),
|
||||
label: i18n.t("module.basicData.measureType"),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter("status"),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "detail",
|
||||
btnName: "详情",
|
||||
btnName: i18n.t("detail"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -98,32 +98,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
|
@ -12,7 +12,7 @@
|
||||
v-if="tableBtn.length"
|
||||
slot="handleBtn"
|
||||
:width="150"
|
||||
label="操作"
|
||||
:label="$t('handle')"
|
||||
:method-list="tableBtn"
|
||||
@clickBtn="handleClick"
|
||||
/>
|
||||
@ -41,35 +41,36 @@
|
||||
import AddOrUpdate from './components/unitList-add'
|
||||
import basicPage from '@/mixins/basic-page'
|
||||
import basicFilter from "@/filters/basic-filter";
|
||||
import i18n from "@/i18n";
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: "name",
|
||||
label: "名称",
|
||||
label: i18n.t("role.name"),
|
||||
},
|
||||
{
|
||||
prop: "code",
|
||||
label: "编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
},
|
||||
{
|
||||
prop: "type",
|
||||
label: "类型",
|
||||
label: i18n.t("oss.type"),
|
||||
filter: basicFilter('uType'),
|
||||
},
|
||||
{
|
||||
prop: "status",
|
||||
label: "状态",
|
||||
label: i18n.t("module.basicData.status"),
|
||||
filter: basicFilter('status'),
|
||||
},
|
||||
];
|
||||
const tableBtn = [
|
||||
{
|
||||
type: "edit",
|
||||
btnName: "编辑",
|
||||
btnName: i18n.t("edit"),
|
||||
},
|
||||
{
|
||||
type: "delete",
|
||||
btnName: "删除",
|
||||
btnName: i18n.t("delete"),
|
||||
},
|
||||
{
|
||||
type: "change",
|
||||
@ -93,32 +94,32 @@ export default {
|
||||
formConfig: [
|
||||
{
|
||||
type: "input",
|
||||
label: "名称",
|
||||
placeholder: "请输入名称",
|
||||
label: i18n.t("role.name"),
|
||||
placeholder: i18n.t("placeholder.name"),
|
||||
param: "name",
|
||||
},
|
||||
{
|
||||
type: "input",
|
||||
label: "编码",
|
||||
placeholder: "请输入编码",
|
||||
label: i18n.t("params.paramCode"),
|
||||
placeholder: i18n.t("placeholder.code"),
|
||||
param: "code",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "查询",
|
||||
btnName: i18n.t("query"),
|
||||
name: "search",
|
||||
color: "primary",
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "新增",
|
||||
btnName: i18n.t("add"),
|
||||
name: "add",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
},
|
||||
{
|
||||
type: "button",
|
||||
btnName: "导出",
|
||||
btnName: i18n.t("export"),
|
||||
name: "export",
|
||||
color: "primary",
|
||||
plain: true,
|
||||
@ -140,7 +141,7 @@ export default {
|
||||
this.getDataList();
|
||||
break;
|
||||
case "add":
|
||||
this.addOrEditTitle = '新增'
|
||||
this.addOrEditTitle = this.$t('add');
|
||||
this.addOrUpdateVisible = true;
|
||||
this.addOrUpdateHandle()
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user