diff --git a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
index 2ef5dc5..6983759 100644
--- a/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
+++ b/src/views/processManagement/bathRefine/components/addAccumulateClassDialog.vue
@@ -61,6 +61,24 @@
+
+
+ *设备
+
+
+
+
+
+
+
+
+
+
*规则类型
@@ -139,23 +157,25 @@
:prop="`tableData[${scope.$index}].cumulativeInitialValue`"
:rules="formRules.cumulativeInitialValue"
> -->
-
-
-
-
+
+
+
@@ -175,7 +195,7 @@
import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
import { add, update } from '@/api/processManagement/planClass.js';
import { getTank } from '@/api/tankSolutionSystem/info';
-
+import { getEquipmentList } from '@/api/processManagement/specialProcess';
export default {
props: {
showDialog: { type: Boolean, default: false },
@@ -192,12 +212,12 @@ export default {
label: '电量差类',
value: 1,
},
-
+
{
label: '主盐添加量类',
value: 4,
},
- {
+ {
label: '累计电量类',
value: 2,
},
@@ -205,7 +225,7 @@ export default {
label: '累计生产日期',
value: 3,
},
-
+
{
label: '累计生产面积',
value: 5,
@@ -270,6 +290,7 @@ export default {
cumulativeInitialValue: [
{ required: true, message: '请输入', trigger: ['change', 'submit'] },
],
+ device: [{ required: true, message: '请选择', trigger: ['change', 'submit'] }],
},
};
},
@@ -291,12 +312,18 @@ export default {
this.form.batchNo = '';
console.log(this.form.tableData[index]);
this.getTankList(this.form.tableData[index].wcId, index);
+ this.getEquipmentList(this.form.tableData[index].wcId, index)
}, // 查询作业槽下拉列表
getTankList(val, index) {
getTank({ workstationId: val ? val : '' }).then(res => {
this.form.tableData[index].batchNoOptions = res.data.data;
});
},
+ getEquipmentList(val, index) {
+ getEquipmentList({ workstationId: val ? val : '' }).then(res => {
+ this.form.tableData[index].deviceOptions = res.data.data;
+ });
+ },
getWorkCenterList() {
getWorkCenterList().then(res => {
this.wcData = res.data.data || [];
diff --git a/src/views/processManagement/components/processMainte/processPlanning.vue b/src/views/processManagement/components/processMainte/processPlanning.vue
index f3436cb..90cfa61 100644
--- a/src/views/processManagement/components/processMainte/processPlanning.vue
+++ b/src/views/processManagement/components/processMainte/processPlanning.vue
@@ -261,17 +261,17 @@
>
-
+
*检验项目
item.id == row.projecCode);
+ let selectName = this.projectOptions.find(item => item.id == row.projectCode);
this.form2.tableData2[index].projectName = selectName.name;
},
// 获取检验标准名字