diff --git a/src/views/base/coreEquipment/components/EquipmentDrawer.vue b/src/views/base/coreEquipment/components/EquipmentDrawer.vue
index 10f95cea..4fd9551b 100644
--- a/src/views/base/coreEquipment/components/EquipmentDrawer.vue
+++ b/src/views/base/coreEquipment/components/EquipmentDrawer.vue
@@ -162,7 +162,7 @@ export default {
input: true,
label: '属性名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '属性名称不能为空', trigger: 'blur' }],
},
],
[
diff --git a/src/views/base/coreEquipment/components/EquipmentInfoForm.vue b/src/views/base/coreEquipment/components/EquipmentInfoForm.vue
index 508e7d79..926c850a 100644
--- a/src/views/base/coreEquipment/components/EquipmentInfoForm.vue
+++ b/src/views/base/coreEquipment/components/EquipmentInfoForm.vue
@@ -10,7 +10,7 @@
v-loading="formLoading">
-
+
@@ -33,7 +33,7 @@
+ :rules="[{ required: true, message: '设备类型不能为空', trigger: 'blur' }]">
@@ -43,7 +43,7 @@
+ :rules="[{ required: true, message: '产线不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '工段不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '设备不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
-
+ :rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
Number(val),
},
],
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -230,13 +228,11 @@ export default {
input: true,
label: '标准值',
prop: 'defaultValue',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
{
input: true,
label: '描述',
prop: 'description',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -244,7 +240,6 @@ export default {
input: true,
label: '备注',
prop: 'remark',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
],
diff --git a/src/views/base/equipmentPlcConnect/index.vue b/src/views/base/equipmentPlcConnect/index.vue
index bb7c2df3..418c9c76 100644
--- a/src/views/base/equipmentPlcConnect/index.vue
+++ b/src/views/base/equipmentPlcConnect/index.vue
@@ -236,7 +236,7 @@ export default {
prop: 'plcId',
labelKey: `plcTableName`,
url: '/base/equipment-plc/listAll',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '关联表名不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
@@ -248,7 +248,7 @@ export default {
label: '设备',
prop: 'equipmentId',
url: '/base/core-equipment/page?pageNo=1&pageSize=99',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
@@ -274,7 +274,7 @@ export default {
input: true,
label: '设备名',
prop: 'equipmentName',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
// bind: {
// disabled: this.editMode == 'detail', // some condition, like detail mode...
// }
diff --git a/src/views/base/equipmentPlcParam/index.vue b/src/views/base/equipmentPlcParam/index.vue
index e2454c75..5092dc9e 100644
--- a/src/views/base/equipmentPlcParam/index.vue
+++ b/src/views/base/equipmentPlcParam/index.vue
@@ -120,13 +120,13 @@ export default {
input: true,
label: '参数列名',
prop: 'plcParamName',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
},
{
input: true,
label: '参数名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '参数名称不能为空', trigger: 'blur' }],
},
],
[
@@ -135,7 +135,6 @@ export default {
label: '单位',
prop: 'unit',
options: this.getDictDatas(this.DICT_TYPE.UNIT_DICT),
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
{
switch: true,
@@ -176,7 +175,6 @@ export default {
transform: (val) => Number(val),
},
],
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -184,13 +182,11 @@ export default {
input: true,
label: '标准值',
prop: 'defaultValue',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
{
input: true,
label: '描述',
prop: 'description',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -198,7 +194,6 @@ export default {
input: true,
label: '备注',
prop: 'remark',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
],
diff --git a/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue b/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
index 26bac412..f12d707c 100644
--- a/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
+++ b/src/views/equipment/base/config/AlarmGroup/components/BasicDrawer.vue
@@ -191,7 +191,7 @@ export default {
label: '报警编码', // 自动生成
prop: 'code',
url: '/base/equipment-group-alarm/getCode',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '报警编码不能为空', trigger: 'blur' }],
},
{
select: true,
@@ -205,13 +205,13 @@ export default {
input: true,
label: '参数列名', // 在实时数据库的列名
prop: 'plcParamName',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '参数列名不能为空', trigger: 'blur' }],
},
{
input: true,
label: '报警内容',
prop: 'alarmContent',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '报警内容不能为空', trigger: 'blur' }],
},
],
[
@@ -223,7 +223,7 @@ export default {
{ label: '布尔型', value: 2 },
{ label: '字符型', value: 1 },
],
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '报警类型不能为空', trigger: 'blur' }],
},
{
input: true,
diff --git a/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
index ca8afb7b..cab8b8fd 100644
--- a/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
+++ b/src/views/equipment/base/config/AlarmGroup/components/dialogForm.vue
@@ -16,36 +16,19 @@
+ :rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
-
-
+ :rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警编码不能为空', trigger: 'blur' }]">
-
+ :rules="[{ required: true, message: '报警级别不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '参数列名不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警内容不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '报警类型不能为空', trigger: 'blur' }]">
Number(val),
},
],
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -283,13 +281,11 @@ export default {
input: true,
label: '标准值',
prop: 'defaultValue',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
{
input: true,
label: '描述',
prop: 'description',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
@@ -297,7 +293,6 @@ export default {
input: true,
label: '备注',
prop: 'remark',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
],
diff --git a/src/views/equipment/base/config/deprecated/dialogForm.vue b/src/views/equipment/base/config/deprecated/dialogForm.vue
deleted file mode 100644
index 329186da..00000000
--- a/src/views/equipment/base/config/deprecated/dialogForm.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/equipment/base/config/deprecated/index.vue b/src/views/equipment/base/config/deprecated/index.vue
deleted file mode 100644
index dda58f82..00000000
--- a/src/views/equipment/base/config/deprecated/index.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/equipment/base/inspection/Content/index.vue b/src/views/equipment/base/inspection/Content/index.vue
index 22320c5f..bcdd8efd 100644
--- a/src/views/equipment/base/inspection/Content/index.vue
+++ b/src/views/equipment/base/inspection/Content/index.vue
@@ -127,7 +127,7 @@ export default {
label: '巡检内容编号',
prop: 'code',
url: '/base/equipment-check/getCode',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '巡检内容编号不能为空', trigger: 'blur' }],
},
],
[
@@ -135,7 +135,7 @@ export default {
input: true,
label: '巡检项目',
prop: 'program',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '巡检项目不能为空', trigger: 'blur' }],
},
],
[
@@ -143,7 +143,7 @@ export default {
input: true,
label: '巡检内容',
prop: 'content',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '巡检内容不能为空', trigger: 'blur' }],
},
],
[
diff --git a/src/views/equipment/base/inspection/Record/index.vue b/src/views/equipment/base/inspection/Record/index.vue
index 965e6ad6..98a9604d 100644
--- a/src/views/equipment/base/inspection/Record/index.vue
+++ b/src/views/equipment/base/inspection/Record/index.vue
@@ -166,7 +166,7 @@ export default {
filterable: true,
clearable: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
},
],
[
@@ -181,8 +181,7 @@ export default {
clearable: true,
multiple: true,
},
- options: [{ label: 'test', value: 'test' }],
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '维修工不能为空', trigger: 'blur' }],
},
{
input: true,
@@ -195,7 +194,7 @@ export default {
datetime: true,
label: '故障发生时间',
prop: 'faultTime',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '故障发生时间不能为空', trigger: 'blur' }],
bind: {
format: 'yyyy-MM-dd HH:mm:ss',
'value-format': 'timestamp',
diff --git a/src/views/equipment/base/inspection/Settings/index.vue b/src/views/equipment/base/inspection/Settings/index.vue
index f1abafb2..e686ffdb 100644
--- a/src/views/equipment/base/inspection/Settings/index.vue
+++ b/src/views/equipment/base/inspection/Settings/index.vue
@@ -152,14 +152,14 @@ export default {
input: true,
label: '配置名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
},
{
input: true,
label: '配置编码',
prop: 'code',
url: '/base/equipment-check-config/getCode',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '配置编码不能为空', trigger: 'blur' }],
},
],
[
@@ -168,7 +168,7 @@ export default {
label: '设备名称',
prop: 'equipmentId',
url: '/base/core-equipment/listAll',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
},
{
input: true,
diff --git a/src/views/equipment/base/maintain/PlanConfig/index.vue b/src/views/equipment/base/maintain/PlanConfig/index.vue
index 6eb79d63..69b52e6b 100644
--- a/src/views/equipment/base/maintain/PlanConfig/index.vue
+++ b/src/views/equipment/base/maintain/PlanConfig/index.vue
@@ -169,14 +169,14 @@ export default {
input: true,
label: '计划名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '计划名称不能为空', trigger: 'blur' }],
},
{
input: true,
label: '计划编号',
prop: 'code',
url: '/base/equipment-maintain-plan/getCode',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '计划编号不能为空', trigger: 'blur' }],
},
],
[
@@ -185,7 +185,7 @@ export default {
label: '设备名称',
prop: 'equipmentId',
url: '/base/core-equipment/listAll',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
},
{
select: true,
diff --git a/src/views/equipment/base/maintain/Record/index.vue b/src/views/equipment/base/maintain/Record/index.vue
index f6fd273d..ece2a1ea 100644
--- a/src/views/equipment/base/maintain/Record/index.vue
+++ b/src/views/equipment/base/maintain/Record/index.vue
@@ -186,7 +186,7 @@ export default {
filterable: true,
clearable: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '保养设备不能为空', trigger: 'blur' }],
},
{
select: true,
@@ -199,7 +199,7 @@ export default {
clearable: true,
multiple: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '保养人员不能为空', trigger: 'blur' }],
},
{
input: true,
@@ -216,7 +216,7 @@ export default {
'active-value': 1,
'inactive-value': 2,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '是否计划保养不能为空', trigger: 'blur' }],
},
{},
{
@@ -235,7 +235,7 @@ export default {
datetime: true,
label: '开始时间',
prop: 'startTime',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
bind: {
format: 'yyyy-MM-dd HH:mm:ss',
'value-format': 'timestamp',
@@ -247,7 +247,7 @@ export default {
datetime: true,
label: '结束时间',
prop: 'endTime',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
bind: {
format: 'yyyy-MM-dd HH:mm:ss',
'value-format': 'timestamp',
diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue
index e854d239..1b2dd8a8 100644
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@@ -63,7 +63,7 @@
+ :rules="[{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '维修方式不能为空', trigger: 'blur' }]">
+ :rules="[{ required: true, message: '故障明细不能为空', trigger: 'blur' }]">
diff --git a/src/views/equipment/base/repair/index.vue b/src/views/equipment/base/repair/index.vue
index 965775e2..6ccba2e3 100644
--- a/src/views/equipment/base/repair/index.vue
+++ b/src/views/equipment/base/repair/index.vue
@@ -169,7 +169,7 @@ export default {
input: true,
label: '维修单号',
prop: 'repairOrderNumber',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '维修单号不能为空', trigger: 'blur' }],
},
{
select: true,
@@ -180,7 +180,7 @@ export default {
filterable: true,
clearable: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
},
],
[
@@ -198,7 +198,7 @@ export default {
// multiple: true,
},
// options: [{ label: 'test', value: 'test' }],
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '维修工不能为空', trigger: 'blur' }],
},
{
input: true,
@@ -211,7 +211,7 @@ export default {
datetime: true,
label: '故障发生时间',
prop: 'faultTime',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '故障发生时间不能为空', trigger: 'blur' }],
bind: {
format: 'yyyy-MM-dd HH:mm:ss',
'value-format': 'timestamp',
diff --git a/src/views/equipment/base/spareParts/Config/index.vue b/src/views/equipment/base/spareParts/Config/index.vue
index a8d7c891..71b323b2 100644
--- a/src/views/equipment/base/spareParts/Config/index.vue
+++ b/src/views/equipment/base/spareParts/Config/index.vue
@@ -161,7 +161,7 @@ export default {
input: true,
label: '配置名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
},
],
[
@@ -174,7 +174,7 @@ export default {
filterable: true,
clearable: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
},
],
[
diff --git a/src/views/equipment/base/spareParts/List/index.vue b/src/views/equipment/base/spareParts/List/index.vue
index f4b02b42..3f291d20 100644
--- a/src/views/equipment/base/spareParts/List/index.vue
+++ b/src/views/equipment/base/spareParts/List/index.vue
@@ -153,7 +153,7 @@ export default {
filterable: true,
clearable: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '供应商不能为空', trigger: 'blur' }],
},
],
[
@@ -196,21 +196,6 @@ export default {
prop: 'remark',
},
],
- // [
- // {
- // datetime: true,
- // label: '故障发生时间',
- // prop: 'faultTime',
- // rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
- // bind: {
- // format: 'yyyy-MM-dd HH:mm:ss',
- // 'value-format': 'timestamp',
- // // 'value-format': 'yyyy-MM-dd HH:mm:ss',
- // clearable: true,
- // },
- // },
-
- // ],
],
// 是否显示弹出层
open: false,
diff --git a/src/views/equipment/base/spareParts/Monitor/index.vue b/src/views/equipment/base/spareParts/Monitor/index.vue
index 1f07fa39..cbaffa40 100644
--- a/src/views/equipment/base/spareParts/Monitor/index.vue
+++ b/src/views/equipment/base/spareParts/Monitor/index.vue
@@ -211,7 +211,7 @@ export default {
input: true,
label: '配置名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '配置名称不能为空', trigger: 'blur' }],
},
],
[
@@ -224,7 +224,7 @@ export default {
filterable: true,
clearable: true,
},
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
},
],
[
diff --git a/src/views/extend/processFlow/index.vue b/src/views/extend/processFlow/index.vue
index d346b0d6..083e48ab 100644
--- a/src/views/extend/processFlow/index.vue
+++ b/src/views/extend/processFlow/index.vue
@@ -180,7 +180,7 @@ export default {
input: true,
label: '工艺名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '工艺名称不能为空', trigger: 'blur' }],
// bind: {
// disabled: this.editMode == 'detail', // some condition, like detail mode...
// }
@@ -197,6 +197,7 @@ export default {
select: true,
label: '产线',
prop: 'lineId',
+ rules: [{ required: true, message: '产线不能为空', trigger: 'blur' }],
// cache: 'processFlow::lineList',
url: '/base/core-production-line/listAll',
bind: {
@@ -217,8 +218,9 @@ export default {
[
{
textarea: true,
- label: '功能描述',
+ label: '工艺描述',
prop: 'remark',
+ rules: [{ required: true, message: '工艺描述不能为空', trigger: 'blur' }],
},
],
],
diff --git a/src/views/extend/processFlowView/components/ProcessDetail.vue b/src/views/extend/processFlowView/components/ProcessDetail.vue
index b1f71270..77368267 100644
--- a/src/views/extend/processFlowView/components/ProcessDetail.vue
+++ b/src/views/extend/processFlowView/components/ProcessDetail.vue
@@ -102,7 +102,7 @@ export default {
input: true,
label: '工序名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
},
],
[
@@ -111,7 +111,7 @@ export default {
label: '工段',
prop: 'sectionId',
url: '/base/core-workshop-section/listAll',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
diff --git a/src/views/extend/processFlowView/index.vue b/src/views/extend/processFlowView/index.vue
index 4632eec7..5bc85968 100644
--- a/src/views/extend/processFlowView/index.vue
+++ b/src/views/extend/processFlowView/index.vue
@@ -25,7 +25,7 @@ export default {
data() {
return {
flowId: null,
- currentDet: null
+ currentDet: null,
};
},
provide() {
@@ -36,6 +36,14 @@ export default {
},
};
},
+ beforeRouteEnter(to, from, next) {
+ console.log('tot', to, from);
+ if (to.params.id) {
+ next();
+ } else {
+ next({ path: '/extend/process-flow' });
+ }
+ },
activated() {
console.log('activated...', this.$route.params);
this.flowId = this.$route.params.id;
@@ -44,10 +52,9 @@ export default {
methods: {
handleDetSelected(det) {
if (det != null) {
- this.currentDet = { ...det }
- }
- else this.currentDet = null;
- }
+ this.currentDet = { ...det };
+ } else this.currentDet = null;
+ },
},
};
diff --git a/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue b/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
index 431afddc..0a4fa84f 100644
--- a/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
+++ b/src/views/extend/processTraceabilityDetail/components/ProcessDetail.vue
@@ -68,7 +68,7 @@ export default {
input: true,
label: '工序名称',
prop: 'name',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '工序名称不能为空', trigger: 'blur' }],
},
],
[
@@ -77,7 +77,7 @@ export default {
label: '工段',
prop: 'sectionId',
url: '/base/core-workshop-section/listAll',
- rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
+ rules: [{ required: true, message: '工段不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
diff --git a/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue b/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
index f3d76f03..bab9b554 100644
--- a/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
+++ b/src/views/quality/base/basicData/qualityInspectionBoxBtn/dialogForm.vue
@@ -6,45 +6,23 @@
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+