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 5a0c9096..acd47a0b 100644 --- a/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue +++ b/ant-design-vue-jeecg/src/views/customermeasure/admin/CustomerMeasureList.vue @@ -159,6 +159,11 @@ align:"center", dataIndex: 'userId_dictText' }, + { + title:'登录名', + align:"center", + dataIndex: 'userdlm' + }, { title:'排序', align:"center", @@ -250,11 +255,6 @@ align:"center", dataIndex: 'measurerId_dictText' }, - { - title:'量体时间', - align:"center", - dataIndex: 'createTime' - }, { title: '操作', dataIndex: 'action', @@ -270,14 +270,14 @@ deleteBatch: "/customermeasure/customerMeasure/deleteBatch", exportXlsUrl: "/customermeasure/customerMeasure/exportXls", importExcelUrl: "customermeasure/customerMeasure/importExcel", - + }, dictOptions:{}, superFieldList:[], } }, created() { - this.getSuperFieldList(); + this.getSuperFieldList(); }, computed: { importExcelUrl: function(){ @@ -290,7 +290,8 @@ getSuperFieldList(){ let fieldList=[]; fieldList.push({type:'sel_search',value:'userId',text:'用户',dictTable:'sys_user', dictText:'realname', dictCode:'id'}) - fieldList.push({type:'popup',value:'username',text:'用户名', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}}) + fieldList.push({type:'popup',value:'username',text:'用户', popup:{code:'findcust',field:'id',orgFields:'id',destFields:'user_id'}}) + fieldList.push({type:'string',value:'userdlm',text:'登录名',dictCode:''}) fieldList.push({type:'int',value:'sort',text:'排序',dictCode:''}) fieldList.push({type:'double',value:'height',text:'身高（厘米）',dictCode:''}) fieldList.push({type:'double',value:'weight',text:'体重（千克）',dictCode:''}) @@ -309,7 +310,6 @@ fieldList.push({type:'sel_depart',value:'storeId',text:'量体店铺'}) fieldList.push({type:'sel_search',value:'deviceId',text:'量体设备',dictTable:'se_equipmenttype', dictText:'name', dictCode:'id'}) fieldList.push({type:'sel_user',value:'measurerId',text:'量体师'}) - fieldList.push({type:'datetime',value:'measurementTime',text:'量体时间'}) this.superFieldList = fieldList } } 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 d9246a84..ba0f415c 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 @@ -4,26 +4,31 @@ - + + /> + + + + + - + - + @@ -78,17 +83,17 @@ - + - + - + @@ -132,7 +137,8 @@ data () { return { model:{ - }, + measurementMethod:1 + }, labelCol: { xs: { span: 24 }, sm: { span: 5 }, @@ -143,6 +149,62 @@ }, confirmLoading: false, validatorRules: { + 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的数,保留一位小数'}, + ], + weight: [ + { required: true, message: '请输入体重!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + cuff: [ + { required: true, message: '请输入袖口!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + sleeveLength: [ + { required: true, message: '请输入袖长!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + bust: [ + { required: true, message: '请输入胸围!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + theWaist: [ + { required: true, message: '请输入腰围!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + shoulderWidth: [ + { required: true, message: '请输入肩宽!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + forebodyLength: [ + { required: true, message: '请输入前身长!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + neck: [ + { required: true, message: '请输入领围!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + hipline: [ + { required: true, message: '请输入臀围!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + length: [ + { required: true, message: '请输入衣长!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + sternalDistance: [ + { required: true, message: '请输入胸距!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], + hem: [ + { required: true, message: '请输入下摆!'}, + {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}, + ], }, url: { add: "/customermeasure/customerMeasure/add", @@ -157,7 +219,7 @@ }, }, created () { - //备份model原始值 + //备份model原始值 this.modelDefault = JSON.parse(JSON.stringify(this.model)); }, methods: { @@ -181,7 +243,7 @@ method = 'post'; }else{ httpurl+=this.url.edit; - method = 'put'; + method = 'put'; } httpAction(httpurl,this.model,method).then((res)=>{ if(res.success){ @@ -194,11 +256,11 @@ that.confirmLoading = false; }) } - + }) }, popupCallback(value,row){ - this.model = Object.assign(this.model, row); + this.model = Object.assign(this.model, row); }, } } 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 0d5ce1ff..cd17de6e 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 @@ -64,10 +64,14 @@ public class CustomerMeasure implements Serializable { @Excel(name = "用户名", width = 15) @ApiModelProperty(value = "用户名") private String username; - /**排序*/ - @Excel(name = "排序", width = 15) + /**登录名*/ + @Excel(name = "登录名", width = 15) + @ApiModelProperty(value = "登录名") + private java.lang.String userdlm; + /**排序*/ + @Excel(name = "排序", width = 15) @ApiModelProperty(value = "排序") - private Integer sort; + private java.lang.Integer sort; /**身高（厘米）*/ @Excel(name = "身高（厘米）", width = 15) @ApiModelProperty(value = "身高（厘米）")