This commit is contained in:
朱文强 2023-06-21 16:41:40 +08:00
parent 3f8f5b5893
commit 297561ff8f
38 changed files with 345 additions and 294 deletions

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-08-22 14:57:50 * @Date: 2022-08-22 14:57:50
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-04-10 13:55:02 * @LastEditTime: 2023-06-20 16:49:12
* @Description: * @Description:
--> -->
<!DOCTYPE html> <!DOCTYPE html>
@ -37,7 +37,7 @@
<!-- 开发环境 --> <!-- 开发环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
<script> <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://demo.open.renren.io/renren-security-server
//http://192.168.1.44:8080/ym-spc //http://192.168.1.44:8080/ym-spc
</script> </script>
@ -45,19 +45,19 @@
<!-- 集成测试环境 --> <!-- 集成测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
</script> </script>
<% } %> <% } %>
<!-- 验收测试环境 --> <!-- 验收测试环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
</script> </script>
<% } %> <% } %>
<!-- 生产环境 --> <!-- 生产环境 -->
<% if (process.env.VUE_APP_NODE_ENV === 'prod') { %> <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
<script> <script>
window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/renren-admin'; window.SITE_CONFIG['apiURL'] = 'http://192.168.0.102:8999/ym-spc';
</script> </script>
<% } %> <% } %>
</head> </head>

View File

@ -1,4 +1,4 @@
import module from './en' import module from './eng'
const t = {} const t = {}
t.module = module t.module = module
@ -14,6 +14,8 @@ t.public.operation = 'operation'
t.add = 'add' t.add = 'add'
t.delete = 'delete' t.delete = 'delete'
t.edit = 'edit'
t.detail = 'detail'
t.deleteBatch = 'deleteBatch' t.deleteBatch = 'deleteBatch'
t.update = 'update' t.update = 'update'
t.query = 'query' t.query = 'query'
@ -28,6 +30,11 @@ t.createDate = 'createDate'
t.keyword = 'keyword:' t.keyword = 'keyword:'
t.choose = 'choose' 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 = {}
t.prompt.title = 'Tips' t.prompt.title = 'Tips'
t.prompt.info = '确定进行[{handle}]操作?' t.prompt.info = '确定进行[{handle}]操作?'

View File

@ -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
View 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',
}

View File

@ -11,6 +11,8 @@ t.brand.mini = 'spc'
t.add = '新增' t.add = '新增'
t.delete = '删除' t.delete = '删除'
t.edit = '编辑'
t.detail = '详情'
t.deleteBatch = '删除' t.deleteBatch = '删除'
t.update = '修改' t.update = '修改'
t.query = '查询' t.query = '查询'
@ -25,6 +27,12 @@ t.createDate = '创建时间'
t.keyword = '关键字:' t.keyword = '关键字:'
t.choose = '请选择' t.choose = '请选择'
t.placeholder = {}
t.placeholder.name = '请输入名称'
t.placeholder.code = '请输入编码'
t.placeholder.sampleSize = '请输入样本大小'
t.prompt = {} t.prompt = {}
t.prompt.title = '提示' t.prompt.title = '提示'
t.prompt.info = '确定进行[{handle}]操作?' t.prompt.info = '确定进行[{handle}]操作?'

View File

@ -2,13 +2,26 @@
* @Author: zwq * @Author: zwq
* @Date: 2023-02-28 14:21:52 * @Date: 2023-02-28 14:21:52
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-02-28 14:24:19 * @LastEditTime: 2023-06-21 13:56:25
* @Description: * @Description:
*/ */
export default { export default {
name: '名称', name: '名称',
code: '编码', code: '编码',
type: '类型',
address: '联系地址',
descs: '描述',
status: '状态', status: '状态',
site: '站点',
machine: '机台',
specs: '规格',
drawing: '图纸',
productType: '产品类型',
inspectionStandard: '检验标准',
inspectionStage: '检验阶段',
platformGroup: '站点分组',
measureType: '测量类型',
sampleSize: '样本大小',
createTime: '添加时间', createTime: '添加时间',
} }

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-08-24 11:19:43 * @Date: 2022-08-24 11:19:43
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-04-20 10:48:23 * @LastEditTime: 2023-06-21 16:28:38
* @Description: * @Description:
*/ */
export default { export default {
@ -68,7 +68,7 @@ export default {
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle(id) { addOrUpdateHandle(id) {
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrEditTitle = "编辑"; this.addOrEditTitle = this.$t('add');
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init(id); this.$refs.addOrUpdate.init(id);
}); });
@ -100,7 +100,7 @@ export default {
handleClick(val) { handleClick(val) {
if (val.type === "edit") { if (val.type === "edit") {
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrEditTitle = "编辑"; this.addOrEditTitle = this.$t('edit');
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.addOrUpdate.init(val.data.id); this.$refs.addOrUpdate.init(val.data.id);
}); });
@ -147,7 +147,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -13,7 +13,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="200" :width="200"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -72,7 +72,7 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "pause", type: "pause",
@ -88,7 +88,7 @@ const tableBtn = [
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -115,13 +115,13 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
@ -149,7 +149,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -21,7 +21,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -61,11 +61,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -81,7 +81,7 @@ export default {
formConfig: [ formConfig: [
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -66,11 +66,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -98,13 +98,13 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
@ -130,7 +130,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -68,11 +68,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -100,13 +100,13 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
@ -128,7 +128,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -68,7 +68,7 @@ export default {
formConfig: [ formConfig: [
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
}, },

View File

@ -76,7 +76,7 @@ export default {
}, },
{ {
type: "select", type: "select",
label: "状态", label: i18n.t("module.basicData.status"),
selectOptions: [ selectOptions: [
{ id: "0", name: i18n.t("logLogin.status0") }, { id: "0", name: i18n.t("logLogin.status0") },
{ id: "1", name: i18n.t("logLogin.status1") }, { id: "1", name: i18n.t("logLogin.status1") },
@ -89,7 +89,7 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
@ -108,7 +108,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -84,7 +84,7 @@ export default {
formConfig: [ formConfig: [
{ {
type: "select", type: "select",
label: "状态", label: i18n.t("module.basicData.status"),
selectOptions: [ selectOptions: [
{ id: "0", name: i18n.t("logOperation.status0") }, { id: "0", name: i18n.t("logOperation.status0") },
{ id: "1", name: i18n.t("logOperation.status1") }, { id: "1", name: i18n.t("logOperation.status1") },
@ -96,7 +96,7 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
@ -114,7 +114,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -21,7 +21,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -75,11 +75,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -95,7 +95,7 @@ export default {
formConfig: [ formConfig: [
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -58,11 +58,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -84,13 +84,13 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
@ -111,7 +111,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -58,11 +58,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -84,13 +84,13 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
@ -111,7 +111,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="100" :width="100"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -77,11 +77,11 @@ const tableProps = [
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -104,13 +104,13 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
@ -131,7 +131,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-01-06 14:30:12 * @LastEditTime: 2023-06-21 13:31:02
* @Description: * @Description:
--> -->
<template> <template>
@ -143,24 +143,25 @@ export default {
// label: "", // label: "",
// }, // },
]; ];
this.featuresList.forEach((item) => { this.featuresList.forEach((item,index) => {
let obj = { let obj = {
prop: item.name, prop: item.name + index,
label: item.name, label: item.name,
fType: item.type, fType: item.type,
lsl: item.lsl, lsl: item.lsl,
usl: item.usl, usl: item.usl,
}; };
this.tableProps.push(obj); this.tableProps.push(obj);
this.dataList[0][item.name] = this.workingProcedureName this.dataList[0][item.name + index] = this.workingProcedureName
? this.workingProcedureName ? this.workingProcedureName
: item.workingProcedureName; : item.workingProcedureName;
this.dataList[1][item.name] = { 1: "计量型", 2: "计数型" }[item.type]; this.dataList[1][item.name + index] = { 1: "计量型", 2: "计数型" }[item.type];
this.dataList[2][item.name] = item.lsl; this.dataList[2][item.name + index] = item.lsl;
this.dataList[3][item.name] = item.usl; this.dataList[3][item.name + index] = item.usl;
this.dataList[4][item.name] = item.sampleSize; this.dataList[4][item.name + index] = item.sampleSize;
this.dataList[5][item.name] = item.specifications; this.dataList[5][item.name + index] = item.specifications;
this.dataList[6][item.name] = item.samplingFrequency; this.dataList[6][item.name + index] = item.samplingFrequency;
}); });
this.getInfluxdb(); this.getInfluxdb();
this.dataListLoading = false; this.dataListLoading = false;

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-09-15 10:44:29 * @Date: 2022-09-15 10:44:29
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-04-20 10:58:45 * @LastEditTime: 2023-06-21 16:27:24
* @Description: * @Description:
--> -->
<template> <template>
@ -148,7 +148,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -172,6 +172,7 @@
import basicPage from "@/mixins/basic-page"; import basicPage from "@/mixins/basic-page";
import AddOrUpdate from './components/generalOperation-add' import AddOrUpdate from './components/generalOperation-add'
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
@ -193,7 +194,7 @@ const tableProps = [
}, },
{ {
prop: "machineName", prop: "machineName",
label: "机台", label: i18n.t("module.basicData.machine"),
}, },
{ {
prop: "workingProcedureName", prop: "workingProcedureName",
@ -221,17 +222,17 @@ const tableProps = [
}, },
{ {
prop: "remark", prop: "remark",
label: "备注", label: i18n.t("schedule.remark"),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2021-11-18 14:16:25 * @Date: 2021-11-18 14:16:25
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-04-10 15:09:23 * @LastEditTime: 2023-06-21 16:26:26
* @Description: * @Description:
--> -->
<template> <template>
@ -13,7 +13,7 @@
> >
<template #title> <template #title>
<slot name="title"> <slot name="title">
<div class="titleStyle">{{ !dataForm.id ? '新增' : '修改' }}</div> <div class="titleStyle">{{ !dataForm.id ? $t('add') : $t('edit') }}</div>
</slot> </slot>
</template> </template>
<el-row :gutter="5"> <el-row :gutter="5">

View File

@ -31,19 +31,20 @@
<script> <script>
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import basicFilter from '@/filters/basic-filter' import basicFilter from '@/filters/basic-filter'
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "type", prop: "type",
label: "类型", label: i18n.t("oss.type"),
filter: basicFilter("tType"), filter: basicFilter("tType"),
}, },
]; ];
@ -62,7 +63,7 @@ export default {
formConfig: [ formConfig: [
{ {
type: "select", type: "select",
label: "类型", label: i18n.t("oss.type"),
selectOptions: [ selectOptions: [
{ id: 1, name: "计量" }, { id: 1, name: "计量" },
{ id: 2, name: "计数" }, { id: 2, name: "计数" },
@ -72,7 +73,7 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
@ -91,7 +92,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2022-12-01 14:52:41 * @Date: 2022-12-01 14:52:41
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2023-04-10 15:00:17 * @LastEditTime: 2023-06-21 16:32:15
* @Description: * @Description:
--> -->
<template> <template>
@ -13,12 +13,12 @@
@keyup.enter.native="getDataList()" @keyup.enter.native="getDataList()"
> >
<span class="blue-block"></span> <span class="blue-block"></span>
<el-form-item label="样本大小:"> <el-form-item :label="$t('sampleSize')">
<el-input size="small" type="number" v-model="dataForm.name" placeholder="请输入样本大小" clearable /> <el-input size="small" type="number" v-model="dataForm.name" :placeholder="$t('placeholder.sampleSize')" clearable />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button size="small" type="primary" @click="getDataList()"> <el-button size="small" type="primary" @click="getDataList()">
查询 {{$t('query')}}
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -36,25 +36,26 @@
<script> <script>
import AddOrUpdate from './components/interpretationScheme-add' import AddOrUpdate from './components/interpretationScheme-add'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
] ]
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
]; ];
export default { export default {
@ -72,32 +73,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -119,7 +120,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -110,7 +110,7 @@
header-align="center" header-align="center"
align="center" align="center"
width="150" width="150"
label="操作" :label="$t('handle')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">

View File

@ -48,7 +48,7 @@
<el-table-column prop="sl" align="center" label="SL"></el-table-column> <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="usl" align="center" label="USL"></el-table-column>
<el-table-column prop="remark" align="center" label="备注"></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"> <template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)"> <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">

View File

@ -35,7 +35,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="workingProcedureName" align="center" label="工序名称"> </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 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"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"

View File

@ -41,7 +41,7 @@
header-align="center" header-align="center"
align="center" align="center"
width="150" width="150"
label="操作" :label="$t('handle')"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -46,7 +46,7 @@ import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: i18n.t("module.basicData.name"), label: i18n.t('module.basicData.name'),
}, },
{ {
prop: "code", prop: "code",
@ -54,31 +54,31 @@ const tableProps = [
}, },
{ {
prop: "type", prop: "type",
label: "类型", label: i18n.t("module.basicData.type"),
filter: basicFilter("fType"), filter: basicFilter("fType"),
}, },
{ {
prop: "address", prop: "address",
label: "联系地址", label: i18n.t("module.basicData.address"),
}, },
{ {
prop: "descs", prop: "descs",
label: "描述", label: i18n.t("module.basicData.descs"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter("status"), filter: basicFilter("status"),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -102,19 +102,19 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "select", type: "select",
label: "性别", label: i18n.t("oss.type"),
selectOptions: [ selectOptions: [
{ id: 1, name: "内部工厂" }, { id: 1, name: "内部工厂" },
{ id: 2, name: "供应商" }, { id: 2, name: "供应商" },
@ -124,20 +124,20 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -159,8 +159,8 @@ export default {
this.listQuery.page = 1; this.listQuery.page = 1;
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -38,41 +38,42 @@
</template> </template>
<script> <script>
import AddOrUpdate from './components/machineManage-add' import AddOrUpdate from "./components/machineManage-add";
import basicPage from '@/mixins/basic-page' import basicPage from "@/mixins/basic-page";
import basicFilter from '@/filters/basic-filter' import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "platformName", prop: "platformName",
label: "站点", label: i18n.t("module.basicData.site"),
}, },
{ {
prop: "remark", prop: "remark",
label: "描述", label: i18n.t("module.basicData.descs"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter('status'), filter: basicFilter("status"),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -85,10 +86,10 @@ export default {
data() { data() {
return { return {
urlOptions: { urlOptions: {
getDataListURL: '/basic/machine/page', getDataListURL: "/basic/machine/page",
deleteURL: '/basic/machine', deleteURL: "/basic/machine",
statusUrl: '/basic/machine/status', statusUrl: "/basic/machine/status",
exportUrl: '/basic/machine/export' exportUrl: "/basic/machine/export",
}, },
tableProps, tableProps,
tableBtn, tableBtn,
@ -96,32 +97,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -143,17 +144,17 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t("add");
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle();
break; break;
case "export": case "export":
this.exportHandle('机台管理') this.exportHandle("机台管理");
break; break;
default: default:
console.log(val) console.log(val);
} }
}, },
}, },
}; };
</script> </script>

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="220" :width="220"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -47,38 +47,39 @@ import AddOrUpdate from './components/processDefine-add'
import BindMachine from './components/processDefine-machine' import BindMachine from './components/processDefine-machine'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "workingProcedureTypeName", prop: "workingProcedureTypeName",
label: "类型", label: i18n.t("oss.type"),
}, },
{ {
prop: "machineName", prop: "machineName",
label: "机台", label: i18n.t("module.basicData.machine"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter("status"), filter: basicFilter("status"),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -107,32 +108,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -155,7 +156,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -41,30 +41,31 @@
import AddOrUpdate from './components/processType-add' import AddOrUpdate from './components/processType-add'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter('status'), filter: basicFilter('status'),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -88,32 +89,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -135,7 +136,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -24,73 +24,74 @@
@pagination="getDataList" @pagination="getDataList"
/> />
<!-- 弹窗, 新增 / 修改 --> <!-- 弹窗, 新增 / 修改 -->
<add-or-update <add-or-update
v-if="addOrUpdateVisible" v-if="addOrUpdateVisible"
ref="addOrUpdate" ref="addOrUpdate"
@successSubmit="getDataList" @successSubmit="getDataList"
></add-or-update> ></add-or-update>
</div> </div>
</el-card> </el-card>
</template> </template>
<script> <script>
import AddOrUpdate from "./components/productList-add"; import AddOrUpdate from "./components/productList-add";
import inspectionStage from "./inspectionStage" import inspectionStage from "./inspectionStage";
import basicPage from "@/mixins/basic-page"; import basicPage from "@/mixins/basic-page";
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "specifications", prop: "specifications",
label: "规格", label: i18n.t("module.basicData.specs"),
}, },
{ {
prop: "drawing", prop: "drawing",
label: "图纸", label: i18n.t("module.basicData.drawing"),
}, },
{ {
prop: "productType", prop: "productType",
label: "产品类型", label: i18n.t("module.basicData.productType"),
}, },
{ {
prop: "remark", prop: "remark",
label: "备注", label: i18n.t("schedule.remark"),
}, },
{ {
prop: "descs", prop: "descs",
label: "描述", label: i18n.t("module.basicData.descs"),
}, },
{ {
prop: "inspectionStandard", prop: "inspectionStandard",
label: "检验标准", label: i18n.t("module.basicData.inspectionStandard"),
}, },
{ {
prop: "inspectionStage", prop: "inspectionStage",
label: "检验阶段", label: i18n.t("module.basicData.inspectionStage"),
subcomponent: inspectionStage subcomponent: inspectionStage,
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter("status"), filter: basicFilter("status"),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -114,27 +115,26 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "select", type: "select",
label: "产品类型", label: i18n.t("module.basicData.productType"),
selectOptions: [ selectOptions: [],
],
param: "product_type_id", param: "product_type_id",
defaultSelect: "", defaultSelect: "",
}, },
{ {
type: "select", type: "select",
label: "检验阶段", label: i18n.t("module.basicData.inspectionStage"),
selectOptions: [ selectOptions: [
{ id: 1, name: "进货检验" }, { id: 1, name: "进货检验" },
{ id: 2, name: "过程检验" }, { id: 2, name: "过程检验" },
@ -146,20 +146,20 @@ export default {
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -186,16 +186,16 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t("add");
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle();
break; break;
case "export": case "export":
this.exportHandle('产品列表') this.exportHandle("产品列表");
break; break;
default: default:
console.log(val) console.log(val);
} }
}, },
getArr() { getArr() {
this.$http this.$http

View File

@ -19,7 +19,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -48,30 +48,31 @@
import AddOrUpdate from './components/productType-add' import AddOrUpdate from './components/productType-add'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import basicFilter from '@/filters/basic-filter' import basicFilter from '@/filters/basic-filter'
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter('status'), filter: basicFilter('status'),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -95,32 +96,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -142,7 +143,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -42,34 +42,35 @@
import AddOrUpdate from './components/siteManage-add' import AddOrUpdate from './components/siteManage-add'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "platformGroup", prop: "platformGroup",
label: "站点分组", label: i18n.t("module.basicData.platformGroup"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter('status'), filter: basicFilter('status'),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -93,32 +94,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -140,7 +141,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="180" :width="180"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -42,39 +42,39 @@ import AddOrUpdate from "./components/toolsType-add";
import Detail from "./components/toolsType-detail"; import Detail from "./components/toolsType-detail";
import basicPage from "@/mixins/basic-page"; import basicPage from "@/mixins/basic-page";
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "type", prop: "type",
label: "测量类型", label: i18n.t("module.basicData.measureType"),
filter: basicFilter("tType"),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter("status"), filter: basicFilter("status"),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "detail", type: "detail",
btnName: "详情", btnName: i18n.t("detail"),
}, },
{ {
type: "change", type: "change",
@ -98,32 +98,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,

View File

@ -12,7 +12,7 @@
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="150" :width="150"
label="操作" :label="$t('handle')"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
@ -41,35 +41,36 @@
import AddOrUpdate from './components/unitList-add' import AddOrUpdate from './components/unitList-add'
import basicPage from '@/mixins/basic-page' import basicPage from '@/mixins/basic-page'
import basicFilter from "@/filters/basic-filter"; import basicFilter from "@/filters/basic-filter";
import i18n from "@/i18n";
const tableProps = [ const tableProps = [
{ {
prop: "name", prop: "name",
label: "名称", label: i18n.t("role.name"),
}, },
{ {
prop: "code", prop: "code",
label: "编码", label: i18n.t("params.paramCode"),
}, },
{ {
prop: "type", prop: "type",
label: "类型", label: i18n.t("oss.type"),
filter: basicFilter('uType'), filter: basicFilter('uType'),
}, },
{ {
prop: "status", prop: "status",
label: "状态", label: i18n.t("module.basicData.status"),
filter: basicFilter('status'), filter: basicFilter('status'),
}, },
]; ];
const tableBtn = [ const tableBtn = [
{ {
type: "edit", type: "edit",
btnName: "编辑", btnName: i18n.t("edit"),
}, },
{ {
type: "delete", type: "delete",
btnName: "删除", btnName: i18n.t("delete"),
}, },
{ {
type: "change", type: "change",
@ -93,32 +94,32 @@ export default {
formConfig: [ formConfig: [
{ {
type: "input", type: "input",
label: "名称", label: i18n.t("role.name"),
placeholder: "请输入名称", placeholder: i18n.t("placeholder.name"),
param: "name", param: "name",
}, },
{ {
type: "input", type: "input",
label: "编码", label: i18n.t("params.paramCode"),
placeholder: "请输入编码", placeholder: i18n.t("placeholder.code"),
param: "code", param: "code",
}, },
{ {
type: "button", type: "button",
btnName: "查询", btnName: i18n.t("query"),
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{ {
type: "button", type: "button",
btnName: "新增", btnName: i18n.t("add"),
name: "add", name: "add",
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{ {
type: "button", type: "button",
btnName: "导出", btnName: i18n.t("export"),
name: "export", name: "export",
color: "primary", color: "primary",
plain: true, plain: true,
@ -140,7 +141,7 @@ export default {
this.getDataList(); this.getDataList();
break; break;
case "add": case "add":
this.addOrEditTitle = '新增' this.addOrEditTitle = this.$t('add');
this.addOrUpdateVisible = true; this.addOrUpdateVisible = true;
this.addOrUpdateHandle() this.addOrUpdateHandle()
break; break;