From 3d8e6f5098d41be418d60e4f0e72ea1e5545dca6 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期二, 21 三月 2023 17:15:48 +0800
Subject: [PATCH] test

---
 pages/modal/ms_classAttr.vue |  186 ++++++++++++++++++++++++++-------------------
 1 files changed, 107 insertions(+), 79 deletions(-)

diff --git a/pages/modal/ms_classAttr.vue b/pages/modal/ms_classAttr.vue
index f0babd9..ddc80fe 100644
--- a/pages/modal/ms_classAttr.vue
+++ b/pages/modal/ms_classAttr.vue
@@ -176,6 +176,19 @@
 		float: left;
 		display: inline-block;
 	}
+	button.btn_sava {
+		width:100%;
+		margin-top: 50rpx;
+		padding: 20rpx;
+		line-height: 1.5;
+		background: #27A6E1;
+		border: none;
+		color: #fff;
+	    font-size: 38rpx;
+		font-weight: bold;
+		float: left;
+		display: inline-block;
+	}
 	.i_tishi{
 		color: red;
 		vertical-align: sub;
@@ -218,6 +231,9 @@
 		text-align: center;
 		font-weight: bold;
 	}
+	.v-panel{
+		min-height:788rpx;
+	}
 	.v-panellist{
 		border:4rpx solid #aaa;
 		border-radius: 10rpx;
@@ -246,6 +262,7 @@
 
 <template>
 	<view class="content">
+		<!-- 涓绘暟鎹�-->
 		<view class="v-area" v-for="(classattr,index) in classAttrList">
 			<div class="class_attr_title" style="display: none;">
 				<div class="title_line"></div>
@@ -255,6 +272,7 @@
 				<span class="title">{{classattr.Name}}</span>
 				<a href="javascript:;" class="arrow" @tap="onarrow(index,classattr.Open)"><i class="ace-icon fa ":class="classattr.Open?'fa-angle-down':'fa-angle-up'"></i></a>
 			</div>
+			<!-- 涓绘暟鎹樉绀鸿鎯呭尯 -->
 			<div class="class_attr_body" :style="{'display':classattr.Open?'block':'none'}">
 				<div class="dv_field_div" v-for="(attr,iindex) in classattr.Attr">
 					<view class="form-group" v-if="attr.Type=='瀛楃涓� || attr.Type=='鍙彉闀垮瓧绗︿覆' || attr.Type=='鏁存暟' || attr.Type=='娴偣鏁�" :style="{'display':attr.hidden == 'True'?'none':''}">
@@ -406,25 +424,29 @@
 				</div>
 			</div>
 		</view>
-		<view class="v-area class_attr_body">
-			<view class="form-group">
-				<!-- 宸﹀彸甯冨眬 -->
-				<p class="tx_title2" >{{param.Scan_Code.Name}}:</p>
-				<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
-				<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
-					<a @tap="scan_classAttr_extButton()" ><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
-				</div>
-				<!-- 涓婁笅甯冨眬 -->
-				<!-- <text class="tx_title">{{param.Scan_Code.Name}}锛�/text> 
-				<div class="text-right" v-if="param.Scan_Code.Have_Select_Button==true">  
-					<a @tap="ms_classAttr_extButton()"><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
-				</div>
-				<input type="text" value="" > -->
-			</view>
-		</view>
 		
+		<!-- 浠庢暟鎹�-->
 		<view class="v-panel">
 			<div class="panel_title">{{param.Sub_Cls.Title}}</div>
+			<!-- 浠庢暟鎹壂鐮佸尯 -->
+			<view class="v-area class_attr_body" v-if="param.Sub_Cls.Can_Add_Delete == true">
+				<h4 style="margin: 15rpx 0 0 30rpx;font-weight: bold;">鏂板{{param.Sub_Cls.Name }}</h4>
+				<view class="form-group">
+					<!-- 宸﹀彸甯冨眬 -->
+					<p class="tx_title2" >{{param.Scan_Code.Name}}:</p>
+					<input type="text" class="attr_field" :value="scanCodeVal" @focus="scan_ontap" @blur="scan_onevent" :style="param.Scan_Code.Have_Select_Button==true?'width: '+(100-(param.Scan_Code.Name.length * 5)-14)+'%;':'width: '+(100-(param.Scan_Code.Name.length * 5)-5)+'%;'">
+					<div class="text-right2" v-if="param.Scan_Code.Have_Select_Button==true">
+						<a @tap="scan_classAttr_extButton()" ><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
+					</div>
+					<!-- 涓婁笅甯冨眬 -->
+					<!-- <text class="tx_title">{{param.Scan_Code.Name}}锛�/text> 
+					<div class="text-right" v-if="param.Scan_Code.Have_Select_Button==true">  
+						<a @tap="ms_classAttr_extButton()"><i class="ace-icon fa" :class="param.Scan_Code.Img?param.Scan_Code.Img:'fa-plus-circle'"></i></a>
+					</div>
+					<input type="text" value="" > -->
+				</view>
+			</view>
+			<!-- 浠庢暟鎹樉绀鸿鎯呭尯 -->
 			<view class="v-panellist" v-for="(subpanel,index) in subPanelList">
 				<view class="v-area" v-for="(subclassattr,index) in subpanel.subClassAttr">
 					<div class="class_attr_title" style="display: none;">
@@ -580,12 +602,15 @@
 					</div>
 				</view>
 				
-				<view class="v-paneldel"><a href="javascript:;" class="panel_del" @tap="panel_del(index)"><i class="ace-icon fu-delete"></i></a></view>
+				<view class="v-paneldel" v-if="param.Sub_Cls.Can_Add_Delete == true">
+					<a href="javascript:;" class="panel_del" @tap="panel_del(index)"><i class="ace-icon fu-delete"></i></a>
+				</view>
 			</view>
 		</view>
 		
-		<button type="default" @tap="cancel" class="btn_cancel">鍙栨秷</button>
-		<button type="default" @tap="sava" class="btn_add">{{title}}</button>
+		<button type="default" @tap="cancel" class="btn_cancel" v-if="param.Sub_Cls.Can_Add_Delete == true">鍙栨秷</button>
+		<button type="default" @tap="sava" class="btn_add" v-if="param.Sub_Cls.Can_Add_Delete == true">{{title}}</button>
+		<button type="default" @tap="cancel" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false">{{title}}</button>
 	</view>
 </template> 
 
@@ -726,10 +751,10 @@
 					name: styleName,
 					type: '2'
 				};
-				$this.$store.state.thisEditName = styleName;
 				// console.log($this.$store.getters.getclassGridStyleInfo);
 				//鑾峰彇涓绘暟鎹被鐣岄潰鏍峰紡
 				if(clsType=='Mast'){
+					$this.$store.state.thisEditName = styleName;
 					if($this.$store.getters.getclassGridStyleInfo){
 						$this.$data.classGridStyle = $this.$store.getters.getclassGridStyleInfo.data;
 						$this.class_attr_init();
@@ -751,6 +776,7 @@
 						});
 					}
 				} else if(clsType=='Sub'){  //鑾峰彇浠庢暟鎹被鐣岄潰鏍峰紡
+					$this.$store.state.thisEditSubName = styleName;
 					if($this.$store.getters.getSubClassGridStyleInfo){
 						$this.$data.subClassGridStyle = $this.$store.getters.getSubClassGridStyleInfo.data;
 						$this.subClass_attr_init();
@@ -890,67 +916,69 @@
 			},
 			scan_onevent(e){
 				// console.log(e.target);
-				var isflag=true;
-				for(var i in this.$data.subPanelList){
-					if(this.$data.subPanelList[i].scanCodeVal == e.target.value) 
-						isflag=false;
-				}
-				//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
-				if (isflag) {
-					uni.hideKeyboard();
-					this.$data.scanCodeVal=e.target.value;
-					var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
-					if (eventid) {
-				        var mast_req=[];
-						//涓绘暟鎹被灞炴�
-						var classattrlist = this.$data.classAttrList;  
-						for (var i = 0; i < classattrlist.length; i++) {
-							var attr = classattrlist[i].Attr;
-							for (var j = 0; j < attr.length; j++) {
-								var ar = attr[j];
-								if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
-									if(ar.Value=='璇�) ar.Value='';
-								if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-									mast_req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
-								else if(ar.Type=='甯冨皵鍊�)
-									mast_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
-								else
-									mast_req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+				if(e.target.value){
+					var isflag=true;
+					for(var i in this.$data.subPanelList){
+						if(this.$data.subPanelList[i].scanCodeVal == e.target.value) 
+							isflag=false;
+					}
+					//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
+					if (isflag) {
+						uni.hideKeyboard();
+						this.$data.scanCodeVal=e.target.value;
+						var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+						if (eventid) {
+							var mast_req=[];
+							//涓绘暟鎹被灞炴�
+							var classattrlist = this.$data.classAttrList;  
+							for (var i = 0; i < classattrlist.length; i++) {
+								var attr = classattrlist[i].Attr;
+								for (var j = 0; j < attr.length; j++) {
+									var ar = attr[j];
+									if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+										if(ar.Value=='璇�) ar.Value='';
+									if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+										mast_req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+									else if(ar.Type=='甯冨皵鍊�)
+										mast_req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+									else
+										mast_req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+								}
 							}
+							var req=[];
+							//瀛愭暟鎹被灞炴�
+							var attrlist = this.$data.subClassAttrList;
+							for (var i = 0; i < attrlist.length; i++) { 
+								var attr = attrlist[i].Attr;
+								for (var j = 0; j < attr.length; j++) {
+									var ar = attr[j];
+									if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
+										if(ar.Value=='璇�) ar.Value='';
+									if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
+										req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
+									else if(ar.Type=='甯冨皵鍊�)
+										req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
+									else
+										req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
+								}
+							}
+							var info = {
+								eventid: eventid,
+								edtype: '7',//"0",
+								projectid: '',
+								rclsid: '',
+								robjid: '',
+								userlogin: '',
+								clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
+								objid: "",
+								attr: req,
+								mast_attr: mast_req,
+								inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
+							}
+							
+							this.scan_DataObjRunCustomEvent(info, "");
 						}
-				        var req=[];
-				        //瀛愭暟鎹被灞炴�
-						var attrlist = this.$data.subClassAttrList;
-				        for (var i = 0; i < attrlist.length; i++) { 
-				        	var attr = attrlist[i].Attr;
-				        	for (var j = 0; j < attr.length; j++) {
-				        		var ar = attr[j];
-				        		if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
-				        			if(ar.Value=='璇�) ar.Value='';
-				        		if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
-				        			req.push({ attr: ar.Name, value: ar.ValID ?ar.ValID :'' });
-				        		else if(ar.Type=='甯冨皵鍊�)
-									req.push({ attr: ar.Name, value: ar.Value?'1':'0'});
-				        		else
-				        			req.push({ attr: ar.Name, value: ar.Value ?ar.Value :''});
-				        	}
-				        }
-				        var info = {
-				            eventid: eventid,
-				            edtype: '7',//"0",
-				            projectid: '',
-				            rclsid: '',
-				            robjid: '',
-				            userlogin: '',
-				            clsid: 'MBOX',//this.$data.param.Sub_Cls.ID,
-				            objid: "",
-				            attr: req,
-							mast_attr: mast_req,
-							inputParamter:[{ attr: 'input_3037', value: this.$data.scanCodeVal }]
-				        }
-						
-				        this.scan_DataObjRunCustomEvent(info, "");
-				    }
+					}
 				}
 			},
 			onarrow(index,open){

--
Gitblit v1.9.1