diff --git a/src/views/quality/base/qualityInspectionDet/index.vue b/src/views/quality/base/qualityInspectionDet/index.vue
index 9bca5dc5..eab63e01 100644
--- a/src/views/quality/base/qualityInspectionDet/index.vue
+++ b/src/views/quality/base/qualityInspectionDet/index.vue
@@ -31,6 +31,42 @@
+
+
+
@@ -70,10 +106,11 @@ import {
} from '@/api/base/qualityInspectionDet';
import moment from 'moment';
+import DialogForm from '../../components/dialogForm.vue';
export default {
name: 'QualityInspectionDet',
- components: {},
+ components: { DialogForm },
data() {
return {
typeList: [], // 检测类型列表
@@ -209,7 +246,7 @@ export default {
},
/** search bar related */
handleSearchBarBtnClick(btn) {
- const keys = ['name', 'createTime']; // timeVal
+ const keys = ['content', 'createTime']; // timeVal
switch (btn.btnName) {
case 'search':
keys.forEach((key) => {
@@ -218,8 +255,10 @@ export default {
this.queryParams['endTime'] = btn.timeVal[1];
return;
}
+ console.log('key', key, btn[key])
this.queryParams[key] = btn[key] || null;
});
+ console.log('queryParams', this.queryParams)
this.handleQuery();
break;
case 'add':
@@ -239,16 +278,14 @@ export default {
},
/** 获取检测类型id */
getTypeList() {
- this.$axios('/base/quality-inspection-type/listAll').then(
- (response) => {
- this.typeList = response.data.map((item) => {
- return {
- label: item.name,
- value: item.id,
- };
- });
- }
- );
+ this.$axios('/base/quality-inspection-type/listAll').then((response) => {
+ this.typeList = response.data.map((item) => {
+ return {
+ label: item.name,
+ value: item.id,
+ };
+ });
+ });
},
/** 查询列表 */
getList() {
diff --git a/src/views/quality/components/dialogForm.vue b/src/views/quality/components/dialogForm.vue
index dd51fe2e..3e0d8026 100644
--- a/src/views/quality/components/dialogForm.vue
+++ b/src/views/quality/components/dialogForm.vue
@@ -18,10 +18,12 @@
v-if="col.input"
v-model="form[col.prop]"
@change="$emit('update', form)"
+ :placeholder="`请输入${col.label}`"
v-bind="col.bind" />
{
cols.forEach(async (opt) => {
@@ -131,9 +134,11 @@ export default {
);
});
try {
- this.formLoading = true;
- await Promise.all(promiseList);
+ // this.formLoading = true;
+ // console.log("[dialogForm:handleOptions:promiseList]", promiseList)
+ await Promise.all(promiseList.map((fn) => fn()));
this.formLoading = false;
+ // console.log("[dialogForm:handleOptions:optionListOf]", this.optionListOf)
} catch (error) {
console.log('[dialogForm:handleOptions:error]', error);
this.formLoading = false;