diff --git a/ant-design-vue-jeecg/src/components/layouts/Jxrysjkzxt.vue b/ant-design-vue-jeecg/src/components/layouts/Jxrysjkzxt.vue
index a42a8f0a..a5376fe3 100644
--- a/ant-design-vue-jeecg/src/components/layouts/Jxrysjkzxt.vue
+++ b/ant-design-vue-jeecg/src/components/layouts/Jxrysjkzxt.vue
@@ -4,7 +4,7 @@
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
index 537a72d2..3a6e49d4 100644
--- a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
+++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue
@@ -100,6 +100,8 @@
+ 默认
+
编辑
@@ -133,6 +135,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CustomerMeasureModal from './modules/CustomerMeasureModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+ import { getAction } from '@/api/manage'
export default {
name: 'CustomerMeasureList',
@@ -277,8 +280,8 @@
superFieldList:[],
}
},
- created() {
- this.getSuperFieldList();
+ created(record){
+ getAction(this.url.moreYear,{ id: record.id})
},
computed: {
importExcelUrl: function(){
@@ -286,6 +289,9 @@
},
},
methods: {
+ moren(){
+
+ },
initDictConfig(){
},
getSuperFieldList(){
diff --git a/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue b/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
index ed17afe0..8744fd3c 100644
--- a/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
+++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/modules/CustomerMeasureForm.vue
@@ -18,7 +18,7 @@
-
+
@@ -173,10 +173,10 @@
},
confirmLoading: false,
validatorRules: {
- sort: [
+ /* sort: [
{ required: false},
{ validator: (rule, value, callback) => validateDuplicateValue('customer_measure', 'sort', value, this.model.id, callback)},
- ],
+ ],*/
height: [
{ required: true, message: '请输入身高!'},
{pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'},
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
index 4e72af76..e81f4c39 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customermeasure/entity/CustomerMeasure.java
@@ -139,8 +139,8 @@ public class CustomerMeasure implements Serializable {
@ApiModelProperty(value = "量体店铺")
private java.lang.String storename;
/**量体设备*/
- @Excel(name = "量体设备", width = 15, dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
- @Dict(dictTable = "zy_devicetype", dicText = "name", dicCode = "id")
+ @Excel(name = "量体设备", width = 15, dictTable = "zy_device", dicText = "name", dicCode = "id")
+ @Dict(dictTable = "zy_device", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "量体设备")
private java.lang.String deviceId;
/**量体设备*/