diff --git a/klp-ui/src/views/mes/qc/template/index.vue b/klp-ui/src/views/mes/qc/template/index.vue
index 666cefc7..2b9657d6 100644
--- a/klp-ui/src/views/mes/qc/template/index.vue
+++ b/klp-ui/src/views/mes/qc/template/index.vue
@@ -8,6 +8,11 @@
+
+
+
+
+
@@ -17,19 +22,28 @@
-
-
-
-
- 修改
- 删除
-
-
-
-
-
+
+
+
+
+ 所属单位:{{ item.templateUnit || '-' }}
+
+
{{ item.templateDesc }}
+
+
+
@@ -37,6 +51,11 @@
+
+
+
+
+
@@ -154,35 +173,34 @@ export default {
CheckItemTransfer,
},
data() {
- return {
- // 按钮loading
- buttonLoading: false,
- // 遮罩层
- loading: true,
- // 选中数组
- ids: [],
- // 非单个禁用
- single: true,
- // 非多个禁用
- multiple: true,
- // 显示搜索条件
- showSearch: true,
- // 总条数
- total: 0,
- // 待检项方案表格数据
- inspectionItemTemplateList: [],
- // 弹出层标题
- title: "",
- // 是否显示弹出层
- open: false,
- // 查询参数
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- templateName: undefined,
- templateDesc: undefined,
- inspectionItem: undefined,
- },
+ return {
+ // 按钮loading
+ buttonLoading: false,
+ // 遮罩层
+ loading: true,
+ // 选中数组
+ ids: [],
+ // 非单个禁用
+ single: true,
+ // 非多个禁用
+ multiple: true,
+ // 显示搜索条件
+ showSearch: true,
+ // 待检项方案表格数据
+ inspectionItemTemplateList: [],
+ // 方案单位选项
+ templateUnitOptions: [],
+ // 弹出层标题
+ title: "",
+ // 是否显示弹出层
+ open: false,
+ // 查询参数
+ queryParams: {
+ templateName: undefined,
+ templateUnit: undefined,
+ templateDesc: undefined,
+ inspectionItem: undefined,
+ },
// 表单参数
form: {},
// 表单校验
@@ -190,6 +208,7 @@ export default {
},
checkItemList: [],
rightLoading: false,
+ isRowClicking: false,
currentTemplate: null,
addItemOpen: false,
addItemForm: {
@@ -214,17 +233,27 @@ export default {
getList() {
this.loading = true;
listInspectionItemTemplate(this.queryParams).then(response => {
- this.inspectionItemTemplateList = response.rows;
- this.total = response.total;
+ this.inspectionItemTemplateList = response.rows || response.data || response;
+ const units = [...new Set(this.inspectionItemTemplateList.map(item => item.templateUnit).filter(Boolean))];
+ this.templateUnitOptions = units.sort();
this.loading = false;
});
},
handleRowClick(row) {
+ if (this.isRowClicking) {
+ this.$message.info('正在查看数据,请稍后');
+ return;
+ }
+ this.isRowClicking = true;
this.currentTemplate = row;
this.rightLoading = true;
getInfoByInspectionItem(row.inspectionItem).then(response => {
this.checkItemList = response.data || [];
this.rightLoading = false;
+ this.isRowClicking = false;
+ }).catch(() => {
+ this.rightLoading = false;
+ this.isRowClicking = false;
});
},
loadAvailableCheckItems() {
@@ -339,7 +368,6 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
- this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
@@ -425,3 +453,113 @@ export default {
}
};
+
+
diff --git a/klp-ui/src/views/mes/roll/grind/index.vue b/klp-ui/src/views/mes/roll/grind/index.vue
index 44a30e59..37807924 100644
--- a/klp-ui/src/views/mes/roll/grind/index.vue
+++ b/klp-ui/src/views/mes/roll/grind/index.vue
@@ -426,7 +426,7 @@ export default {