From 34187dc1b0ffa83511a55e35e14f2e10afee6bf7 Mon Sep 17 00:00:00 2001
From: jt <jt@activesoft.com>
Date: 星期一, 15 八月 2022 10:04:53 +0800
Subject: [PATCH] test
---
pages/modal/classAttr.vue | 153 ++++++++++++++++++++++++++++++--------------------
1 files changed, 92 insertions(+), 61 deletions(-)
diff --git a/pages/modal/classAttr.vue b/pages/modal/classAttr.vue
index 6cdca4b..6338c80 100644
--- a/pages/modal/classAttr.vue
+++ b/pages/modal/classAttr.vue
@@ -170,10 +170,8 @@
<template>
<view class="content">
-
-
<view class="v-area" v-for="(classattr,index) in classAttrList">
- <div class="class_attr_title">
+ <div class="class_attr_title" style="display: none;">
<div class="title_line"></div>
<div class="title_icon" :style="{'background-color':classattr.BkColor}">
<i class="ace-icon fa" :class="classattr.ImgFontStyle"></i>
@@ -185,7 +183,7 @@
<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':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text> <!-- attr.NotEmpty=='1' -->
<div class="text-right" v-if="attr.ext_button==true">
<a @tap="classAttr_extButton(index,iindex)" ><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
@@ -201,20 +199,20 @@
<div class="text-right2" v-if="attr.ext_button==true">
<a @tap="classAttr_extButton(index,iindex)" ><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='甯冨皵鍊�" :style="{'display':attr.hidden == 'True'?'none':''}">
<checkbox-group class="check_rememberPwd" @change="oncheck" :data-ischeck="attr.Value" :data-index="index" :data-iindex="iindex" :style="{'margin-left': classattr.control_style=='宸﹀彸甯冨眬'?classattr.title_p_wdith+2 +'%':'10rpx'}">
<label>
<checkbox :value="attr.Value" :checked="attr.Value"/>
- <text>{{attr.DispName}}<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text>{{attr.DispName}}<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
</label>
</checkbox-group>
</view>
<view class="form-group" v-if="attr.Type=='鏃ユ湡' || attr.Type=='鏃堕棿'" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}">
<view class="picker">{{attr.Value}}</view>
</picker>
@@ -224,12 +222,12 @@
<picker mode="date" :value="attr.Value" @change="ondateTime" class="date_iput attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) +'%'}">
<view class="picker">{{attr.Value}}</view>
</picker>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='瀛楀吀' || attr.Type=='瀛楀吀-瀛楃涓�" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<picker class="section_iput" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}">
<label class="">{{ attr.Value }}</label>
</picker>
@@ -239,12 +237,12 @@
<picker class="section_iput attr_field" @change="onchange" :range="attr.dictitem" range-key="CN_S_NAME" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) +'%'}">
<label class="">{{ attr.Value }}</label>
</picker>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)' || attr.Type=='寮曠敤瀵硅薄(澶氫釜)'" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<div class="text-right" v-if="attr.Type=='寮曠敤瀵硅薄(鍗曚釜)'">
<a @tap="classAttr_AddRef" :data-classid="attr.RelCls.split('|')[0]" :data-classname="attr.RelCls.split('|')[1]" ><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
@@ -268,12 +266,12 @@
</picker>
<a class="class_attr_add_ref"><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='寮曠敤浜哄憳'" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<div class="text-right">
<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
@@ -285,12 +283,12 @@
<div class="text-right2">
<a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='寮曠敤椤圭洰'" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<div class="text-right">
<a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
@@ -302,36 +300,36 @@
<div class="text-right2">
<a class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i class="ace-icon fa fa-plus-circle"></i></a>
</div>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='缂栫爜'" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" :readonly="attr.edit=='Flase'?true:false" >
</view>
<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
<input type="text" class="attr_field" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) +'%'}" :readonly="attr.edit=='Flase'?true:false" >
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
<view class="form-group" v-if="attr.Type=='鐪佸競鍖�" :style="{'display':attr.hidden == 'True'?'none':''}">
<view v-if="classattr.control_style=='涓婁笅甯冨眬'">
- <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i></text>
+ <text class="tx_title">{{attr.DispName}}:<i class="i_tishi" v-if="attr.notempty==true">*</i></text>
<pickerAddress class="date_iput" @change="addresschange" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}" >{{attr.Value}}</pickerAddress>
</view>
<view v-if="classattr.control_style=='宸﹀彸甯冨眬'">
<p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
<pickerAddress class="date_iput attr_field" @change="addresschange" :data-index="index" :data-iindex="iindex" :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.NotEmpty=='1'?10:5) +'%'}">{{attr.Value}}</pickerAddress>
- <i class="i_tishi" v-if="attr.NotEmpty=='1'">*</i>
+ <i class="i_tishi" v-if="attr.notempty==true">*</i>
</view>
</view>
</div>
</div>
- <button type="default" @tap="sava" class="btn_add">鏂板</button>
+ <button type="default" @tap="sava" class="btn_add">{{title}}</button>
</view>
</view>
</template>
@@ -358,12 +356,23 @@
}
},
onLoad(options) {
+ // console.log(options);
+ uni.setNavigationBarTitle({ title: options.titlename}); //璁剧疆椤堕儴鏍囬
var param = JSON.parse(options.param);
+ this.$data.title = param.Add_BtnName?param.Add_BtnName:options.titlename; //璁剧疆鎸夐挳鏂囧瓧
// console.log(param);
+ if(!param.EditDlgMode){
+ uni.showModal({title:"鎻愮ず",content:"璇ュ姛鑳界偣鏈厤缃紪杈戠獥鍙ｏ紝璇烽噸鏂伴厤缃紒",showCancel:false,confirmText:"鍙栨秷"});
+ return;
+ }
+ if(!param.Edit_dlg.Name){
+ uni.showModal({title:"鎻愮ず",content:"璇ュ姛鑳界偣鏈厤缃獥鍙ｆ牱寮忥紝璇烽噸鏂伴厤缃紒",showCancel:false,confirmText:"鍙栨秷"});
+ return;
+ }
this.$data.param = param;
var edit_dlg = {
- Model: param.EditDlgMode,
- Name: param.Edit_dlg.Name
+ Model: param.EditDlgMode,
+ Name: param.Edit_dlg.Name
}
var dataInfo = {
class_id: param.clsid
@@ -389,7 +398,6 @@
// console.log(ex);
uni.showModal({title:"閿欒1.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
});
-
},
methods: {
@@ -419,7 +427,7 @@
uni.showModal({title:"閿欒1.2",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
}
}).catch(ex=>{
- // console.log(ex);
+ console.log(ex);
uni.showModal({title:"閿欒1.3",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
});
}
@@ -440,12 +448,13 @@
this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=e.target.value;
},
onchange(e) {
- // console.log(e.target);
+ console.log(e.target);
var value=this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].dictitem[e.target.value];
var data_attr = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']];
- // console.log(data_attr);
+ console.log(data_attr);
if (value.Name != data_attr.Value) {
this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value=value.Name;
+ console.log(this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].Value);
var eventid = this.$data.classAttrList[e.target.dataset['index']].Attr[e.target.dataset['iindex']].action;
if (eventid) {
// self.event_no_sub = 1;
@@ -670,17 +679,16 @@
this.add();
},
add(){
+ uni.showLoading({
+ title:"鍔犺浇涓�.."
+ });
var req=[];
var attrlist = this.$data.classAttrList;
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.NotEmpty=='1'){
- uni.showModal({title:"鎻愮ず",content:'瀛楁锛�+ar.Name+'锛屽�涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
- return;
- }
- if(ar.Value=='璇烽�鎷�) ar.Value='';
+ if(ar.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
if(ar.Value=='璇�) ar.Value='';
if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
@@ -689,6 +697,14 @@
req.push({ name: ar.Name, value: ar.Value?'1':'0'});
else
req.push({ name: ar.Name, value: ar.Value ?ar.Value :''});
+
+ if ((ar.NotEmpty == '1' || ar.notempty == true) && !ar.Value) {
+ // if(ar.notEmpty=='1'){
+ uni.hideLoading();
+ // uni.showToast({title:ar.DispName+'涓嶈兘涓虹┖锛�,icon:"success",duration:3000});
+ uni.showModal({title:"鎻愮ず",content:ar.DispName+'涓嶈兘涓虹┖锛�,showCancel:false,confirmText:"鍙栨秷"});
+ return;
+ }
}
}
var enviroment = {
@@ -710,14 +726,23 @@
console.log(dataInfo);
this.$store.dispatch('addclassattr',dataInfo).then(success=>{
console.log(success);
+ uni.hideLoading();
if (success.code=='00000') {
+ var action = JSON.parse(success.data.Action);
+ if(action.ret=='0'){
+ if(action.result_type=='0'){
+ uni.showToast({title:action.result,icon:"success",duration:3000});
+ }
+ // "{"ret":0, "result_type":0, "result":"鍒涘缓鎴愬姛123123123","info":""}"
+ }
this.class_attr_init();
}else{
- uni.showModal({title:"閿欒5",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"閿欒",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
}
}).catch(ex=>{
- // console.log(ex);
- uni.showModal({title:"閿欒5.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+ console.log(ex);
+ uni.hideLoading();
+ uni.showModal({title:"鎻愮ず",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
});
},
class_attr_init(){
@@ -745,7 +770,7 @@
ca.before_click_button = attrs[j].before_click_button;
ca.button_callback = attrs[j].button_callback;
ca.hidden = attrs[j].hidden;
- attr.push(ca);
+ ca.Value ="";
if(ca.dictitem){
// var dictitem=ca.dictitem;
// var dictitemlist=[];
@@ -753,7 +778,7 @@
// dictitemlist.push(dictitem[d].CN_S_NAME);
// }
// ca.dictitemlist = dictitemlist;
- ca.Value = ca.dictitem[0].CN_S_NAME;
+ ca.Value = '璇烽�鎷�;//ca.dictitem[0].CN_S_NAME;
}
if(ca.Type=='鏃ユ湡' || ca.Type=='鏃堕棿'){
var nowDate = new Date();
@@ -773,7 +798,9 @@
if(ca.Type=='鐪佸競鍖�)
ca.Value = '璇烽�鎷�;
if(ca.Type=='甯冨皵鍊�)
- ca.Value = false;
+ ca.Value = false
+
+ attr.push(ca);
}
}
}
@@ -891,25 +918,24 @@
}
console.log(val);
for (var i = 0; i < val.length; i++) {
- for (var l = 0; l < this.$data.classAttrList.Attr.length; l++) {
- var ca = this.$data.classAttrList.Attr[l];
- if (val[i].attr == ca.Name) {
- ca.value = val[i].value;
+ for (var a = 0; a < this.$data.classAttrList.length; a++) {
+ for (var l = 0; l < this.$data.classAttrList[a].Attr.length; l++) {
+ var ca = this.$data.classAttrList[a].Attr[l];
+ if (val[i].attr == ca.Name) {
+ if(ca.Type=='瀛楀吀' || ca.Type=='瀛楀吀-瀛楃涓�){
+ var dictItemList=[];
+ for(var d in val[i].choice_list){
+ var val =val[i].choice_list[d];
+ dictItemList.push({"CN_S_NAME":val,"Name":val});
+ }
+ ca.dictitem = dictItemList;
+ // attr[j].dictitem = val[i].choice_list;
+ }else{
+ // ca.value = val[i].value;
+ }
+ }
}
}
- // if ($el_attr.data('type') == 'bool') {
- // $el_attr.prop('checked', val[i].value == 'Y' || val[i].value == 'y' || val[i].value == '1')
- // }
- // else {
- // if (val[i].choice_list) {
- // $el_attr.empty();
- // val[i].choice_list.forEach(function (list) {
- // $el_attr.append('<option value="' + list + '">' + list + '</option>');
- // })
- // }
- // $el_attr.val(val[i].value);
- // }
- // $el_attr.data('val', val[i].value);
var length = 0;
if (!this.$data.refdatastore.filter(function (s) {
@@ -928,7 +954,7 @@
}
}
}
- if (action_type = 'open_select_userdlg') {
+ if (action_type == 'open_select_userdlg') {
uni.showModal({title:"閿欒2.2",content:"open_select_userdlg杩欎釜action_type杩樻湭澶勭悊锛�,showCancel:false,confirmText:"鍙栨秷"});
}
}
@@ -996,7 +1022,13 @@
for (var j = 0; j < attr.length; j++) {
if(attr[j].Name==result[i].attr){
if(attr[j].Type=='瀛楀吀' || attr[j].Type=='瀛楀吀-瀛楃涓�){
- attr[j].dictitem = result[i].choice_list;
+ var dictItemList=[];
+ for(var d in result[i].choice_list){
+ var val =result[i].choice_list[d];
+ dictItemList.push({"CN_S_NAME":val,"Name":val});
+ }
+ attr[j].dictitem = dictItemList;
+ // attr[j].dictitem = result[i].choice_list;
}
}
}
@@ -1087,7 +1119,7 @@
var attr = attrlist[i].Attr;
for (var j = 0; j < attr.length; j++) {
var ar = attr[j];
- if(ar.Value=='璇烽�鎷�) ar.Value='';
+ if(ar.Value=='璇烽�鎷� || ar.Value=='鈥斺�璇烽�鎷┾�鈥�) ar.Value='';
if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
if(ar.Value=='璇�) ar.Value='';
if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
@@ -1175,7 +1207,6 @@
var attr = attrlist[i].Attr;
for (var j = 0; j < attr.length; j++) {
var ar = attr[j];
- if(ar.Value=='璇烽�鎷�) ar.Value='';
if(ar.Type=='寮曠敤瀵硅薄(澶氫釜)')
if(ar.Value=='璇�) ar.Value='';
if(ar.Type=='寮曠敤浜哄憳' || ar.Type=='寮曠敤椤圭洰')
@@ -1344,14 +1375,14 @@
}
}
}else{
- uni.showModal({title:"閿欒5.2",content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"鎻愮ず5.2",content: '璋冪敤 before_click_button 鑴氭湰杩斿洖绌猴紝event_id' + eventid,showCancel:false,confirmText:"鍙栨秷"});
}
}else{
uni.showModal({title:"閿欒5",content:success.msg,showCancel:false,confirmText:"鍙栨秷"});
}
}).catch(ex=>{
// console.log(ex);
- uni.showModal({title:"閿欒5.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
+ uni.showModal({title:"鎻愮ず5.1",content:ex.errMsg,showCancel:false,confirmText:"鍙栨秷"});
});
},
--
Gitblit v1.9.1