Merge remote-tracking branch 'origin/master'

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

@@ -75,8 +75,8 @@
                 <div class="activityEdit">
                     <ul>
                         <li v-for="(item,index) in attrDesc" :key="index">
-                            描述（英文）&nbsp;&nbsp;<i-input v-model="item.E" style="width: 77px"></i-input>&nbsp;&nbsp;
-                            （中文）&nbsp;&nbsp;<i-input v-model="item.C" style="width: 77px"></i-input>
+                            描述（英文）&nbsp;&nbsp;<i-input v-model="item.attrValue" style="width: 77px"></i-input>&nbsp;&nbsp;
+                            （中文）&nbsp;&nbsp;<i-input v-model="item.attrDesc" style="width: 77px"></i-input>
 <!--                            <i-input v-model="item" style="width: 77px"></i-input>-->
                             <span @click="delCondition(item)">删除</span>
                         </li>

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

@@ -77,25 +77,21 @@ let vm = new Vue({
 				vm.attributes.need = true
 			}
 			let arr = []
-			let flag1 = true
-			// let flag2 = true
-			let flag3 = false
+			let flag = true
 			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)
+				if(item.attrValue&&item.attrDesc){
+					flag = true
+				}else if(item.attrValue&&!item.attrDesc){
+					flag = true
 				}else {
-					flag1 = false
+					flag = false
 				}
 			})
 			let arrs = []
 			vm.attrDesc.forEach(item=>{
-				arrs.push(item.E)
+				arrs.push(item.attrValue)
 			})
-			if(!flag1){
+			if(!flag){
 				alert("属性描述不要为空！")
 				return
 			}
@@ -105,7 +101,9 @@ let vm = new Vue({
 			}
 
 			// console.log(arr.join())
-			vm.attributes.attrDesc = arr.join()
+			vm.attributes.descs = []
+			vm.attributes.descs = vm.attrDesc
+			console.log(vm.attributes)
             Ajax.request({
 			    url: url,
                 params: JSON.stringify(vm.attributes),
@@ -176,22 +174,25 @@ let vm = new Vue({
 			// console.log(item)
 		},
 		addCondition(){
-			var conditionNew = {'C':'','E':''}
+			var conditionNew = {'attrDesc':'','attrValue':''}
 			vm.attrDesc.push(conditionNew)
 		},
 		attrDescCheck(){
 			// vm.attrDesc = vm.attributes.attrDesc.split(",")
-			let arr = vm.attributes.attrDesc.split(",")
+			let arr = vm.attributes.descs
+			console.log(arr)
 			vm.attrDesc = []
 			arr.forEach(item=>{
-				console.log(item.indexOf("("))
+				console.log(item)
 				let obj = {}
-				if(item.indexOf("(")!=-1){
-					obj.E = item.split("(")[0]
-					obj.C = item.split("(")[1].split(")")[0]
-				}else {
-					obj.E = item
-				}
+				// if(item.attrValue){
+				// 	obj.E = item.split("(")[0]
+				// 	obj.C = item.split("(")[1].split(")")[0]
+				// }else {
+				// 	obj.E = item
+				// }
+				obj.attrValue = item.attrValue
+				obj.attrDesc= item.attrDesc
 				vm.attrDesc.push(obj)
 			})
 			console.log(vm.attrDesc)