diff --git a/src/views/base/equipmentBindGroup/index.vue b/src/views/base/equipmentBindGroup/index.vue
index 33477279..bab7525f 100644
--- a/src/views/base/equipmentBindGroup/index.vue
+++ b/src/views/base/equipmentBindGroup/index.vue
@@ -303,7 +303,7 @@ export default {
handleDelete(row) {
const id = row.id;
this.$modal
- .confirm('是否确认删除设备与分组绑定编号为"' + id + '"的数据项?')
+ .confirm('是否确认删除该分组绑定?')
.then(function () {
return deleteEquipmentBindGroup(id);
})
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
new file mode 100644
index 00000000..58fcf31e
--- /dev/null
+++ b/src/views/quality/monitoring/qualityInspectionRecord/dialogForm.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/quality/monitoring/qualityInspectionRecord/index.vue b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
index 9aef665c..2eb641ef 100644
--- a/src/views/quality/monitoring/qualityInspectionRecord/index.vue
+++ b/src/views/quality/monitoring/qualityInspectionRecord/index.vue
@@ -53,14 +53,15 @@ import {
getQualityInspectionRecordPage,
exportQualityInspectionRecordExcel,
} from '@/api/monitoring/qualityInspectionRecord';
-import Editor from '@/components/Editor';
+// import Editor from '@/components/Editor';
import moment from 'moment';
+// import DialogForm from './dialogForm.vue'
import basicPageMixin from '@/mixins/lb/basicPageMixin';
export default {
name: 'QualityInspectionRecord',
components: {
- Editor,
+ // DialogForm
},
mixins: [basicPageMixin],
data() {
@@ -272,32 +273,32 @@ export default {
},
created() {
this.getList();
- this.getProductLineList();
+ // this.getProductLineList();
},
watch: {
// 注册弹窗里产线改变时的监听事件
- 'form.productionLineId': {
- handler: function (val) {
- if (val == null) return;
- this.$axios('/base/workshop-section/listByParentId', {
- params: {
- id: val,
- },
- }).then((response) => {
- this.$set(
- this.rows[1][1], // 这里索引是硬编码,所以当 this.rows 里数据顺序改变时,此处也要改
- 'options',
- response.data.map((item) => {
- return {
- label: item.name,
- value: item.id,
- };
- })
- );
- });
- },
- immediate: true,
- },
+ // 'form.productionLineId': {
+ // handler: function (val) {
+ // if (val == null) return;
+ // this.$axios('/base/workshop-section/listByParentId', {
+ // params: {
+ // id: val,
+ // },
+ // }).then((response) => {
+ // this.$set(
+ // this.rows[1][1], // 这里索引是硬编码,所以当 this.rows 里数据顺序改变时,此处也要改
+ // 'options',
+ // response.data.map((item) => {
+ // return {
+ // label: item.name,
+ // value: item.id,
+ // };
+ // })
+ // );
+ // });
+ // },
+ // immediate: true,
+ // },
},
methods: {
/** 获取搜索栏的产线列表 */