attributes

platform-admin/src/main/webapp/WEB-INF/page/sys/attributes.html

@@ -98,10 +98,10 @@
             <Form-item label="是否必填" prop="updateTime">
                 <Radio-group v-model="attributes.need">
                     <Radio label="1">
-                        <span>开启</span>
+                        <span>必填</span>
                     </Radio>
                     <Radio label="0">
-                        <span>关闭</span>
+                        <span>非必填</span>
                     </Radio>
                 </Radio-group>
             </Form-item>

platform-admin/src/main/webapp/js/sys/attributes.js

@@ -5,8 +5,24 @@ $(function () {
 			{label: 'id', name: 'id', index: 'id', key: true, hidden: true},
 			{label: '属性名', name: 'attrName', index: 'attr_name', width: 80},
 			{label: '属性描述', name: 'attrDesc', index: 'attr_desc', width: 80},
-			{label: '是否开启', name: 'status', index: 'status', width: 80},
-			{label: '是否必填', name: 'need', index: 'need', width: 80},
+			{label: '是否开启', name: 'status', index: 'status', width: 80,formatter:function (value, grid, rows){
+					var returnStr;
+					if (value == '0') {
+						returnStr = "<i-button class=\"ivu-btn ivu-btn-primary\"  style='border-radius:25px;' type=\"info\">已开启</i-button>";
+					} else if (value == '1') {
+						returnStr = "<i-button class=\"ivu-btn ivu-btn-success\"  style='border-radius:25px;' type=\"warning\">未开启</i-button>";
+					}
+					return returnStr;
+				}},
+			{label: '是否必填', name: 'need', index: 'need', width: 80,formatter:function (value, grid, rows){
+					var returnStr;
+					if (value == false) {
+						returnStr = "<i-button class=\"ivu-btn ivu-btn-primary\"  style='border-radius:25px;' type=\"info\">非必填</i-button>";
+					} else if (value == true) {
+						returnStr = "<i-button class=\"ivu-btn ivu-btn-success\"  style='border-radius:25px;' type=\"warning\">必填</i-button>";
+					}
+					return returnStr;
+				}},
 			{label: '排序', name: 'sort', index: 'sort', width: 80},
 			// {label: '创建时间', name: 'createTime', index: 'create_time', width: 80},
 			// {label: '更新时间', name: 'updateTime', index: 'update_time', width: 80}
@@ -60,7 +76,36 @@ let vm = new Vue({
 			}else {
 				vm.attributes.need = true
 			}
-			vm.pushAttrDesc();
+			let arr = []
+			let flag1 = true
+			// let flag2 = true
+			let flag3 = false
+			vm.attrDesc.forEach(item=>{
+				if(item.E&&item.C){
+					let str = `${item.E}(${item.C})`
+					arr.push(str)
+				}else if(item.E&&!item.C){
+					let str = `${item.E}`
+					arr.push(str)
+				}else {
+					flag1 = false
+				}
+			})
+			let arrs = []
+			vm.attrDesc.forEach(item=>{
+				arrs.push(item.E)
+			})
+			if(!flag1){
+				alert("属性描述不要为空！")
+				return
+			}
+			if((new Set(arrs)).size!==arrs.length){
+				alert("属性描述不能重复！")
+				return
+			}
+
+			// console.log(arr.join())
+			vm.attributes.attrDesc = arr.join()
             Ajax.request({
 			    url: url,
                 params: JSON.stringify(vm.attributes),
@@ -150,20 +195,6 @@ let vm = new Vue({
 				vm.attrDesc.push(obj)
 			})
 			console.log(vm.attrDesc)
-		},
-		pushAttrDesc(){
-			let arr = []
-			vm.attrDesc.forEach(item=>{
-				if(item.E&&item.C){
-					let str = `${item.E}(${item.C})`
-					arr.push(str)
-				}else if(item.E&&!item.C){
-					let str = `${item.E}`
-					arr.push(str)
-				}
-			})
-			// console.log(arr.join())
-			vm.attributes.attrDesc = arr.join()
 		}
 	}
 });
\ No newline at end of file