From 00814401bba75825126baa6675e542ea3c82a5bb Mon Sep 17 00:00:00 2001 From: cuiqian2004 <cuiqian2004@163.com> Date: 星期五, 14 三月 2025 12:19:39 +0800 Subject: [PATCH] 日期 --- pages/modal/5601.vue | 1039 +++++++++++++++++++++++--------------------------------- 1 files changed, 429 insertions(+), 610 deletions(-) diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue index a6024ec..1082962 100644 --- a/pages/modal/5601.vue +++ b/pages/modal/5601.vue @@ -7,8 +7,9 @@ <uni-forms-item v-if="item.name != 'Layout'" :label="item.label ?item.label +'锛�:'' " :label-width="item.labelWidth+'px'"> <uni-data-picker v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''" - v-model="item.value" :localdata="item.useDict ? item.dict : item.selections" @change="onEnterChange(item)" - :readonly="item.disabled" :clear-icon="false" :popup-title="item.label"></uni-data-picker> + v-model="item.value" :localdata="item.useDict ? item.dict : item.selections" + @change="onEnterChange(item)" :readonly="item.disabled" :clear-icon="false" + :popup-title="item.label"></uni-data-picker> <view class="input-wrapper" v-if="item.name=='Input' || item.name=='InputNumber'"> <text v-if="item.setting.prefix" class="uni-icon" :class="[item.setting.prefix]" @click="classAttr_extButton(item)"></text> @@ -42,16 +43,30 @@ <!-- Switch寮�叧 --> <switch class="input-switch" v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''" :disabled="item.disabled" v-model="item.value" @change="onEnterChange(item)" /> + <OIDatePicker v-if="item.name=='DatePicker'" :class="item.disabled?'input-disabled':''" + :disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder" + :defaultToday="item.setting.defaultToday" :format="item.setting.format" + @change="onModelValue(item)" /> + <OIDatePickerRange v-if="item.name=='DatePickerRange'" :rangeSeparator="item.setting.separator" + :format="item.setting.format" :class="item.disabled?'input-disabled':''" + :disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder" + @change="onModelValue(item)" /> + <OITimePicker v-if="item.name=='TimePicker'" :class="item.disabled?'input-disabled':''" + :disabled="item.disabled" v-model="item.value" :placeholder="item.placeholder" + @change="onModelValue(item)" /> + </uni-forms-item> <!-- 鏍呮牸甯冨眬 --> <uni-row v-else :gutter="item.setting.gutter"> <uni-col :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col" v-for="(col,key) in item.setting.colList"> - <uni-forms-item v-if="col!=null" :label="col.label ? col.label +'锛�:''" :label-width="col.labelWidth+'px'"> + <uni-forms-item v-if="col!=null" :label="col.label ? col.label +'锛�:''" + :label-width="col.labelWidth+'px'"> <uni-data-picker v-if="col.name=='Select'" :class="col.disabled?'input-disabled':''" - v-model="col.value" :localdata="col.useDict ? col.dict : col.selections" @change="onEnterChange(col)" - :readonly="col.disabled" :clear-icon="false" :popup-title="col.label"></uni-data-picker> + v-model="col.value" :localdata="col.useDict ? col.dict : col.selections" + @change="onEnterChange(col)" :readonly="col.disabled" :clear-icon="false" + :popup-title="col.label"></uni-data-picker> <view class="input-wrapper" v-if="col.name=='Input' || col.name=='InputNumber'"> <text v-if="col.setting.prefix" class="uni-icon" :class="[col.setting.prefix]" @click="classAttr_extButton(col)"></text> @@ -85,7 +100,19 @@ <!-- Switch寮�叧 --> <switch v-if="col.name=='Switch'" :class="col.disabled?'input-disabled':''" :disabled="col.disabled" v-model="col.value" @change="onEnterChange(col)" /> + <OIDatePicker v-if="col.name=='DatePicker'" :class="col.disabled?'input-disabled':''" + :disabled="col.disabled" v-model="col.value" :placeholder="col.placeholder" + :defaultToday="col.setting.defaultToday" :format="col.setting.format" + @change="onModelValue(col)" /> + <OIDatePickerRange v-if="col.name=='DatePickerRange'" + :rangeSeparator="col.setting.separator" :format="col.setting.format" + :class="col.disabled?'input-disabled':''" :disabled="col.disabled" v-model="col.value" + :placeholder="col.placeholder" @change="onModelValue(col)" /> + <OITimePicker v-if="col.name=='TimePicker'" :class="col.disabled?'input-disabled':''" + :disabled="col.disabled" v-model="col.value" :placeholder="col.placeholder" + @change="onModelValue(col)" /> </uni-forms-item> + <uni-forms-item v-else label=""></uni-forms-item> </uni-col> </uni-row> </view> @@ -112,38 +139,39 @@ @tap="onPanelClick(ii,style.form.htmlobjId)" :id="'dvpanel'+style.form.htmlobjId" :class="style.form.htmlobjId==active_id?'bk-active':''"> - <div class="dv-panel-input"> - <div class="dv-input" v-for="(item,index) in style.form.items"> + <uni-forms class="dv-panel-form" label-align="right"> + <div class="dv-panel-form-item" v-for="(item,index) in style.form.items"> <!-- 鏅�甯冨眬 --> - <view v-if="item.name!='Layout'"> - <text class="txt_title" - :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text> + <uni-forms-item v-if="item.name != 'Layout'" + :label="item.label ?item.label +'锛�:'' " + :label-width="item.labelWidth+'px'"> <span class="form-item-span" v-if="item.disabled">{{item.value}}</span> - <input class="uni-input" v-if="!item.disabled" + <input v-else class="uni-input" :type="item.name=='InputNumber'?'number':'text'" v-model="item.value" :disabled="item.disabled" :placeholder="item.placeholder" :maxlength="-1" /> - </view> + </uni-forms-item> <!-- 鏍呮牸甯冨眬 --> - <uni-row class="demo-uni-row" v-else :gutter="item.setting.gutter"> + <uni-row v-else :gutter="item.setting.gutter"> <uni-col - :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : 24 / item.setting.col" - v-for="(cols,key) in item.setting.colList"> - <view v-if="cols!=null"> - <text class="txt_title" - :style="{'width':cols.labelWidth+'px'}">{{cols.label}}锛�/text> + :span=" item.setting.spanList && item.setting.spanList[key]? item.setting.spanList[key] : (24 / item.setting.col)" + v-for="(col,key) in item.setting.colList"> + <uni-forms-item v-if="col!=null" + :label="col.label ? col.label +'锛�:''" + :label-width="col.labelWidth+'px'"> <span class="form-item-span" - v-if="cols.disabled">{{cols.value}}</span> - <input class="uni-input" v-if="!cols.disabled" - :type="cols.name=='InputNumber'?'number':'text'" - v-model="cols.value" :disabled="cols.disabled" - :placeholder="cols.placeholder" :maxlength="-1" /> - </view> + v-if="col.disabled">{{col.value}}</span> + <input v-else class="uni-input" + :type="col.name=='InputNumber'?'number':'text'" + v-model="col.value" :disabled="col.disabled" + :placeholder="col.placeholder" :maxlength="-1" /> + </uni-forms-item> + <uni-forms-item v-else label=""></uni-forms-item> </uni-col> </uni-row> </div> - </div> + </uni-forms> <div class="dv-panel-button" v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0"> @@ -152,24 +180,27 @@ <!-- <text></text> --> <!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> --> <button size="mini" v-for="(btn,btnIndex) in pageData.Row_Button" - :key="btnIndex" :type="btn.FunCode == 'Delete' ? 'warn' : 'primary'" + :key="btnIndex" type="default" + :class="btn.FunCode == 'Delete' ? 'btn-warn' : 'btn-primary'" @click="onRowBtnClick(btn, pageData,ii)"> <Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img" /> {{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}} </button> </div> + </div> </checkbox-group> </view> <view class="view-bottom" v-if="pageData.Button.length >0 "> - <button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" - :type="btn.FunCode == 'Cancel' ? 'default' : 'primary'" + <button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" type="default" :class="{'btn-disabled':(btn.FunCode != 'Cancel' && pageData.okLoading), - 'btn-one':pageData.Button.length == 1, - 'btn-left':(btnIndex < pageData.Button.length - 1), - 'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 , - 'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" + 'btn-primary':(btn.FunCode != 'Cancel'), + 'btn-cancel':(btn.FunCode == 'Cancel'), + 'btn-one':pageData.Button.length == 1, + 'btn-left':(btnIndex < pageData.Button.length - 1), + 'btn-right': btnIndex > 0 && btnIndex == pageData.Button.length - 1 , + 'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" :disabled="(btn.FunCode != 'Cancel' && pageData.okLoading)? true:false" @click="onBtnClick(btn, pageData)"> <Icon v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img" /> @@ -200,8 +231,9 @@ <uni-popup class="view-popup" ref="popup" background-color="#fff" @change="popupChange"> <view class="popup-header">{{check_list.title}}</view> <view class="popup-content" :class="{ 'popup-height': popupType === 'left' || popupType === 'right' }" - :style="{'width':check_list.width?check_list.width+'px':'200px','height':check_list.height?check_list.height+'px':'88%'}"> - <view class="popup-cont" :style="{'height':check_list.height?check_list.height-45+'px':'415px'}"> + :style="{'width':check_list.width?check_list.width+'px':'375rpx','height':check_list.height?check_list.height+'px':popupType =='center'?'60vh':'88vh'}"> + <view class="popup-cont" + :style="{'height':check_list.height?check_list.height-45+'px':popupType =='center'?'50vh':'80vh'}"> <view class="view_popup_CheckList" v-for="(item,index) in check_list.items"> <checkbox-group class="check_list" @change="checkChange" :data-ischeck="item.check" :data-index="index" :style="{'margin-left': '10rpx'}"> @@ -232,11 +264,20 @@ getUIStyleInfo, runCustomEvent, } from "@/api/data.js" + import dayjs from "dayjs"; + import OIDatePicker from '@/components/oi-date-time-picker/oi-date-picker.vue' + import OIDatePickerRange from '@/components/oi-date-time-picker/oi-date-picker-range.vue' + import OITimePicker from '@/components/oi-date-time-picker/oi-time-picker.vue' export default { name: "PageModal5601", modules: { Base64, + }, + components: { + OIDatePicker, + OIDatePickerRange, + OITimePicker }, data() { return { @@ -288,7 +329,7 @@ title: this.translateSys("error"), content: this.translate("tip_no_master_class"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); } }, @@ -536,7 +577,7 @@ styledefHead.form .model[ele.fieldId] = itemName; } - + ele.selections = selections.map((a) => { return { value: a.value, @@ -608,7 +649,7 @@ title: this.translateSys("error") + "1", content: ex.errMsg, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return {} } @@ -645,14 +686,12 @@ await this.DictGetInfo(ele.bind.dict, detailstyledef.form .model, ele); - } - else - { + } else { if (ele?.name === "Select") { - ele.selections =[] + ele.selections = [] } } - + } else { for (let j in ele.setting.colList) { const col = ele.setting.colList[j] @@ -661,11 +700,9 @@ .bind.dict, detailstyledef.form .model, col); - } - else - { + } else { if (col?.name === "Select") { - col.selections =[] + col.selections = [] } } } @@ -681,7 +718,7 @@ title: this.translateSys("error") + "2", content: ex.errMsg, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return {} } @@ -720,7 +757,7 @@ title: this.translateSys("error") + "3", content: ex.errMsg, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); } @@ -893,6 +930,10 @@ } }, + onModelValue(item) { + var attr = item.fieldId; + this.head_styledef.form.model[attr] = item.value; + }, classAttr_extButton(item) { var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //鍚庡浘鏍囩偣鍑讳簨浠� var onSuffixClickEvent = item.bind.onSuffixClickEvent; //鍚庡浘鏍囩偣鍑诲洖璋�@@ -902,7 +943,7 @@ title: this.translateSys("tip"), content: this.translate('icon_click_callback_empty'), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return; } @@ -911,7 +952,7 @@ title: this.translateSys("tip"), content: this.translate('icon_click_event_empty'), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return; } @@ -925,14 +966,15 @@ getDetailAttrList(pageData) { const detailAttrList = []; + console.log(pageData) if (pageData.DefList) { pageData.DefList.forEach(style => { var detail_attr = {}; style.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) detail_attr[cols - .fieldId] = cols.value; + item.setting.colList.forEach(col => { + if (col != null) detail_attr[col + .fieldId] = col.value; }); } else detail_attr[item.fieldId] = item.value; @@ -967,6 +1009,7 @@ }); }); } + console.log(detailAttrList) const jsonlist = []; detailAttrList.forEach(attr => { jsonlist.push({ @@ -989,15 +1032,16 @@ var head_attr = {}; this.head_styledef.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) head_attr[cols - .fieldId] = cols.value; + item.setting.colList.forEach(col => { + if (col != null) head_attr[col + .fieldId] = col.value; }); } else head_attr[item.fieldId] = item.value; }); var obj_attr = this.head_styledef.form.model; // console.log(obj_attr); + var input_param = Base64.encode( JSON.stringify( Object.keys(head_attr).map((a) => ({ @@ -1012,9 +1056,7 @@ jsonList.push({ page_name: page.Name, - item_list: $this.getDetailAttrList(page - .DefList, page - .Select_Button), + item_list: $this.getDetailAttrList(page), ext_data: page.ExtData || {} }) @@ -1022,6 +1064,7 @@ const data_json = Base64.encode( JSON.stringify(jsonList) ); + console.log(jsonList) var dataInfo = { ed_type: 0, start_transaction: true, @@ -1060,7 +1103,7 @@ content: tip, showCancel: false, confirmText: this.translateSys( - "cancel") + 'close') }); } else uni.showModal({ title: this.translateSys('tip'), @@ -1070,7 +1113,7 @@ .ret, showCancel: false, confirmText: this.translateSys( - "cancel") + 'close') }); return false; } else { @@ -1082,267 +1125,101 @@ content: tip, showCancel: false, confirmText: this.translateSys( - "cancel") + 'close') }); if (result.result_type == 0 && result.action) { result.action.forEach(item => { - - if (item.action_type == - "insert_subtable_page_row" - ) { //鐮佺洏涓�- $this.$data.param - .Show_Welcom_Page = - false; + if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+ $this.$data.param.Show_Welcom_Page = false; var value = item.value; $this.viewAceionRow(value); } else if (item.action_type == - "set_subtable_page_content" - ) { //宸茬爜鐩�- $this.$data.param - .Show_Welcom_Page = - false; + "set_subtable_page_content") { //宸茬爜鐩�+ $this.$data.param.Show_Welcom_Page = false; var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page.Name; - }); - if (value.clear_confirm != - false && value.clear == - true && - pageData && pageData - .DefList.length > 0 + const pageData = $this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); + if (value.clear_confirm != false && value.clear == true && + pageData && pageData.DefList.length > 0 ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({ - title: this - .translateSys( - 'tip' - ), - content: this - .translate( - "are_you_sure_clear_first" - ) + - this - .translateSys( - "quotation_mark_left" - ) + - value - .page_name + - this - .translateSys( - "quotation_mark_right" - ) + - this - .translate( - "are_you_sure_clear_last" - ), - success: function( - res - ) { - if (res - .confirm - ) { - if ( - pageData) - pageData - .DefList = []; - $this - .viewAceionContent( - value - ); - } else if ( - res - .cancel - ) { - if ( - pageData) - pageData - .DefList = []; - $this - .viewAceionContent( - value - ); + title: this.translateSys('tip'), + content: this.translate( + "are_you_sure_clear_first") + + this.translateSys( + "quotation_mark_left") + + value.page_name + + this.translateSys( + "quotation_mark_right") + + this.translate( + "are_you_sure_clear_last"), + cancelText: $this.translateSys('ok'), + confirmText: $this.translateSys('cancel'), + success: function(res) { + if (res.cancel) { + if (pageData) + pageData.DefList = []; + $this.viewAceionContent(value); + } else if (res.confirm) { + if (pageData) + pageData.DefList = []; + $this.viewAceionContent(value); } } }); } else { if (pageData) - pageData - .DefList = []; - $this - .viewAceionContent( - value); + pageData.DefList = []; + $this.viewAceionContent(value); } - } else if (item.action_type == - "select_subtable_page_row" - ) { + } else if (item.action_type == "select_subtable_page_row") { // value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}} var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page.Name; - }); - if (pageData?.DefList) { - pageData.DefList - .forEach(ele => { - - if (ele - .form - .objId == - value - .row.id - ) { - ele.SelBut_Checked = - true; - $this - .active_id = - ele - .form - .htmlobjId; - //鑷姩婊氬姩鍒版寚瀹氬厓绱�- uni.createSelectorQuery() - .select( - "#tabpanel" + - value - .page_name - ) //瀵瑰簲澶栧眰鑺傜偣 - .boundingClientRect( - ( - container - ) => { - uni.createSelectorQuery() - .select( - "#dvpanel" + - ele - .form - .htmlobjId - ) //鐩爣鑺傜偣 - .boundingClientRect( - ( - target - ) => { - uni.pageScrollTo({ - scrollTop: target - .top - - container - .top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�- }); - } - ) - .exec(); - } - ) - .exec(); - } - }); - } + $this.viewActionSelectRow(value) } else if (item.action_type == - "remove_subtable_page_row" - ) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page.Name; - }); - if (pageData - ?.DefList - ) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- { - value.row.forEach( - row => { - pageData - .DefList - .forEach( - (ele, - index - ) => { - if (ele - .form - .objId == - row - .id - ) { - pageData - .DefList - .splice( - index, - 1 - ); - } - }); - }); - } + $this.viewActionRemoveRow(value) + } else if (item.action_type == "set_subtable_page_row") { + $this.viewActionSetRow(item.value) - - - } else if (item.action_type == - "set_subtable_page_row") { - $this.viewActionSetRow(item - .value) - - } else if (item.action_type == - "set_subtable_page_ext_data" - ) { + } else if (item.action_type == "set_subtable_page_ext_data") { var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page.Name; - }); + const pageData = $this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); if (pageData) - pageData.ExtData = - value.ext_data + pageData.ExtData = value.ext_data - } else if (item.action_type == - "clear_subpage_rows") { + } else if (item.action_type == "clear_subpage_rows") { var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page.Name; - }); + const pageData = $this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); if (pageData) { pageData.DefList = [] pageData.ExtData = {} } - } else if (item.action_type == - "set_dlg_current_edit_attr" - ) { + } else if (item.action_type == "set_dlg_current_edit_attr") { - if ($this - .focusOldFieldId == - item.value) { + if ($this.focusOldFieldId == item.value) { $this.setData({ focusFieldId: "" }) } else { $this.setData({ - focusFieldId: $this - .focusOldFieldId + focusFieldId: $this.focusOldFieldId }) } $this.$nextTick(() => { $this.setData({ - focusFieldId: item - .value + focusFieldId: item.value }) }); - } else if (item.action_type == - "set_dlg_attr") { + } else if (item.action_type == "set_dlg_attr") { // value = {"attr":"xxx", "value":"xxx"} var data = item.value; $this.setFormValues(data) @@ -1357,7 +1234,7 @@ content: result.info, showCancel: false, confirmText: this - .translateSys("cancel") + .translateSys('close') }); } } @@ -1371,7 +1248,7 @@ title: this.translateSys("error") + "4.1", content: tip, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); }); } @@ -1386,7 +1263,7 @@ this.translate('reason') + this.translateSys("colon") + tip, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); } }, @@ -1420,6 +1297,51 @@ } }, + viewActionSelectRow(value) { + const pageData = this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); + if (pageData?.DefList) { + pageData.DefList.forEach(ele => { + if (ele.form.objId == value.row.id) { + ele.SelBut_Checked = true; + this.active_id = ele.form.htmlobjId; + //鑷姩婊氬姩鍒版寚瀹氬厓绱�+ uni.createSelectorQuery().select("#tabpanel" + value.page_name) //瀵瑰簲澶栧眰鑺傜偣 + .boundingClientRect((container) => { + uni.createSelectorQuery() + .select("#dvpanel" + ele.form.htmlobjId) //鐩爣鑺傜偣 + .boundingClientRect((target) => { + uni.pageScrollTo({ + scrollTop: target.top - container + .top, //婊氬姩鍒板疄闄呰窛绂绘槸鍏冪礌璺濈椤堕儴鐨勮窛绂诲噺鍘绘渶澶栧眰鐩掑瓙鐨勬粴鍔ㄨ窛绂�+ }); + }).exec(); + }).exec(); + } + }); + } + + }, + + viewActionRemoveRow(value) { + if (JSON.stringify(value.row) == '{}') { + return; + } + const pageData = this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); + if (pageData?.DefList) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ { + value.row.forEach((row) => { + pageData.DefList.forEach((ele, index) => { + if (ele.form.objId == row.id) { + pageData.DefList.splice(index, 1); + } + }); + }); + } + }, //鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭 viewActionSetRow(value) { const $this = this @@ -1746,7 +1668,7 @@ value: val }); }); - + head_styledef.form.items.forEach(async (attr_item, index) => { if (attr_item.name != "Layout") { if (attr_item.fieldId == attr.attr) { @@ -1811,9 +1733,9 @@ var head_attr = {}; this.$data.head_styledef.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) head_attr[cols.fieldId] = - cols.value; + item.setting.colList.forEach(col => { + if (col != null) head_attr[col.fieldId] = + col.value; }); } else head_attr[item.fieldId] = item.value; @@ -1824,9 +1746,9 @@ var detail_attr = {}; style.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) detail_attr[cols - .fieldId] = cols + item.setting.colList.forEach(col => { + if (col != null) detail_attr[col + .fieldId] = col .value; }); } else @@ -1881,7 +1803,7 @@ title: this.translateSys("tip"), content: this.translate("tip_no_select_data"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return; } @@ -1937,7 +1859,7 @@ title: this.translateSys("tip"), content: "popupParam涓虹┖锛�, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return; } @@ -1946,7 +1868,7 @@ title: this.translateSys("tip"), content: this.translate("tip_no_select_data"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return; } @@ -2042,14 +1964,14 @@ title: this.translateSys("tip"), content: tip, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); } else uni.showModal({ title: this.translateSys("tip"), content: tip + ',' + this.translateSys('tip') + ':' + data .ret, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return false } else { @@ -2061,7 +1983,7 @@ title: this.translateSys("tip"), content: tip, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); var actionlist = data.action; @@ -2124,7 +2046,7 @@ .translate( "tip_action_unprocessed"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); } } @@ -2201,7 +2123,7 @@ title: this.translateSys("error") + "3.1", content: exStr, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); }); }, @@ -2294,14 +2216,14 @@ title: $this.translateSys("tip"), content: tip, showCancel: false, - confirmText: $this.translateSys("cancel") + confirmText: $this.translateSys('close') }); } else uni.showModal({ title: $this.translateSys("tip"), content: tip + ',' + $this.translateSys('tip') + ':' + data .ret, showCancel: false, - confirmText: $this.translateSys("cancel") + confirmText: $this.translateSys('close') }); return false } else { @@ -2313,7 +2235,7 @@ title: $this.translateSys("tip"), content: tip, showCancel: false, - confirmText: $this.translateSys("cancel") + confirmText: $this.translateSys('close') }); if (data != "") { @@ -2399,6 +2321,7 @@ $this.setData({ check_list: val.config }) + console.log($this.check_list) if (val.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊� $this.setData({ popupType: "right" @@ -2491,7 +2414,7 @@ .translate( "tip_action_unprocessed"), showCancel: false, - confirmText: $this.translateSys("cancel") + confirmText: $this.translateSys('close') }); } } @@ -2504,7 +2427,7 @@ "quotation_mark_right") + $this.translateSys( "comma") + 'event_id' + eventid, showCancel: false, - confirmText: $this.translateSys("cancel") + confirmText: $this.translateSys('close') }); } } @@ -2519,7 +2442,7 @@ title: $this.translateSys('tip') + "5.1", content: exStr, showCancel: false, - confirmText: $this.translateSys("cancel") + confirmText: $this.translateSys('close') }); }); }, @@ -2552,11 +2475,14 @@ const $this = this if (btn.Prompt) { const sContent = btn.PromptContent || this.translate("confirm") + uni.showModal({ title: this.translateSys("tip"), content: btn.PromptContent || this.translate("confirm"), + cancelText: this.translateSys('ok'), + confirmText: this.translateSys('cancel'), success: function(res) { - if (res.confirm) { + if (res.cancel) { $this.onButtonClicked(btn, pageData, -1); } @@ -2574,8 +2500,10 @@ uni.showModal({ title: this.translateSys("tip"), content: btn.PromptContent || this.translate("confirm"), + cancelText: this.translateSys('ok'), + confirmText: this.translateSys('cancel'), success: function(res) { - if (res.confirm) { + if (res.cancel) { $this.onButtonClicked(btn, pageData, index); } @@ -2624,7 +2552,7 @@ title: this.translateSys("tip"), content: this.translateSys("unrealized"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); } } @@ -2646,9 +2574,9 @@ const objAttr = {} row.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) objAttr[cols - .fieldId] = cols.value; + item.setting.colList.forEach(col => { + if (col != null) objAttr[col + .fieldId] = col.value; }); } else objAttr[item.fieldId] = item.value; @@ -2698,15 +2626,15 @@ const objAttr = {} row.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) objAttr[cols - .fieldId] = cols.value; + item.setting.colList.forEach(col => { + if (col != null) objAttr[col.fieldId] = col.value; }); } else objAttr[item.fieldId] = item.value; }); - const url = `../modal/form/index?param=${JSON.stringify(btn)}&titlename=${btn.ShowName}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj` + const url = + `../modal/form/index?param=${JSON.stringify(btn)}&titlename=${btn.ShowName}&editMode=1&objAttr=${JSON.stringify(objAttr)}&type=updateDataObj` var $this = this; uni.navigateTo({ url: url, @@ -2767,7 +2695,7 @@ this.translate( "tip_no_data_last"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return false; } @@ -2776,9 +2704,9 @@ var head_attr = {}; this.$data.head_styledef.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) head_attr[cols.fieldId] = - cols.value; + item.setting.colList.forEach(col => { + if (col != null) head_attr[col.fieldId] = + col.value; }); } else head_attr[item.fieldId] = item.value; @@ -2790,10 +2718,9 @@ var detail_attr = {}; style.form.items.forEach(item => { if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮�- item.setting.colList.forEach(cols => { - if (cols != null) detail_attr[ - cols - .fieldId] = cols.value; + item.setting.colList.forEach(col => { + if (col != null) + detail_attr[col.fieldId] = col.value; }); } else detail_attr[item.fieldId] = item.value; @@ -2858,7 +2785,7 @@ title: this.translateSys("tip"), content: this.translate("tip_no_select_data"), showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); return; } @@ -2919,7 +2846,7 @@ content: tip, showCancel: false, confirmText: this.translateSys( - "cancel") + 'close') }); } else uni.showModal({ title: this.translateSys('tip'), @@ -2928,7 +2855,7 @@ result.ret, showCancel: false, confirmText: this.translateSys( - "cancel") + 'close') }); return false; } else { @@ -2940,7 +2867,7 @@ content: tip, showCancel: false, confirmText: this.translateSys( - "cancel") + 'close') }); if (result.result_type == 0) { if (result.action) { @@ -2952,242 +2879,100 @@ ) { //鐮佺洏涓� var value = item.value; //鍔犺浇宸茬粡鐮佺洏鏁版嵁 - $this.viewAceionRow( - value, ); + $this.viewAceionRow(value); //娓呯┖鏉$爜鍐呭 - $this.$data - .head_styledef - .form.items - .forEach(( - item, - index) => { - if (item - .fieldId != - "S_CNTR_CODE" - ) { - item.value = - ''; - item.oldvalue = - ''; - $this - .$data - .head_styledef - .form - .model[ - item - .fieldId - ] = - ''; - } - }); + $this.$data.head_styledef.form.items.forEach((item, index) => { + if (item.fieldId != "S_CNTR_CODE") { + item.value = ''; + item.oldvalue = ''; + $this.$data.head_styledef.form.model[item + .fieldId] = ''; + } + }); uni.showModal({ - title: this - .translateSys( - "tip" - ), - content: this - .translate( - 'execute_event_success' - ), + title: $this.translateSys("tip"), + content: $this.translate('execute_event_success'), showCancel: false, - confirmText: this - .translateSys( - "cancel" - ) + confirmText: $this.translateSys('close') }); } else if (item.action_type == "set_subtable_page_content" ) { //宸茬爜鐩�- $this.$data.param - .Show_Welcom_Page = - false; + $this.$data.param.Show_Welcom_Page = false; var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page.Name; - }); - if (value.clear_confirm != - false && value.clear == - true && - pageData && pageData - .DefList.length > 0 + const pageData = $this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); + if (value.clear_confirm != false && value.clear == true && + pageData && pageData.DefList.length > 0 ) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝e湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({ - title: this - .translateSys( - 'tip' - ), - content: this - .translate( - "are_you_sure_clear_first" - ) + - this - .translateSys( - "quotation_mark_left" - ) + - value - .page_name + - this - .translateSys( - "quotation_mark_right" - ) + - this - .translate( - "are_you_sure_clear_last" - ), - success: function( - res - ) { - if (res - .confirm - ) { - if ( - pageData - ) - pageData - .DefList = []; - $this - .viewAceionContent( - value - ); - } else if ( - res - .cancel - ) { - if ( - pageData - ) - pageData - .DefList = []; - $this - .viewAceionContent( - value - ); + title: $this.translateSys('tip'), + content: $this.translate( + "are_you_sure_clear_first") + + $this.translateSys("quotation_mark_left") + + value.page_name + + $this.translateSys( + "quotation_mark_right") + + $this.translate("are_you_sure_clear_last"), + cancelText: $this.translateSys('ok'), + confirmText: $this.translateSys('cancel'), + success: function(res) { + if (res.cancel) { + if (pageData) + pageData.DefList = []; + $this.viewAceionContent(value); + } else if (res.confirm) { + if (pageData) + pageData.DefList = []; + $this.viewAceionContent(value); } } }); } else { if (pageData) - pageData - .DefList = []; - $this - .viewAceionContent( - value); + pageData.DefList = []; + $this.viewAceionContent(value); } - } else if (item - .action_type == - "remove_subtable_page_row" - ) { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page - .Name; - }); - if (pageData - ?.DefList - ) { //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞 - //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�- value.row.forEach( - row => { - pageData - .DefList - .forEach( - ( - ele, - index - ) => { - if (ele - .form - .objId == - row - .id - ) { - pageData - .DefList - .splice( - index, - 1 - ); - } - } - ); - }); - } - } else if (item - .action_type == - "set_subtable_page_row" - ) { - $this.viewActionSetRow( - item - .value) - - } else if (item - .action_type == - "set_subtable_page_ext_data" - ) { - var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page - .Name; - }); + } else if (item.action_type == + "remove_subtable_page_row") { //娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹�+ let value = item.value; + $this.viewActionRemoveRow(value) + } else if (item.action_type == "set_subtable_page_row") { + $this.viewActionSetRow(item.value) + } else if (item.action_type == "set_subtable_page_ext_data") { + let value = item.value; + const pageData = $this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); if (pageData) { - pageData.ExtData = - value - .ext_data + pageData.ExtData = value.ext_data } - } else if (item - .action_type == - "clear_subpage_rows") { + } else if (item.action_type == "clear_subpage_rows") { var value = item.value; - const pageData = $this - .pageDetail.find(( - page) => { - return value - .page_name == - page - .Name; - }); + const pageData = $this.pageDetail.find((page) => { + return value.page_name == page.Name; + }); if (pageData) { - pageData - .DefList = [] - pageData - .ExtData = {} + pageData.DefList = [] + pageData.ExtData = {} } - } else if (item - .action_type == - "set_dlg_current_edit_attr" - ) { - if ($this - .focusOldFieldId == - item.value) + } else if (item.action_type == "set_dlg_current_edit_attr") { + if ($this.focusOldFieldId == item.value) $this.setData({ focusFieldId: "" }) else { $this.setData({ - focusFieldId: $this - .focusOldFieldId + focusFieldId: $this.focusOldFieldId }) } $this.$nextTick(() => { - $this - .setData({ - focusFieldId: item - .value - }) + $this.setData({ + focusFieldId: item.value + }) }); } else if (item.action_type == "set_dlg_attr") { @@ -3198,12 +2983,8 @@ }); } else { - if ($this.$data.After_OK_Event.ID != - event - .ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢 - - $this.sava(pageParam, $this.$data - .After_OK_Event); //鎵ц纭畾鍚庝簨浠�+ if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢 + $this.sava(pageParam, $this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠� } } @@ -3211,12 +2992,10 @@ if (result.info) { uni.showModal({ - title: this.translateSys( - "tip"), + title: this.translateSys("tip"), content: result.info, showCancel: false, - confirmText: this - .translateSys("cancel") + confirmText: this.translateSys('close') }); } } @@ -3228,13 +3007,10 @@ let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex uni.showModal({ title: this.translateSys("error") + "8.1", - content: this.translate( - "execute_after_ok_event_failed") + - this.translateSys( - "comma") + - tip, + content: this.translate("execute_after_ok_event_failed") + + this.translateSys("comma") + tip, showCancel: false, - confirmText: this.translateSys("cancel") + confirmText: this.translateSys('close') }); }); }, @@ -3255,7 +3031,17 @@ }, }; </script> +<style> + .popup-content { + @include flex; + } + + .popup-height { + @include height; + /* width: 200px; */ + } +</style> <style lang="scss"> .uni-page-modal-5601 { @@ -3293,7 +3079,7 @@ } .uni-icon { - padding: 8rpx; + padding: 10rpx 5rpx; font-size: 32rpx; color: rgb(192, 196, 204); } @@ -3339,6 +3125,7 @@ flex-direction: column !important; } + .view-bottom { display: flex; flex-direction: row; @@ -3346,24 +3133,23 @@ padding: 10rpx 15rpx 30rpx 15rpx; .btn-disabled { - background-color: #ddd; - color: #888; + background-color: #ddd !important; + color: #888 !important; } .btn-left { padding: 20rpx; line-height: 1.5; - border: none; font-size: 38rpx; font-weight: bold; float: left; display: inline-block; + } .btn-one { padding: 20rpx; line-height: 1.5; - border: none; font-size: 38rpx; font-weight: bold; float: left; @@ -3375,7 +3161,6 @@ .btn-right { padding: 20rpx; line-height: 1.5; - border: none; font-size: 38rpx; font-weight: bold; float: right; @@ -3397,6 +3182,23 @@ } } + .btn-warn { + background: #ff2d1e; + border: none; + color: #fff; + } + + .btn-cancel { + background: #fff; + color: #000; + } + + .btn-primary { + background: #27A6E1; + border: none; + color: #fff; + } + [nvue] uni-view { position: relative; border: 0 solid #000; @@ -3405,7 +3207,7 @@ .uni-icon { /* border: 1px solid red; */ - width: 8%; + width: 30rpx; font-family: uniicons; font-size: 40rpx; font-weight: 400; @@ -3421,46 +3223,55 @@ .dv-panel { background-color: #efefef; - padding: 20rpx 20rpx 10rpx 0px; + padding: 10rpx 10rpx 10rpx 0px; border-radius: 12rpx; margin: 10rpx 0 20rpx 0; - text-align: right; - .txt_title { - font-size: 28rpx; - text-align: right; - display: inline-block; - } + .dv-panel-form { + padding: 0px; + margin: 0; - input { - vertical-align: middle; - display: inline-block; - border: 1px solid #d5d5d5; - width: 68%; - height: 48rpx; - line-height: 28rpx; - background: #FFF; - border-radius: 7px !important; - color: #2d8cf0; - padding: 6rpx 8rpx 8rpx; - font-size: 28rpx; - font-family: inherit; - box-shadow: none !important; - transition-duration: 0.1s; - margin-top: 0rpx; - } + .dv-panel-form-item { + margin: 0; + padding: 0px; + } - input::-webkit-input-placeholder { - font-size: 10rpx; - } + .uni-forms-item { + padding-bottom: 5rpx; + margin-bottom: 0; - .form-item-span { - vertical-align: text-top; - color: #2d8cf0; - white-space: normal; - word-break: break-all; - display: inline-block; - width: calc(100% - 100px); + .uni-forms-item__label { + height: 20px !important; + padding: 0 10rpx 0 0 !important; + } + + .uni-input { + width: calc(100% - 12rpx); + padding: 5rpx; + border: 1px solid #d5d5d5; + color: #2d8cf0; + height: 20px; + background: #FFF; + line-height: 20px; + border-radius: 6px !important; + font-size: 14px; + font-family: inherit; + box-shadow: none !important; + transition-duration: 0.1s; + vertical-align: middle; + } + + .form-item-span { + vertical-align: text-top; + color: #2d8cf0; + white-space: normal; + word-break: break-all; + width: 100%; + } + } + + + } .dv-panel-button { @@ -3488,15 +3299,6 @@ } - .dv-panel-input { - width: 100%; - display: inline-block; - text-align: left; - - .dv-input { - margin-bottom: 2rpx; - } - } .logo { height: 100rpx; @@ -3591,15 +3393,6 @@ background-color: #f3f3f3 !important; } - .demo-uni-row { - margin-bottom: 0px; - display: block; - - .uni-input { - width: calc(100% - 120px); - } - } - ::v-deep .uni-row { margin-bottom: 0px; } @@ -3611,6 +3404,30 @@ .demo-uni-col { height: 36px; border-radius: 5px; + } + + .view-popup { + position: relative; + } + + .popup-content { + // @include flex; + align-items: center; + justify-content: center; + padding: 30rpx; + background-color: #fff; + /* height: 150px; */ + /* border: 1px solid red; */ + } + + .popup-cont { + overflow-y: auto; + /* border: 1px solid red; */ + } + + .popup-height { + // @include height; + /* width: 200px; */ } .popup-header { @@ -3626,7 +3443,7 @@ .popup-footer { float: right; position: absolute; - bottom: 0; + bottom: 10rpx; right: 20rpx; } @@ -3650,9 +3467,11 @@ margin-top: 50rpx; padding: 15rpx; line-height: 1.5; - background: #27A6E1; - border: none; - color: #fff; + // background: #27A6E1; + // border: none; + // color: #fff; + background: #fff; + color: #000; font-size: 38rpx; font-weight: bold; /* float: right; */ -- Gitblit v1.9.1