From bcd40d20e4938069384573f6dfbbe8c7fe978925 Mon Sep 17 00:00:00 2001 From: cyy <cuiqian2004@163.com> Date: 星期六, 03 八月 2024 13:19:32 +0800 Subject: [PATCH] dictdict --- pages/modal/3018_2.vue | 1059 ++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 688 insertions(+), 371 deletions(-) diff --git a/pages/modal/3018_2.vue b/pages/modal/3018_2.vue index d460002..483a96a 100644 --- a/pages/modal/3018_2.vue +++ b/pages/modal/3018_2.vue @@ -1,125 +1,138 @@ <template> <view class="uni-page-modal-3018-2"> - <!-- 琛ㄥご鏍峰紡 --> - <uni-forms ref="baseForm" label-align="right"> - <view class="v-headStyle" v-for="(item,index) in head_styledef.form.items"> - <!-- 鏅�甯冨眬 --> - <uni-forms-item v-if="item.name != 'Layout'&& item.show==true" :label="item.label +'锛� " - :label-width="item.labelWidth+'px'"> - <!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> --> - <span class="form-item-span" v-if="item.disabled" - :style="'width: calc(100% - '+item.labelWidth+'px);'">{{item.value}}</span> - <!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections--> - <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled" - :style="'width: calc(100% - '+item.labelWidth-10+'px);'" - :class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict" - @change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select> - <!-- 鏂囨湰妗�鏁板瓧妗�--> - <view class="input-wrapper" - v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled"> - <text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]" - @change="classAttr_extButton(item)"></text> - <input class="uni-input" :class="item.disabled?'input-disabled':''" - :type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'" - v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder" - :style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}" - :focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)" - @blur="onevent(item)" /> - <text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]" - @click="classAttr_extButton(item)"></text> - </view> - <!-- 澶氳鏂囨湰 --> - <view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled"> - <textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value" - :focus="focusFieldId == item.fieldId" :placeholder="item.placeholder" - @blur="onModelValue(item)" @click="onClick(item)" :data-index="index" style="height:60px;" - :style="{'width':'96%'}" :disabled="item.disabled"></textarea> + <view class="view-content"> + <!-- 琛ㄥご鏍峰紡 --> + <uni-forms ref="baseForm" label-align="right"> + <view class="v-headStyle" v-for="(item,index) in head_styledef.form.items"> + <!-- 鏅�甯冨眬 --> + <uni-forms-item class="head-form" v-if="item.name != 'Layout'&& item.show==true" + :label="item.label +'锛� " :label-width="item.labelWidth+'px'"> + <!-- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> --> + <span class="form-item-span" v-if="item.disabled" + :style="'width: calc(100% - '+item.labelWidth+'px);'">{{item.value}}</span> + <!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections--> + <uni-data-select id="dv_select" v-if="item.name=='Select' && !item.disabled" + :style="'width: calc(100% - '+item.labelWidth-10+'px);'" + :class="item.disabled?'input-disabled':''" v-model="item.value" :localdata="item.dict" + @change="onchange(item)" :disabled="item.disabled" :clear="false"></uni-data-select> + <!-- 鏂囨湰妗�鏁板瓧妗�--> + <view class="input-wrapper" + v-if="(item.name=='Input' || item.name=='InputNumber') && !item.disabled"> + <text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]" + @change="classAttr_extButton(item)"></text> + <input class="uni-input" :class="item.disabled?'input-disabled':''" + :type="item.name=='Input'?'text':item.name=='InputNumber'?'number':'text'" + v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder" + :style="{'width':item.setting.prefix && item.setting.suffix?'78%':item.setting.prefix || item.setting.suffix?'87%':'96%'}" + :focus="focusFieldId == item.fieldId" @focus="ontap(item)" @click="onClick(item)" + @blur="onevent(item)" /> + <text v-if="item.setting.suffix" class="uni-icon" :class="[item.setting.suffix]" + @click="classAttr_extButton(item)"></text> + </view> + <!-- 澶氳鏂囨湰 --> + <view class="input-wrapper" v-if="item.name=='Textarea' && !item.disabled"> + <textarea class="uni-input" :class="item.disabled?'input-disabled':''" :value="item.value" + :focus="focusFieldId == item.fieldId" :placeholder="item.placeholder" + @blur="onModelValue(item)" @click="onClick(item)" :data-index="index" + style="height:60px;" :style="{'width':'96%'}" :disabled="item.disabled"></textarea> - </view> - <!-- 澶嶉�妗�--> - <checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'" - :class="item.disabled?'input-disabled':''" @change="onModelValue(item)" - :disabled="item.disabled" :data-ischeck="item.value"> - <label> - <checkbox :value="item.value" :checked="item.value" /> - <text>{{item.label}}</text> - </label> - </checkbox-group> - <!-- Switch寮�叧 --> - <switch class="input-switch" v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''" - :disabled="item.disabled" v-model="item.value" @change="onModelValue(item)" /> - <!-- 鏃ユ湡鏃堕棿 --> - <view class="input-wrapper" - v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled"> - <picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''" - :disabled="item.disabled" :value="item.value" @change="onModelValue(item)"> - <view class="picker">{{item.value}}</view> - </picker> - </view> - </uni-forms-item> - <!-- 鏍呮牸甯冨眬 --> - <uni-row class="demo-uni-row" v-if="item.name=='Layout' && item.show==true"> - <uni-col v-for="(cols,key) in item.setting.colList" - :span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col"> - <uni-forms-item v-if="cols!=null" :label="col.label +'锛�" :label-width="col.labelWidth+'px'"> - <!-- <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> --> - <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span> - <view class="input-wrapper" - v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled"> - <text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]" - @change="onchange(cols)"></text> - <input class="uni-input" :class="cols.disabled?'input-disabled':''" - :type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'" - v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder" - :style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}" - :focus="focusFieldId == cols.fieldId" @focus="ontap(cols)" @click="onClick(cols)" - @blur="onevent(cols)" /> - <text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]" - @click="onchange(cols)"></text> - </view> - <!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections--> - <uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled" - :class="cols.disabled?'input-disabled':''" v-model="cols.value" :localdata="cols.dict" - @change="onchange(cols)" :disabled="cols.disabled" :clear="false"></uni-data-select> - <!-- 澶氳鏂囨湰 --> - <view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled"> - <textarea class="uni-input" :value="cols.value" - :class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder" - :focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)" - @click="onClick(cols)" style="height:60px;" :style="{'width':'96%'}" - :disabled="cols.disabled"></textarea> - </view> - <!-- 澶嶉�妗�--> - <checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'" - :class="cols.disabled?'input-disabled':''" :disabled="item.disabled" - @change="onModelValue(cols)" :data-ischeck="cols.value" - :style="{'margin-left':'10rpx'}"> - <label> - <checkbox :value="cols.value" :checked="cols.value" /> - <text>{{cols.label}}</text> - </label> - </checkbox-group> - <!-- Switch寮�叧 --> - <switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''" - :disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)" - :style="{'margin-left':'10rpx'}" /> - <!-- 鏃ユ湡鏃堕棿 --> - <view class="input-wrapper" - v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled"> - <picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''" - :disabled="item.disabled" :value="cols.value" @change="onModelValue(cols)"> - <view class="picker">{{cols.value}}</view> - </picker> - </view> + </view> + <!-- 澶嶉�妗�--> + <checkbox-group class="check_rememberPwd" v-if="item.name=='Checkbox'" + :class="item.disabled?'input-disabled':''" @change="onModelValue(item)" + :disabled="item.disabled" :data-ischeck="item.value"> + <label> + <checkbox :value="item.value" :checked="item.value" /> + <text>{{item.label}}</text> + </label> + </checkbox-group> + <!-- Switch寮�叧 --> + <switch class="input-switch" v-if="item.name=='Switch'" + :class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value" + @change="onModelValue(item)" /> + <!-- 鏃ユ湡鏃堕棿 --> + <view class="input-wrapper" + v-if="(item.name=='TimePicker' || item.name=='DatePicker') && !item.disabled"> + <picker mode="date" class="date_iput" :class="item.disabled?'input-disabled':''" + :disabled="item.disabled" :value="item.value" @change="onModelValue(item)"> + <view class="picker">{{item.value}}</view> + </picker> + </view> + </uni-forms-item> + <!-- 鏍呮牸甯冨眬 --> + <uni-row class="demo-uni-row" v-if="item.name=='Layout' && item.show==true"> + <uni-col v-for="(cols,key) in item.setting.colList" + :span="item.setting.spanList?item.setting.spanList[key]:24 / item.setting.col"> + <uni-forms-item class="head-form" v-if="cols!=null" :label="cols.label +'锛�" + :label-width="cols.labelWidth+'px'"> + <!-- <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> --> + <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span> + <view class="input-wrapper" + v-if="(cols.name=='Input' || cols.name=='InputNumber') && !cols.disabled"> + <text v-if="cols.setting.prefix" class="uni-icon" :class="[cols.setting.prefix]" + @change="onchange(cols)"></text> + <input class="uni-input" :class="cols.disabled?'input-disabled':''" + :type="cols.name=='Input'?'text':cols.name=='InputNumber'?'number':'text'" + v-model="cols.value" :disabled="cols.disabled" :placeholder="cols.placeholder" + :style="{'width':cols.setting.prefix && cols.setting.suffix?'78%':cols.setting.prefix || cols.setting.suffix?'87%':'96%'}" + :focus="focusFieldId == cols.fieldId" @focus="ontap(cols)" + @click="onClick(cols)" @blur="onevent(cols)" /> + <text v-if="cols.setting.suffix" class="uni-icon" :class="[cols.setting.suffix]" + @click="onchange(cols)"></text> + </view> + <!-- 涓嬫媺妗�鍗曢� cols.useDict?cols.dict:cols.selections--> + <uni-data-select id="dv_select" v-if="cols.name=='Select' && !cols.disabled" + :class="cols.disabled?'input-disabled':''" v-model="cols.value" + :localdata="cols.dict" @change="onchange(cols)" :disabled="cols.disabled" + :clear="false"></uni-data-select> + <!-- 澶氳鏂囨湰 --> + <view class="input-wrapper" v-if="cols.name=='Textarea' && !cols.disabled"> + <textarea class="uni-input" :value="cols.value" + :class="cols.disabled?'input-disabled':''" :placeholder="cols.placeholder" + :focus="focusFieldId == cols.fieldId" @blur="onModelValue(cols)" + @click="onClick(cols)" style="height:60px;" :style="{'width':'96%'}" + :disabled="cols.disabled"></textarea> + </view> + <!-- 澶嶉�妗�--> + <checkbox-group class="check_rememberPwd" v-if="cols.name=='Checkbox'" + :class="cols.disabled?'input-disabled':''" :disabled="item.disabled" + @change="onModelValue(cols)" :data-ischeck="cols.value" + :style="{'margin-left':'10rpx'}"> + <label> + <checkbox :value="cols.value" :checked="cols.value" /> + <text>{{cols.label}}</text> + </label> + </checkbox-group> + <!-- Switch寮�叧 --> + <switch v-if="cols.name=='Switch'" :class="cols.disabled?'input-disabled':''" + :disabled="item.disabled" v-model="cols.value" @change="onModelValue(cols)" + :style="{'margin-left':'10rpx'}" /> + <!-- 鏃ユ湡鏃堕棿 --> + <view class="input-wrapper" + v-if="(cols.name=='TimePicker' || cols.name=='DatePicker') && !cols.disabled"> + <picker mode="date" class="date_iput" :class="cols.disabled?'input-disabled':''" + :disabled="item.disabled" :value="cols.value" @change="onModelValue(cols)"> + <view class="picker">{{cols.value}}</view> + </picker> + </view> - </uni-forms-item> - </uni-col> - </uni-row> + </uni-forms-item> + </uni-col> + </uni-row> + </view> + </uni-forms> + </view> + <view class="view-bottom"> + <view class="uni-padding-wrap" v-if="dropdownBtns.length>0"> + <view class="uni-btn-v"> + <a @tap="clickDropdownBtns"> + <Icon class="mobox-normal-more" /> + </a> + </view> </view> - </uni-forms> - <view class="view-floor"> - <button type="default" @tap="sava" class="btn_add">{{title}}</button> + <button type="default" @tap="sava" class="btn_add" v-if="dropdownBtns.length==0">{{title}}</button> <button type="default" @tap="cancel" class="btn_cancel">{{translateSys('cancel')}}</button> + </view> <!-- 鏅�寮圭獥 top bottom center left right --> <view> @@ -240,6 +253,12 @@ .titlename; //璁剧疆鎸夐挳鏂囧瓧 this.loadData(options.paramValue) }, + computed: { + dropdownBtns() { + const btns = this.head_styledef.button || []; + return btns + }, + }, methods: { setData: function(obj) { @@ -292,7 +311,6 @@ }) } - console.log(this.$data.param); }, async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮�@@ -301,7 +319,7 @@ class_id: class_id, ui_style_id: style_id, }; - this.$store.dispatch('UIStyleGetInfo', dataInfo).then(ret => { + this.$store.dispatch('UIStyleGetInfo', dataInfo).then(async(ret) => { // console.log(ret); if (ret.err_code == 0) { var styledef = ""; @@ -313,23 +331,58 @@ .result .style_def); } - $this.$data.head_styledef = ret.result.style_def ? JSON.parse(styledef) : {}; - // console.log($this.$data.head_styledef); - $this.head_styledef.form.items.forEach(async (ele, index) => { - ele.show = true; - if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀 - await this.DictGetInfo(ele.bind.dict, index, 'mast'); - } - if ($this.focusFieldId == "") { - if (ele.name == 'Input' || ele.name == 'InputNumber' || ele.name == - 'Textarea') { - $this.setData({ - focusFieldId: ele.fieldId - }) + const styledefHead = styledef ? JSON.parse(styledef) : {}; + for (let i in styledefHead.form.items) + { + const ele = styledefHead.form.items[i] + if (ele.name != "Layout") { + ele.show = true + if (ele?.useDict) { + //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀 + await $this.DictGetInfo(ele.bind.dict, + styledefHead.form.model, + ele); + } + if ($this.focusFieldId == "") { + if (ele.name == 'Input' || ele.name == + 'InputNumber') { + $this.setData({ + focusFieldId: ele.fieldId + }) + } + } + } else { + for (let j in ele.setting.colList) + { + const col = ele.setting.colList[j] + + if (col) { + col.show = true + if (col?.useDict) { + //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀 + await $this.DictGetInfo(col.bind + .dict, + styledefHead.form + .model, col); + } + if ($this.focusFieldId == "") { + if (col.name == 'Input' || col + .name == + 'InputNumber') { + $this.setData({ + focusFieldId: col + .fieldId + }) + } + } + } } } - - }); + } + $this.setData({ + head_styledef: styledefHead + }) + if ($this.head_styledef.event?.length > 0) { $this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢 if (a.event_id == "initial") { @@ -362,51 +415,35 @@ }); }, - async DictGetInfo(dict, index, type) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�- this.data = []; + async DictGetInfo(dict, formModel, formItem) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+ var $this = this; var dataInfo = { dict_id: dict.id, dict_name: dict.name }; - // console.log(dataInfo); - this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => { - console.log(success); - if (success.err_code == 0) { - if (type == 'mast') { - var list = []; - var itemName = ''; - success.result.dict_item_list.forEach((item) => { - if (item.is_default == '1') - itemName = item.name; - list.push({ - text: item.value, - value: item.name, - }); - }); - //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ� - if (itemName) { - $this.head_styledef.form.items[index].value = itemName; - var attr = $this.head_styledef.form.items[index].fieldId; - $this.head_styledef.form.model[attr] = itemName; - } - $this.head_styledef.form.items[index].dict = list; - // $this.head_styledef.form.items[index].dictitem=success.result; - // this.$store.commit("classAttrList", $this.$data.classAttrList); - } else { - // $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result; - // this.$store.commit("subClassAttrList", $this.$data.subClassAttrList); - } - - } else { - uni.showModal({ - title: this.translateSys("error") + "1.2", - content: success.err_msg, - showCancel: false, - confirmText: this.translateSys("cancel") + try { + const res = await this.getDictInfo(dataInfo) + var list = []; + var itemName = ''; + res.result.dict_item_list.forEach((item) => { + if (item.is_default == '1') + itemName = item.name; + list.push({ + text: item.value, + value: item.name, }); + }); + //鏈夐粯璁ゅ�锛屾樉绀洪粯璁ゅ� + if (itemName) { + formItem.value = itemName; + formModel[formItem.fieldId] = itemName; } - }).catch(ex => { + formItem.dict = list; + + // $this.head_styledef.form.items[index].dictitem=success.result; + // this.$store.commit("classAttrList", $this.$data.classAttrList); + } catch (ex) { // console.log(ex); uni.showModal({ title: this.translateSys("error") + "1.3", @@ -414,7 +451,36 @@ showCancel: false, confirmText: this.translateSys("cancel") }); - }); + } + }, + getDictInfo(info) { //Mobox3寰楀埌寰楀埌瀛楀吀淇℃伅瀛楀吀椤瑰垪琛�+ const loginInfo = this.$store.getters.loginid + const mobxoSApi = this.$store.getters.getMobxoSApi + return new Promise((resolve, reject) => { + uni.request({ + url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id, + data: info, + method: 'POST', + dataType: "json", + success: (_res) => { + // console.log(_res); + const ret = _res.data + if (ret.err_code == 0) { + resolve(ret); + } else { + reject({ + "errMsg": ret.err_msg + }); + } + }, + fail: (err) => { + // console.log(err); + reject(err); + } + }) + + }) + }, async loadInitEvent(eventid) { var $this = this; @@ -448,13 +514,15 @@ }); } else uni.showModal({ title: this.translateSys("tip"), - content: tip + ',' + this.translateSys('tip') + ':' + data.ret, + content: tip + ',' + this.translateSys('tip') + ':' + data + .ret, showCancel: false, confirmText: this.translateSys("cancel") }); return false } else { - var tip = data.info ? typeof data.info == 'string' ? data.info : data.info + var tip = data.info ? typeof data.info == 'string' ? data.info : data + .info .join( '<br/>') : ''; if (tip) uni.showModal({ @@ -493,13 +561,15 @@ } else if (attr.name == 'Layout') { attr.setting.colList.forEach(col => { if (col) { - if (col.fieldId == result[i] + if (col.fieldId == result[ + i] .attr) { var dictItemList = []; for (var d in result[i] .choice_list) { var val = result[i] - .choice_list[d]; + .choice_list[ + d]; dictItemList.push({ "CN_S_NAME": val, "CN_S_VALUE": val, @@ -507,7 +577,8 @@ "value": val }); } - col.dict = dictItemList; + col.dict = + dictItemList; } } }); @@ -515,14 +586,17 @@ } } - for (var c = 0; c < $this.$data.head_styledef.form.items + for (var c = 0; c < $this.$data.head_styledef.form + .items .length; c++) { var attr = $this.$data.head_styledef.form.items[c]; // console.log(attr[j].Name+'=='+result[i].attr); //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�- if ($this.head_styledef.form.model[result[i].attr] == + if ($this.head_styledef.form.model[result[i] + .attr] == undefined) { - $this.head_styledef.form.model[result[i].attr] = + $this.head_styledef.form.model[result[i] + .attr] = result[i] .value; } @@ -533,7 +607,8 @@ attr.oldvalue = ''; attr.value = result[i].value; attr.oldvalue = result[i].value; - $this.head_styledef.form.model[attr.fieldId] = + $this.head_styledef.form.model[attr + .fieldId] = result[ i].value; } @@ -544,11 +619,15 @@ .attr) { col.value = ''; col.oldvalue = ''; - col.value = result[i].value; - col.oldvalue = result[i].value; - $this.head_styledef.form.model[ + col.value = result[i] + .value; + col.oldvalue = result[i] + .value; + $this.head_styledef.form + .model[ col - .fieldId] = result[i] + .fieldId] = result[ + i] .value; } } @@ -565,9 +644,11 @@ if (length == 0) { for (var j = 0; j < $this.$data.refdatastore .length; j++) { - if ($this.$data.refdatastore[j].attr == result[i] + if ($this.$data.refdatastore[j].attr == result[ + i] .attr) { - $this.$data.refdatastore[j].value = result[i] + $this.$data.refdatastore[j].value = result[ + i] .value; } } @@ -576,34 +657,36 @@ } else if (data.action[i].action_type == 'set_dlg_attr_show') { var result = action.value; result.forEach(async (attr, key) => { - $this.$data.head_styledef.form.items.forEach( - async ( - ele, index) => { - //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�- if (ele.name != 'Layout') { - if (ele.fieldId == attr - .attr) { - ele.show = attr.show; - } - } else if (ele.name == - 'Layout') { - ele.setting.colList - .forEach( - col => { - if (col) { - if (col - .fieldId == - attr - .attr - ) { - col.show = + $this.$data.head_styledef.form.items + .forEach( + async ( + ele, index) => { + //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+ if (ele.name != 'Layout') { + if (ele.fieldId == attr + .attr) { + ele.show = attr + .show; + } + } else if (ele.name == + 'Layout') { + ele.setting.colList + .forEach( + col => { + if (col) { + if (col + .fieldId == attr - .show; + .attr + ) { + col.show = + attr + .show; + } } - } - }); - } - }); + }); + } + }); }); var head_styledef = JSON.parse(JSON.stringify($this.$data .head_styledef)); @@ -616,7 +699,8 @@ content: this.translate( 'execute_init_event_failed') + this.translateSys("full_stop") + - this.translate('reason') + this.translateSys( + this.translate('reason') + this + .translateSys( "colon") + this.translateSys("quotation_mark_left") + action @@ -635,7 +719,8 @@ title: this.translateSys("error") + "3", content: this.translate('execute_init_event_failed') + this.translateSys("full_stop") + - this.translate('reason') + this.translateSys("colon") + success + this.translate('reason') + this.translateSys("colon") + + success .err_msg, showCancel: false, confirmText: this.translateSys("cancel") @@ -647,7 +732,8 @@ title: this.translateSys("error") + "3.1", content: this.translate('execute_init_event_failed') + this.translateSys("full_stop") + - this.translate('reason') + this.translateSys("colon") + ex.errMsg, + this.translate('reason') + this.translateSys("colon") + ex + .errMsg, showCancel: false, confirmText: this.translateSys("cancel") }); @@ -717,7 +803,8 @@ const ele = items[i] if (ele.name != "Layout") { - if (ele.name == 'Input' || ele.name == 'InputNumber' || ele.name == 'Textarea') { + if (ele.name == 'Input' || ele.name == 'InputNumber' || ele.name == + 'Textarea') { if (attr == ele.fieldId) { findd = true } else { @@ -734,7 +821,8 @@ } else { if (findd) { let curIndex = ele.setting.colList.findIndex((col, index2, arr) => { - return (col.name == 'Input' || col.name == 'InputNumber' || col.name == + return (col.name == 'Input' || col.name == 'InputNumber' || + col.name == 'Textarea'); }) if (curIndex > -1) { @@ -751,7 +839,8 @@ }) if (curIndex > -1) { findd = true - let curIndex2 = ele.setting.colList.findIndex((col, index2, arr) => { + let curIndex2 = ele.setting.colList.findIndex((col, index2, + arr) => { return (col.name == 'Input' || col.name == 'InputNumber' || col.name == 'Textarea') && index2 > @@ -894,7 +983,8 @@ // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴� this.$refs.popup.open($this.popupType); - this.DataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id, item); + this.DataObjRunCustomEvent_Return(onSuffixClickCallbackEvent.id, '', onSuffixClickEvent.id, + item); }, popupChange(e) { console.log('褰撳墠妯″紡锛� + e.type + ',鐘舵�锛� + e.show); @@ -1041,7 +1131,8 @@ if (success.err_code == 0) { var data = success.result; if (data.ret != 0) { - var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : + var tip = data.err_info ? typeof data.err_info == 'string' ? data + .err_info : data .err_info.join('<br/>') : ''; if (data.ret == 801) { @@ -1057,13 +1148,15 @@ }); } else uni.showModal({ title: this.translateSys("tip"), - content: tip + ',' + this.translateSys('tip') + ':' + data.ret, + content: tip + ',' + this.translateSys('tip') + ':' + data + .ret, showCancel: false, confirmText: this.translateSys("cancel") }); return false } else { - var tip = data.info ? typeof data.info == 'string' ? data.info : data.info + var tip = data.info ? typeof data.info == 'string' ? data.info : data + .info .join( '<br/>') : ''; if (tip) uni.showModal({ @@ -1102,13 +1195,15 @@ } else if (attr.name == 'Layout') { attr.setting.colList.forEach(col => { if (col) { - if (col.fieldId == result[i] + if (col.fieldId == result[ + i] .attr) { var dictItemList = []; for (var d in result[i] .choice_list) { var val = result[i] - .choice_list[d]; + .choice_list[ + d]; dictItemList.push({ "CN_S_NAME": val, "CN_S_VALUE": val, @@ -1116,7 +1211,8 @@ "value": val }); } - col.dict = dictItemList; + col.dict = + dictItemList; } } }); @@ -1124,14 +1220,17 @@ } } - for (var c = 0; c < $this.$data.head_styledef.form.items + for (var c = 0; c < $this.$data.head_styledef.form + .items .length; c++) { var attr = $this.$data.head_styledef.form.items[c]; // console.log(attr[j].Name+'=='+result[i].attr); //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�- if ($this.head_styledef.form.model[result[i].attr] == + if ($this.head_styledef.form.model[result[i] + .attr] == undefined) { - $this.head_styledef.form.model[result[i].attr] = + $this.head_styledef.form.model[result[i] + .attr] = result[i] .value; } @@ -1142,20 +1241,26 @@ attr.oldvalue = ''; attr.value = result[i].value; attr.oldvalue = result[i].value; - $this.head_styledef.form.model[attr.fieldId] = + $this.head_styledef.form.model[attr + .fieldId] = result[i] .value; } } else if (attr.name == 'Layout') { attr.setting.colList.forEach(col => { if (col) { - if (col.fieldId == result[i].attr) { + if (col.fieldId == result[i] + .attr) { col.value = ''; col.oldvalue = ''; - col.value = result[i].value; - col.oldvalue = result[i].value; - $this.head_styledef.form.model[col - .fieldId] = result[i].value; + col.value = result[i] + .value; + col.oldvalue = result[i] + .value; + $this.head_styledef.form + .model[col + .fieldId] = result[ + i].value; } } }); @@ -1169,10 +1274,13 @@ $this.$data.refdatastore.push(result[i]); } if (length == 0) { - for (var j = 0; j < $this.$data.refdatastore.length; j++) { - if ($this.$data.refdatastore[j].attr == result[i] + for (var j = 0; j < $this.$data.refdatastore + .length; j++) { + if ($this.$data.refdatastore[j].attr == result[ + i] .attr) { - $this.$data.refdatastore[j].value = result[i] + $this.$data.refdatastore[j].value = result[ + i] .value; } } @@ -1181,30 +1289,36 @@ } else if (action.action_type == 'set_dlg_attr_show') { var result = action.value; result.forEach(async (attr, key) => { - $this.$data.head_styledef.form.items.forEach( - async (ele, - index) => { - //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�- if (ele.name != 'Layout') { - if (ele.fieldId == attr.attr) { - ele.show = attr.show; + $this.$data.head_styledef.form.items + .forEach( + async (ele, + index) => { + //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�+ if (ele.name != 'Layout') { + if (ele.fieldId == attr + .attr) { + ele.show = attr + .show; + } + } else if (ele.name == + 'Layout') { + ele.setting.colList + .forEach( + col => { + if (col) { + if (col + .fieldId == + attr + .attr + ) { + col.show = + attr + .show; + } + } + }); } - } else if (ele.name == 'Layout') { - ele.setting.colList.forEach( - col => { - if (col) { - if (col - .fieldId == - attr - .attr) { - col.show = - attr - .show; - } - } - }); - } - }); + }); }); var head_styledef = JSON.parse(JSON.stringify($this.$data .head_styledef)); @@ -1216,10 +1330,12 @@ } else { uni.showModal({ title: this.translateSys("tip"), - content: this.translateSys("quotation_mark_left") + + content: this.translateSys( + "quotation_mark_left") + action .action_type + this.translateSys( - "quotation_mark_right") + this.translate( + "quotation_mark_right") + this + .translate( "tip_action_unprocessed"), showCancel: false, confirmText: this.translateSys("cancel") @@ -1235,11 +1351,14 @@ if (data.result) { var result = data.result; for (var i = 0; i < result.length; i++) { - for (var c = 0; c < $this.$data.head_styledef.form.items.length; c++) { + for (var c = 0; c < $this.$data.head_styledef.form.items + .length; c++) { var attr = $this.$data.head_styledef.form.items[c]; //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿odel閲岋紝鐐瑰嚮纭畾鎻愪氦鐨勬椂鍊欏甫涓婅繖浜涙暟鎹�- if ($this.head_styledef.form.model[result[i].attr] == undefined) { - $this.head_styledef.form.model[result[i].attr] = result[i] + if ($this.head_styledef.form.model[result[i].attr] == + undefined) { + $this.head_styledef.form.model[result[i].attr] = + result[i] .value; } //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�@@ -1249,7 +1368,8 @@ attr.oldvalue = ''; attr.value = result[i].value; attr.oldvalue = result[i].value; - $this.head_styledef.form.model[attr.fieldId] = result[i] + $this.head_styledef.form.model[attr.fieldId] = + result[i] .value; } } else if (attr.name == 'Layout') { @@ -1278,8 +1398,10 @@ } if (length == 0) { for (var j = 0; j < $this.$data.refdatastore.length; j++) { - if ($this.$data.refdatastore[j].attr == result[i].attr) { - $this.$data.refdatastore[j].value = result[i].value; + if ($this.$data.refdatastore[j].attr == result[i] + .attr) { + $this.$data.refdatastore[j].value = result[i] + .value; } } } @@ -1377,7 +1499,8 @@ if (success.err_code == 0) { var data = success.result; if (data.ret != 0) { - var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : + var tip = data.err_info ? typeof data.err_info == 'string' ? data + .err_info : data .err_info.join('<br/>') : ''; if (data.ret == 801) { @@ -1393,13 +1516,15 @@ }); } else uni.showModal({ title: this.translateSys("tip"), - content: tip + ',' + this.translateSys('tip') + ':' + data.ret, + content: tip + ',' + this.translateSys('tip') + ':' + data + .ret, showCancel: false, confirmText: this.translateSys("cancel") }); return false } else { - var tip = data.info ? typeof data.info == 'string' ? data.info : data.info + var tip = data.info ? typeof data.info == 'string' ? data.info : data + .info .join( '<br/>') : ''; if (tip) uni.showModal({ @@ -1422,10 +1547,12 @@ var d = dialog({ title: '<i class="ace-icon fa fa-info-circle"></i> ' + this.translateSys("tip"), - content: this.translateSys("quotation_mark_left") + + content: this.translateSys( + "quotation_mark_left") + action .action_type + this.translateSys( - "quotation_mark_right") + this.translate( + "quotation_mark_right") + this + .translate( "tip_action_unprocessed") }); d.show(); @@ -1440,7 +1567,8 @@ data_attr: data_attr } uni.navigateTo({ - url: '../selpsn/index?mulit=false¶m=' + JSON + url: '../selpsn/index?mulit=false¶m=' + + JSON .stringify( param), events: { @@ -1457,14 +1585,16 @@ rclsid: '', robjid: '', userlogin: '', - clsid: $this.$data.param.DataCls + clsid: $this.$data.param + .DataCls .id, objid: "", attr: param.req, inputparameter: data, dataJson: [], } - $this.DataObjRunCustomEvent(info, param + $this.DataObjRunCustomEvent(info, + param .data_attr); } } @@ -1473,10 +1603,12 @@ var d = dialog({ title: '<i class="ace-icon fa fa-info-circle"></i> ' + this.translateSys("tip"), - content: this.translateSys("quotation_mark_left") + + content: this.translateSys( + "quotation_mark_left") + action .action_type + this.translateSys( - "quotation_mark_right") + this.translate( + "quotation_mark_right") + this + .translate( "tip_action_unprocessed") }); d.show(); @@ -1484,7 +1616,8 @@ var $this = this; if (val.common_dlg_id == 'check_list') { $this.$data.check_list = val.config; - if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ if (val.config.appear_style == + 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� $this.$data.popupType = 'right'; else $this.$data.popupType = 'center' @@ -1498,7 +1631,8 @@ } $this.$data.popupParam = popupParam; } - } else if (action.action_type == 'open_project_query_dlg') { + } else if (action.action_type == + 'open_project_query_dlg') { //console.log(action.value.select_range); //console.log(action.value.mulit_select); var priRel = '-1'; @@ -1508,7 +1642,8 @@ priRel = '1'; else if (action.value.select_range == '鎴戝垱寤虹殑') priRel = '2'; - else if (action.value.select_range == '鎴戝弬涓庣殑' || action.value + else if (action.value.select_range == '鎴戝弬涓庣殑' || action + .value .select_range == '鎴戝弬鍔犵殑') priRel = '3'; else if (action.value.select_range == '鎴戝叧娉ㄧ殑') @@ -1529,7 +1664,8 @@ events: { AddPer(data, param) { var attr = param.item.fieldId; - $this.head_styledef.form.model[attr] = + $this.head_styledef.form.model[ + attr] = data[0].ID + ';' + data[0].Name; @@ -1546,14 +1682,16 @@ rclsid: "", robjid: "", userlogin: "", - clsid: $this.$data.param + clsid: $this.$data + .param .DataCls.id, objid: "", attr: param.req, dataJson: [], } - $this.DataObjRunCustomEvent(info); + $this.DataObjRunCustomEvent( + info); } } } @@ -1561,9 +1699,11 @@ } else { uni.showModal({ title: this.translateSys("tip"), - content: this.translateSys("quotation_mark_left") + + content: this.translateSys( + "quotation_mark_left") + action.action_type + this.translateSys( - "quotation_mark_right") + this.translate( + "quotation_mark_right") + this + .translate( "tip_action_unprocessed"), showCancel: false, confirmText: this.translateSys("cancel") @@ -1669,8 +1809,10 @@ if (action.ret != 0) { uni.showModal({ title: this.translateSys("tip"), - content: this.translate('execute_script_failed') + this - .translateSys('comma') + this.translate('result') + + content: this.translate('execute_script_failed') + + this + .translateSys('comma') + this.translate( + 'result') + this .translateSys('colon') + action.result, showCancel: false, @@ -1681,7 +1823,8 @@ if (action.info) { uni.showModal({ title: this.translateSys("tip"), - content: this.translate('execute_script_failed') + this + content: this.translate('execute_script_failed') + + this .translateSys('comma') + this.translateSys('colon') + action.info, showCancel: false, @@ -1708,7 +1851,8 @@ if (!this.$data.param.After_Btn_Not_Refresh) { //鍒锋柊 uni.redirectTo({ - url: '../modal/3018_2?param=' + JSON.stringify(this.$data.param) + + url: '../modal/3018_2?param=' + JSON.stringify(this.$data + .param) + "&titlename=" + this.$data.title }); } @@ -1768,7 +1912,8 @@ if (success.err_code == 0) { var data = success.result; if (data.ret != 0) { - var tip = data.err_info ? typeof data.err_info == 'string' ? data.err_info : + var tip = data.err_info ? typeof data.err_info == 'string' ? data + .err_info : data .err_info.join('<br/>') : ''; if (data.ret == 801) { @@ -1784,13 +1929,15 @@ }); } else uni.showModal({ title: this.translateSys("tip"), - content: tip + ',' + this.translateSys('tip') + ':' + data.ret, + content: tip + ',' + this.translateSys('tip') + ':' + data + .ret, showCancel: false, confirmText: this.translateSys("cancel") }); return false } else { - var tip = data.info ? typeof data.info == 'string' ? data.info : data.info + var tip = data.info ? typeof data.info == 'string' ? data.info : data + .info .join( '<br/>') : ''; if (tip) uni.showModal({ @@ -1819,6 +1966,173 @@ showCancel: false, confirmText: this.translateSys("cancel") }); + }); + }, + //鐐瑰嚮鎸夐挳鍒楄〃 + clickDropdownBtns() { + var that = this + var itemlist = []; + this.dropdownBtns.forEach((btn) => { + itemlist.push(btn.ShowName); + }); + uni.showActionSheet({ + // title: '鎸夐挳鍒楄〃', + itemList: itemlist, + success: (e) => { + console.log(e.tapIndex); + var btn = that.dropdownBtns[e.tapIndex]; + that.onButtonClicked(btn); + } + }) + }, + onButtonClicked(btn) { + let enviroment = { + button: "top", + button_name: btn.ShowName, + cls_id: btn.Cls_ID, + function: "3018", + master: {}, + }; + console.log("onBtnClick", btn); + if (btn.FunCode == "Add") { + if (btn.Edit_dlg.Model == "small") { + this.showAddSmallDialog(btn, enviroment); + } else { + uni.showModal({ + title: this.translateSys("tip"), + content: this.translateSys("unrealized"), + showCancel: false, + confirmText: this.translateSys("cancel") + }); + } + } else if (btn.FunCode == "TriggerEvent") { + this.onTriggerEvent(btn, enviroment); + } else { + this.$Message.warning(this.$t("sys.unrealized")); + } + }, + onTriggerEvent(btn, enviroment) { + var obj_attr = this.head_styledef.form.model; + // console.log(obj_attr); + var input_param = { + id: "", + attrs: Object.keys(obj_attr).map((a) => ({ + attr: a, + value: obj_attr[a], + })), + }; + + var dataInfo = { + ed_type: "0", + start_transaction: true, + class_id: btn.Cls_ID, + class_name: '', + event_id: btn.Event.ID, + event_name: '', + data_obj_id: '', + obj_attr: obj_attr, + prj_id: '', + ref_cls_id: '', + rel_obj_id: '', + user_login: '', + data_json: '', + compose_info: '', + input_param: '', + }; + console.log(dataInfo); + // return; + this.$store.dispatch('runCustomEvent', dataInfo).then(success => { + console.log(success); + if (success.err_code == 0) { + var data = success.result; + if (data.ret != 0) { + var tip = data.err_info ? typeof data.err_info == 'string' ? data + .err_info : + data + .err_info.join('<br/>') : ''; + if (data.ret == 801) { + if (this.param.Only_Script_Error) { + let pos = tip.indexOf("锛�); + if (pos > -1) tip = tip.substring(pos + 1); + } + uni.showModal({ + title: this.translateSys("tip"), + content: tip, + showCancel: false, + confirmText: this.translateSys("cancel") + }); + } else uni.showModal({ + title: this.translateSys("tip"), + content: tip + ',' + this.translateSys('tip') + ':' + data + .ret, + showCancel: false, + confirmText: this.translateSys("cancel") + }); + return false + } else { + var tip = data.info ? typeof data.info == 'string' ? data.info : data + .info + .join( + '<br/>') : ''; + if (tip) uni.showModal({ + title: this.translateSys("tip"), + content: tip, + showCancel: false, + confirmText: this.translateSys("cancel") + }); + + var result = data.result; + + } + } else { + uni.showModal({ + title: this.translateSys("error") + "7", + content: success.err_msg, + showCancel: false, + confirmText: this.translateSys("cancel") + }); + } + }).catch(ex => { + // console.log(ex); + uni.showModal({ + title: this.translateSys('tip') + "7.1", + content: ex.errMsg, + showCancel: false, + confirmText: this.translateSys("cancel") + }); + }); + + }, + //鏂板淇敼灏忕獥鍙f暟鎹�+ showAddSmallDialog(btn, enviroment) { + var data = { + Add_BtnName: btn.ShowName, + EditDlgMode: btn.Edit_dlg.Model, + clsid: btn.Cls_ID, + cls_name: btn.Cls_Name, + Edit_dlg: btn.Edit_dlg + }; + const url = '../modal/3018?param=' + JSON.stringify(data) + "&titlename=" + btn.Edit_dlg + .Name + + "&type=addDataObj" + console.log("showAddSmallDialog", url); + var $this = this; + uni.navigateTo({ + url: url, + events: { + // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�鍒板綋鍓嶉〉闈㈢殑鏁版嵁 + addDataObj: function(resData) { + console.log(resData); + //鍒锋柊 + if (!this.$data.param.After_Btn_Not_Refresh) { + uni.redirectTo({ + url: '../modal/3018_2?param=' + JSON.stringify(this + .$data.param) + + "&titlename=" + this.$data.title + }); + } + }, + } }); }, @@ -1864,58 +2178,40 @@ width: 98%; } - .v-headStyle:first-child { - margin-top: 15rpx; - } - - .v-headStyle .txt_title { - font-size: 34rpx; - text-align: right; - display: inline-block; - /* vertical-align: 24rpx; */ - - /* border: 0.1rpx solid red; */ - } - - .v-headStyle input { - vertical-align: middle; - display: inline-block; - /* border: 1px solid #d5d5d5; */ - /* width: 65%; */ - width: 85%; - height: 52rpx; - line-height: 34rpx; - background: #FFF; - border-radius: 0 !important; - color: #2d8cf0; - padding: 10rpx 8rpx 12rpx; - font-size: 34rpx; - font-family: inherit; - box-shadow: none !important; - transition-duration: 0.1s; - margin-top: 4rpx; - } - - .v-headStyle input::-webkit-input-placeholder { - font-size: 12rpx; + .v-headStyle .head-form { + // border: 0.5px solid red; + margin-bottom: 11rpx; } .v-headStyle .form-item-span { - /* vertical-align:top; */ + // border: 0.5px solid red; + padding: 7rpx 0; color: #2d8cf0; white-space: normal; word-break: break-all; display: inline-block; - - /* border: 0.1rpx solid red; */ + // width: calc(100% - 100px); } .input-wrapper { border: 1px solid #d5d5d5; - display: inline-block; width: 100%; - line-height: 22rpx; - vertical-align: middle; + display: flex; + flex-direction: row; + + .uni-input { + color: #2d8cf0; + flex: 1; + padding: 10rpx 8rpx; + // height: 40rpx; + // line-height: 40rpx; + } + + .uni-icon { + padding: 8rpx; + font-size: 32rpx; + color: rgb(192, 196, 204); + } } .check_rememberPwd, @@ -1930,9 +2226,6 @@ box-sizing: border-box; } - .uni-input { - /* border: none; */ - } .uni-icon { /* border: 1px solid red; */ @@ -1950,43 +2243,68 @@ vertical-align: middle; } - - .view-content { - min-height: 700rpx; - /* border:1px solid red; */ - } - .input-disabled { background-color: #f3f3f3 !important; } - button.btn_add { - width: 49.5%; - margin-top: 50rpx; - padding: 20rpx; - line-height: 1.5; - background: #4D6AF4; - border: none; - color: #fff; - font-size: 38rpx; - font-weight: bold; - float: right; - display: inline-block; + .view-content { + display: flex; + flex: 1; + width: calc(100% - 30rpx); + padding: 10rpx 15rpx; + flex-direction: column; + overflow-y: auto; + } - button.btn_cancel { - width: 49.5%; - margin-top: 50rpx; - padding: 20rpx; - line-height: 1.5; - background: #fff; - border: none; - color: #000; - font-size: 38rpx; - font-weight: bold; - float: left; - display: inline-block; + .view-bottom { + // display: flex; + // flex-direction: row; + display: block; + width: calc(100% - 30rpx); + padding: 10rpx 15rpx 20rpx 15rpx; + + .btn_add { + width: 45%; + margin: 0 10rpx; + // padding: 5rpx 10rpx; + background: #4D6AF4; + border: none; + color: #fff; + float: left; + display: inline-block; + } + + .btn_cancel { + width: 45%; + margin: 0 10rpx; + background: #fff; + border: none; + color: #000; + font-size: 38rpx; + float: right; + display: inline-block; + } + + .uni-padding-wrap { + margin: 2rpx 0 0 10rpx; + background-color: #98DAEA; + width: 104rpx; + height: 80rpx; + text-align: center; + border-radius: 54rpx; + padding: 24rpx 0 0 0; + float: right; + display: inline-block; + } + + .uni-padding-wrap a { + font-size: 40rpx; + } } + + + .view-popup { position: relative; @@ -2060,7 +2378,7 @@ #dv_select { display: inline-block; - width: 66%; + // width: 66%; background: #FFF; border-radius: 0 !important; color: #2d8cf0; @@ -2198,9 +2516,8 @@ /* line-height: 22rpx; */ } - .view-floor { - padding: 0 20rpx; - } + + .demo-uni-row { margin-bottom: 0px; -- Gitblit v1.9.1