From 7482313cc90753e730c275ad133b22da210f84f9 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 21 三月 2025 19:50:36 +0800
Subject: [PATCH] test
---
pages/modal/5601.vue | 800 ++++++++++++++++++++++++++++----------------------------
1 files changed, 397 insertions(+), 403 deletions(-)
diff --git a/pages/modal/5601.vue b/pages/modal/5601.vue
index 3055125..1943ef7 100644
--- a/pages/modal/5601.vue
+++ b/pages/modal/5601.vue
@@ -2,8 +2,8 @@
<view class="uni-page-modal-5601">
<!-- 琛ㄥご鏍峰紡 -->
<OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form" :focusId="focusFieldId"
- @click="onClick" @focus="ontap" @change="onEnterChange" @click-prefix="classAttr_extButton"
- @click-suffix="classAttr_extButton"></OIForm>
+ @on-click="onClick" @on-focus="ontap" @on-change="onEnterChange" @on-click-prefix="classAttr_extButton"
+ @on-click-suffix="classAttr_extButton"></OIForm>
<view class="view-content">
<!-- 鐮佺洏瀛愮晫闈�-->
@@ -23,16 +23,15 @@
src="../../images/mobox_log_200x40.png">
</image>
<checkbox-group @change="checkboxChange">
- <div class="dv-panel" v-for="(style,ii) in pageData.DefList"
+ <div class="dv-panel" v-for="(style,ii) in pageData.DefList" :key="ii"
@tap="onPanelClick(ii,style.form.htmlobjId)"
:id="'dvpanel'+style.form.htmlobjId"
:class="style.form.htmlobjId==active_id?'bk-active':''">
<OIForm class="dv-panel-form" :form="style.form" viewMode></OIForm>
-
<div class="dv-panel-button"
v-if="pageData.Select_Button==true || pageData.Row_Button.length > 0">
- <checkbox v-if="pageData.Select_Button==true" :model="ii"
+ <checkbox v-if="pageData.Select_Button==true" :value="ii"
:checked="style.SelBut_Checked" />
<!-- <text></text> -->
<!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">淇濆瓨</Button> -->
@@ -40,8 +39,8 @@
: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" />
+ <text v-if="btn.Style == 'img' || btn.Style == 'img_text'"
+ class="Img"></text>
{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
</button>
</div>
@@ -51,21 +50,18 @@
</view>
<view class="view-bottom" v-if="pageData.Button.length >0 ">
<button v-for="(btn,btnIndex) in pageData.Button" :key="btnIndex" type="default"
- :class="{'btn-disabled':(btn.FunCode != 'Cancel' && pageData.okLoading),
- 'btn-primary':(btn.FunCode != 'Cancel'),
+ :class="{'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" />
+ 'width-50':(pageData.Button.length == 2),'width-32':(pageData.Button.length == 3),'width-30':(pageData.DropDownButton.length> 0)}" @click="onBtnClick(btn, pageData)">
+ <text v-if="btn.Style == 'img' || btn.Style == 'img_text'" class="Img"></text>
{{(btn.Style == 'text'|| btn.Style == 'img_text') ? btn.ShowName :""}}
</button>
<view class="btn-right" v-if="pageData.DropDownButton.length >0 ">
<a @click="clickDropdownBtns(pageData)">
- <Icon class="mobox-normal-more" />
+ <text class="mobox-normal-more"></text>
</a>
</view>
</view>
@@ -113,7 +109,9 @@
</template>
<script>
- import Base64 from '../../components/js-base64/base64.js'
+ import {
+ Base64
+ } from '@/js/Base64.js';
import {
dictGetInfo
} from "@/api/mobox.js"
@@ -123,15 +121,22 @@
} from "@/api/data.js"
import dayjs from "dayjs";
import OIForm from '@/components/oi-form/index.vue'
+ import OIFormItem from '@/components/oi-form/list/index.vue'
+ import OIFormInput from '@/components/oi-form/list/input/index.vue'
+ import OIFormInputNumber from '@/components/oi-form/list/input-number/index.vue'
+ import buttonClickMixin from '@/mixins/button-click.js';
export default {
name: "PageModal5601",
- modules: {
- Base64,
- },
+ mixins: [buttonClickMixin],
components: {
OIForm,
+ OIFormItem,
+ OIFormInput,
+ OIFormInputNumber
+
},
+
data() {
return {
title: this.translateSys("inventory"),
@@ -152,7 +157,6 @@
selectAttrObj: {},
global_attr: [],
- refdatastore: [], //寮曠敤鏁版嵁瀛樺偍鍖�/ {attr:'G_PRJ_' + bindattr + '_ID', value:info.id}
popupType: "center",
check_list: {},
popupParam: {},
@@ -217,7 +221,7 @@
//浼犲叆鍙傛暟鍊� if (paramValue) {
const attrs = paramValue.attrs || [];
- (this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
+ (this.head_styledef?.form?.items || []).forEach(async (ele, index) => {
if (ele.name != "Layout") {
attrs.forEach(async (ele2, index2) => {
if (ele.fieldId == ele2.name) {
@@ -239,10 +243,10 @@
})
}
//鍔犺浇鍒濆鐣岄潰
- if (this.$data.param.Show_Welcom_Page) {
- this.$data.param.Welcome_Page.Img = this.$data.param.Welcome_Page.Img.replace(/ /g, '+');
- this.$data.param.Welcome_Page.Width = parseInt(this.$data.param.Welcome_Page.Width);
- this.$data.param.Welcome_Page.Height = parseInt(this.$data.param.Welcome_Page.Height);
+ if (this.param.Show_Welcom_Page) {
+ this.param.Welcome_Page.Img = this.param.Welcome_Page.Img.replace(/ /g, '+');
+ this.param.Welcome_Page.Width = parseInt(this.param.Welcome_Page.Width);
+ this.param.Welcome_Page.Height = parseInt(this.param.Welcome_Page.Height);
};
//鍔犺浇Tab椤电
const pageList = this.param.Sub_Page || []
@@ -616,6 +620,7 @@
},
onClick(item) {
+ console.log("onClick", item)
this.focusFieldId = item.fieldId
},
ontap(item) { //鎵爜鍔熻兘
@@ -716,15 +721,19 @@
let newVal = item.value
if (typeof item.value == "string") {
newVal = item.value.trim()
- if (!newVal)
+ if (!newVal) {
+ item.oldvalue = newVal;
+ var attr = item.fieldId;
+ this.head_styledef.form.model[attr] = newVal;
return
+ }
+
}
if (item.oldvalue != newVal) {
item.oldvalue = newVal;
var attr = item.fieldId;
this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�-
if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent);
}
@@ -754,7 +763,7 @@
});
return;
}
- this.$data.popupType = 'right'
+ this.popupType = 'right'
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
this.$refs.popup.open(this.popupType);
@@ -866,7 +875,7 @@
var dataInfo = {
ed_type: 0,
start_transaction: true,
- class_id: this.$data.head_styledef.form.clsId,
+ class_id: this.head_styledef.form.clsId,
class_name: '',
event_id: event.id,
event_name: '',
@@ -929,12 +938,12 @@
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;
+ $this.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;
+ $this.param.Show_Welcom_Page = false;
var value = item.value;
const pageData = $this.pageDetail.find((page) => {
return value.page_name == page.Name;
@@ -972,6 +981,16 @@
pageData.DefList = [];
$this.viewAceionContent(value);
}
+ } else if (item.action_type == "select_subtable_page") {
+ var value = item.value;
+ const pageIndex = $this.pageDetail.findIndex((page) => {
+ return value.page_name == page.Name;
+ });
+ if (pageIndex > -1) {
+ $this.setData({
+ current: pageIndex
+ })
+ }
} else if (item.action_type == "select_subtable_page_row") {
// value = {"page_name":"鐮佺洏涓�, "row":{"id":"xx"}}
var value = item.value;
@@ -1000,7 +1019,7 @@
const pageData = $this.pageDetail[pageIndex]
pageData.DefList = []
pageData.ExtData = {}
-
+
$this.$set(this.pageDetail, pageIndex, pageData)
}
@@ -1103,8 +1122,59 @@
return value.page_name == page.Name;
});
if (pageData?.DefList) {
- pageData.DefList.forEach(ele => {
- if (ele.form.objId == value.row.id) {
+ const detailStyleDefList = pageData.DefList || []
+ let bFindRow = false;
+ for (let index = 0; index < detailStyleDefList.length; index++) {
+ const ele = detailStyleDefList[index]
+
+ if (value.row.id) {
+ if (ele.form.objId == value.row.id) {
+ bFindRow = true;
+ }
+ } else {
+ const conditions = row.condition || [];
+ if (conditions.length > 0) {
+ for (let index = 0; index < detailStyleDefList.length; index++) {
+ const ele = detailStyleDefList[index]
+ let bFindCondition = true;
+ for (let i in conditions) {
+ const condition = conditions[i];
+ let bFind = false;
+ for (let i2 in ele.form.items) {
+ const ele2 = ele.form.items[i2];
+ if (ele2.name != "Layout") {
+ if (ele2.fieldId == condition.attr) {
+ if (condition.value == ele2.value) {
+ bFind = true;
+ }
+ break;
+ }
+ } else {
+ const colList = ele2.setting.colList || [];
+ for (let i3 in colList) {
+ const col = colList[i3];
+ if (col.fieldId == condition.attr) {
+ if (condition.value == col.value) {
+ bFind = true;
+ }
+ break;
+ }
+ }
+ if (bFind) break;
+ }
+ }
+ if (!bFind) {
+ bFindCondition = false;
+ break;
+ }
+ }
+ if (bFindCondition) {
+ bFindRow = true;
+ }
+ }
+ }
+ }
+ if (bFindRow) {
ele.SelBut_Checked = true;
this.active_id = ele.form.htmlobjId;
//鑷姩婊氬姩鍒版寚瀹氬厓绱�@@ -1120,7 +1190,8 @@
}).exec();
}).exec();
}
- });
+ break
+ }
}
},
@@ -1129,23 +1200,73 @@
if (JSON.stringify(value.row) == '{}') {
return;
}
- const pageIndex = $this.pageDetail.findIndex((page, index2, arr) => {
+ const pageIndex = this.pageDetail.findIndex((page, index2, arr) => {
return value.page_name == page.Name;
})
if (pageIndex < 0)
return
- const pageData = $this.pageDetail[pageIndex]
+ const pageData = this.pageDetail[pageIndex]
if (pageData?.DefList) //鍒ゆ柇杩斿洖鐨刟ction鐨刾age_name鏄惁鏄緟鍒嗘嫞//娓呴櫎闈㈡澘涓寚瀹歩d鐨勬暟鎹� {
+ const detailStyleDefList = pageData.DefList || []
value.row.forEach((row) => {
- pageData.DefList.forEach((ele, index) => {
- if (ele.form.objId == row.id) {
- pageData.DefList.splice(index, 1);
+ if (row.id) {
+ for (let index = 0; index < detailStyleDefList.length; index++) {
+ const ele = detailStyleDefList[index]
+ if (ele.form.objId == row.id) {
+ detailStyleDefList.splice(index, 1);
+ index--;
+ }
}
- });
+
+ } else {
+ const conditions = row.condition || [];
+ if (conditions.length > 0) {
+ for (let index = 0; index < detailStyleDefList.length; index++) {
+ const ele = detailStyleDefList[index]
+ let bFindCondition = true;
+ for (let i in conditions) {
+ const condition = conditions[i];
+ let bFind = false;
+ for (let i2 in ele.form.items) {
+ const ele2 = ele.form.items[i2];
+ if (ele2.name != "Layout") {
+ if (ele2.fieldId == condition.attr) {
+ if (condition.value == ele2.value) {
+ bFind = true;
+ }
+ break;
+ }
+ } else {
+ const colList = ele2.setting.colList || [];
+ for (let i3 in colList) {
+ const col = colList[i3];
+ if (col.fieldId == condition.attr) {
+ if (condition.value == col.value) {
+ bFind = true;
+ }
+ break;
+ }
+ }
+ if (bFind) break;
+ }
+ }
+ if (!bFind) {
+ bFindCondition = false;
+ break;
+ }
+ }
+ if (bFindCondition) {
+ detailStyleDefList.splice(index, 1);
+
+ }
+ }
+ }
+
+ }
});
}
- $this.$set(this.pageDetail, pageIndex, pageData)
+ this.$set(this.pageDetail, pageIndex, pageData)
},
//鏇存柊鍒嗛〉绛句腑鐨勫垪琛ㄩ」鍐呭
viewActionSetRow(value) {
@@ -1156,61 +1277,40 @@
if (pageIndex < 0)
return
const pageData = $this.pageDetail[pageIndex]
- var detailStyleDefList = pageData.DefList || []
+ const detailStyleDefList = pageData.DefList || []
detailStyleDefList.forEach(ele => {
value.row.forEach((rowData) => {
if (rowData.id) {
if (ele.form.objId == rowData.id) {
rowData.attrs.forEach(attr => {
ele.form.items.forEach(ele2 => {
- if (ele2.name !=
- 'Layout') {
- if (ele2.fieldId ==
- attr
- .attr) {
- ele2.value =
- $this
- .operationNumber(
- ele2
- .value,
- attr
- .value,
- attr
- .operation
- )
+ if (ele2.name != 'Layout') {
+ if (ele2.fieldId == attr.attr) {
+ ele2.value = $this.operationNumber(
+ ele2.value,
+ attr.value,
+ attr.operation
+ )
}
- } else if (ele2.name ==
- 'Layout') {
- ele2.setting
- .colList
- .forEach(
- col => {
- if (
- col) {
- if (col
- .fieldId ==
- attr
- .attr
- ) {
- col.value =
- $this
- .operationNumber(
- col
- .value,
- attr
- .value,
- attr
- .operation
- )
- }
- }
- })
+ } else if (ele2.name == 'Layout') {
+ ele2.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr.attr) {
+ col.value = $this
+ .operationNumber(
+ col.value,
+ attr.value,
+ attr.operation
+ )
+ }
+ }
+ })
}
});
});
}
} else if (rowData.condition) {
- const conditions = rowData.condition;
+ const conditions = rowData.condition
let bFindCondition = true;
for (let i in conditions) {
const condition = conditions[i];
@@ -1244,62 +1344,40 @@
}
}
if (bFindCondition) {
-
rowData.attrs.forEach(attr => {
ele.form.items.forEach(ele2 => {
- if (ele2.name !=
- 'Layout') {
- if (ele2.fieldId ==
- attr
- .attr) {
+ if (ele2.name != 'Layout') {
+ if (ele2.fieldId == attr.attr) {
ele2.value =
- $this
- .operationNumber(
- ele2
- .value,
- attr
- .value,
- attr
- .operation
+ $this.operationNumber(
+ ele2.value,
+ attr.value,
+ attr.operation
)
}
- } else if (ele2.name ==
- 'Layout') {
- ele2.setting
- .colList
- .forEach(
- col => {
- if (
- col) {
- if (col
- .fieldId ==
- attr
- .attr
- ) {
- col.value =
- $this
- .operationNumber(
- col
- .value,
- attr
- .value,
- attr
- .operation
- )
- }
- }
- })
+ } else if (ele2.name == 'Layout') {
+ ele2.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr.attr) {
+ col.value =
+ $this.operationNumber(
+ col.value, attr
+ .value, attr
+ .operation)
+ }
+ }
+ })
}
});
});
}
+
}
})
});
- pageData.DefList = detailStyleDefList
+ pageData.DefList = detailStyleDefList
$this.$set(this.pageDetail, pageIndex, pageData)
-
},
//鍔犺浇姝ｅ湪鐮佺洏鍐呭
viewAceionRow(data) {
@@ -1321,28 +1399,22 @@
data.row.forEach(row => {
detailStyle = JSON.parse(styleStr);
detailStyle.form.objId = row.id;
- detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '')
+ detailStyle.form.htmlobjId = row.id ? row.id.replace(/-/g, '').replace('{', '')
.replace(
- '{', '').replace('}',
- '') : 'null';
+ '}', '') : 'null';
detailStyle.form.attrs = row.attrs;
row.attrs.forEach(attr => {
detailStyle.form.items.forEach(ele => {
if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) ele
- .value =
- attr.value;
+ if (ele.fieldId == attr.attr)
+ ele.value = attr.value;
} else if (ele.name == 'Layout') {
- ele.setting.colList.forEach(
- col => {
- if (col) {
- if (col.fieldId ==
- attr
- .attr) col
- .value = attr
- .value;
- }
- });
+ ele.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == attr.attr)
+ col.value = attr.value;
+ }
+ });
}
});
});
@@ -1385,18 +1457,15 @@
cont.attrs.forEach(attr => {
detailStyle.form.items.forEach(ele => {
if (ele.name != 'Layout') {
- if (ele.fieldId == attr.attr) ele
- .value =
- attr.value;
+ if (ele.fieldId == attr.attr)
+ ele.value = attr.value;
} else if (ele.name == 'Layout') {
ele.setting.colList.forEach(
col => {
if (col) {
if (col.fieldId ==
- attr
- .attr) col
- .value = attr
- .value;
+ attr.attr)
+ col.value = attr.value;
}
});
}
@@ -1406,42 +1475,25 @@
if (data.clear == false) {
var isflag = true;
pageData.DefList.forEach((style, index) => {
- if (style.form.objId == detailStyle.form
- .objId) {
+ if (style.form.objId == detailStyle.form.objId) {
cont.attrs.forEach(attr => {
- style.form.items.forEach(
- ele => {
- if (ele.name !=
- 'Layout') {
- if (ele
- .fieldId ==
- attr.attr)
- ele
- .value =
- attr.value;
- } else if (ele
- .name ==
- 'Layout') {
- ele.setting
- .colList
- .forEach(
- col => {
- if (
- col
- ) {
- if (col
- .fieldId ==
- attr
- .attr
- )
- col
- .value =
- attr
- .value;
- }
- });
- }
- });
+ style.form.items.forEach(ele => {
+ if (ele.name != 'Layout') {
+ if (ele.fieldId == attr.attr)
+ ele.value = attr.value;
+ } else if (ele.name == 'Layout') {
+ ele.setting.colList.forEach(
+ col => {
+ if (col) {
+ if (col.fieldId ==
+ attr
+ .attr)
+ col.value =
+ attr.value;
+ }
+ });
+ }
+ });
});
isflag = false;
}
@@ -1535,7 +1587,7 @@
async del(pageData, style, event) {
//鑾峰彇琛ㄥご灞炴�
var head_attr = {};
- this.$data.head_styledef.form.items.forEach(item => {
+ this.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
if (col != null) head_attr[col.fieldId] =
@@ -1628,15 +1680,15 @@
// console.log(e.target.dataset);
var index = e.target.dataset.index;
var ischeck = e.target.dataset.ischeck;
- var data = this.$data.check_list.items;
- // this.$data.check_list.items=[];
- if (this.$data.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫�+ var data = this.check_list.items;
+ // this.check_list.items=[];
+ if (this.check_list.multiple_choice == "0") { //鍒ゆ柇鏃跺崟閫夎繕鏄閫� for (var i in data) {
data[i].check = false;
}
}
data[index].check = ischeck ? false : true;
- this.$data.check_list.items = data;
+ this.check_list.items = data;
},
popup_cancel(e) { //寮规鍙栨秷
@@ -1644,7 +1696,7 @@
},
popup_sava(e) { //寮规纭畾
var $this = this;
- var items = $this.$data.check_list.items;
+ var items = $this.check_list.items;
var data = [];
var name = "";
for (var i = 0; i < items.length; i++) {
@@ -1658,7 +1710,7 @@
});
}
}
- if (!$this.$data.popupParam) {
+ if (!$this.popupParam) {
uni.showModal({
title: this.translateSys("tip"),
content: "popupParam涓虹┖锛�,
@@ -1676,7 +1728,7 @@
});
return;
}
- var callback_eventid = $this.$data.popupParam.button_callback.trim();
+ var callback_eventid = $this.popupParam.button_callback.trim();
var info = {
eventid: callback_eventid,
edtype: "0",
@@ -1684,12 +1736,12 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: $this.$data.ClsID,
+ clsid: $this.ClsID,
objid: "",
- attr: $this.$data.popupParam.req,
+ attr: $this.popupParam.req,
dataJson: data
}
- $this.DataObjRunCustomEvent(info, $this.$data.popupParam.data_attr);
+ $this.DataObjRunCustomEvent(info, $this.popupParam.data_attr);
this.$refs.popup.close();
},
@@ -1697,18 +1749,18 @@
var $this = this;
var enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�- cls_id: this.$data.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+ cls_id: this.ClsID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 'button': 'top', // top/bottom
button_name: this.translateSys('add2'),
master: {
- cls_id: this.$data.ClsID, // button=bottom鏃�master鐨刢ls_id
+ cls_id: this.ClsID, // button=bottom鏃�master鐨刢ls_id
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
}
};
if (data_attr) {
enviroment.edit_dlg = {
type: 'small', //灏忕獥鍙�- class_id: this.$data.ClsID, //褰撳墠鏁版嵁绫籭d
+ class_id: this.ClsID, //褰撳墠鏁版嵁绫籭d
}
if (data_attr) {
enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1724,7 +1776,7 @@
}
enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var input_param = Base64.encode(JSON.stringify(info.attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
- var global_attr = Base64.encode(JSON.stringify(this.$data.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
+ var global_attr = Base64.encode(JSON.stringify(this.global_attr)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
if (info.dataJson)
info.dataJson = Base64.encode(JSON.stringify(info.dataJson)); //灏嗗瓧绗︿覆杞崲涓篵ase64缂栫爜
var obj_attr = {};
@@ -1801,44 +1853,41 @@
} 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.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));
- $this.$data.head_styledef = [];
- $this.$data.head_styledef = head_styledef;
- // console.log($this.$data.head_styledef);
+ $this.head_styledef = [];
+ $this.head_styledef = head_styledef;
+ // console.log($this.head_styledef);
} else if (action.action_type == 'set_global_attr') {
- $this.$data.global_attr = action.value || [];
+ $this.global_attr = action.value || [];
} else {
uni.showModal({
title: this.translateSys("tip"),
@@ -1858,62 +1907,7 @@
console.log($this.head_styledef);
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++) {
- 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]
- .value;
- }
- //鍒ゆ柇鏄惁鏄爡鏍艰〃鍗�- if (attr.name != 'Layout') {
- if (attr.fieldId == result[i].attr) {
- attr.value = '';
- attr.oldvalue = '';
- attr.value = result[i].value;
- attr.oldvalue = result[i].value;
- $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) {
- col.value = '';
- col.oldvalue = '';
- col.value = result[i].value;
- col.oldvalue = result[i].value;
- $this.head_styledef.form.model[col
- .fieldId] =
- result[i].value;
- }
- }
- });
- }
- }
-
- var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
- return result[i].attr == s.attr
- }).length) {
- length = 1;
- $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]
- .attr) {
- $this.$data.refdatastore[j].value = result[i]
- .value;
- }
- }
- }
- }
+ $this.setFormValues(result)
}
}
@@ -1950,18 +1944,6 @@
attr: a,
value: obj_attr[a] || "",
}));
- if ($this.refdatastore.length > 0) {
- for (var i = 0; i < $this.refdatastore.length; i++) {
- if (!req.filter(function(s) {
- return $this.refdatastore[i].attr == s.name
- }).length) {
- req.push({
- 'attr': $this.refdatastore[i].attr,
- 'value': $this.refdatastore[i].value
- });
- }
- }
- }
var extinfo = enviroment;
extinfo.edit_dlg = {
@@ -2092,7 +2074,7 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: $this.$data.param
+ clsid: $this.param
.DataCls
.id,
objid: "",
@@ -2181,8 +2163,8 @@
data[0].ID +
';' + data[0].Name;
- // $this.$data.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
- // $this.$data.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
+ // $this.classAttrList[param.index].Attr[param.iindex].Value=data[0].Name;
+ // $this.classAttrList[param.index].Attr[param.iindex].ValID=data[0].ID+';'+data[0].Name;
var callback_eventid = param
.button_callback
.trim();
@@ -2294,7 +2276,13 @@
})
} else {
- this.onButtonClicked(btn, pageData, -1);
+ this.handleButtonClick((done) => {
+ this.onButtonClicked(btn, pageData, -1);
+ setTimeout(() => {
+ done(); // 閲嶇疆鐘舵�
+ }, 1000);
+ });
+
}
},
onRowBtnClick(btn, pageData, index) {
@@ -2315,7 +2303,13 @@
})
} else {
- this.onButtonClicked(btn, pageData, index);
+ this.handleButtonClick((done) => {
+ this.onButtonClicked(btn, pageData, index);
+ setTimeout(() => {
+ done(); // 閲嶇疆鐘舵�
+ }, 1000);
+ });
+
}
},
onButtonClicked(btn, pageData, index) {
@@ -2410,7 +2404,8 @@
} else {
ele.setting.colList.forEach(async (col) => {
if (col) {
- let value = formData[col.fieldId]
+ let value = formData[col
+ .fieldId]
if (value)
col.value = value
}
@@ -2418,7 +2413,6 @@
}
})
$this.$set($this.pageDetail, pageIndex, pageData)
-
},
}
@@ -2461,7 +2455,8 @@
} else {
ele.setting.colList.forEach(async (col) => {
if (col) {
- let value = formData[col.fieldId]
+ let value = formData[col
+ .fieldId]
if (value)
col.value = value
}
@@ -2469,6 +2464,7 @@
}
})
$this.$set($this.pageDetail, pageIndex, pageData)
+ console.log($this.pageDetail)
},
}
@@ -2480,10 +2476,10 @@
this.After_OK_Event = pageData.After_ok;
// console.log(this.Before_OK_Event);
// console.log(this.After_OK_Event);
- if (this.$data.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
- this.sava(pageData, this.$data.Before_OK_Event);
- else if (this.$data.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
- this.sava(pageData, this.$data.After_OK_Event);
+ if (this.Before_OK_Event.ID) //鏄惁鏈夌‘瀹氬墠浜嬩欢
+ this.sava(pageData, this.Before_OK_Event);
+ else if (this.After_OK_Event.ID) //鏄惁鏈夌‘瀹氬悗浜嬩欢
+ this.sava(pageData, this.After_OK_Event);
},
sava(pageData, event) {
var $this = this;
@@ -2504,9 +2500,8 @@
return false;
}
//鑾峰彇琛ㄥご灞炴�
- pageData.okLoading = true
var head_attr = {};
- this.$data.head_styledef.form.items.forEach(item => {
+ this.head_styledef.form.items.forEach(item => {
if (item.name == "Layout") { //鍒ゆ柇鏄惁鏄爡鏍忔牸寮� item.setting.colList.forEach(col => {
if (col != null) head_attr[col.fieldId] =
@@ -2584,7 +2579,6 @@
});
});
if (jsonlist.length == 0) {
- pageData.okLoading = false
uni.showModal({
title: this.translateSys("tip"),
content: this.translate("tip_no_select_data"),
@@ -2614,7 +2608,7 @@
var dataInfo = {
ed_type: 0,
start_transaction: true,
- class_id: this.$data.ClsID,
+ class_id: this.ClsID,
class_name: '',
event_id: event.ID,
event_name: '',
@@ -2630,8 +2624,6 @@
global_attr: '',
input_param: input_param,
};
-
- // console.log(dataInfo);
runCustomEvent(dataInfo).then(result => {
console.log(result);
if (result.ret != 0) {
@@ -2678,57 +2670,82 @@
// uni.showModal({title:this.translateSys("tip"),content:JSON.stringify(result.action),showCancel:false,confirmText:this.translateSys("cancel")});
result.action.forEach(item => {
- if (item.action_type == "insert_subtable_page_row") { //鐮佺洏涓�+ if (item.action_type ==
+ "insert_subtable_page_row") { //鐮佺洏涓� var value = item.value;
//鍔犺浇宸茬粡鐮佺洏鏁版嵁
$this.viewAceionRow(value);
//娓呯┖鏉＄爜鍐呭
- $this.$data.head_styledef.form.items.forEach((item, index) => {
- if (item.fieldId != "S_CNTR_CODE") {
+ $this.head_styledef.form.items.forEach((item,
+ index) => {
+ if (item.fieldId !=
+ "S_CNTR_CODE") {
item.value = '';
item.oldvalue = '';
- $this.$data.head_styledef.form.model[item
+ $this.head_styledef.form.model[
+ item
.fieldId] = '';
}
});
uni.showModal({
title: $this.translateSys("tip"),
- content: $this.translate('execute_event_success'),
+ content: $this.translate(
+ 'execute_event_success'),
showCancel: false,
- confirmText: $this.translateSys('close')
+ confirmText: $this.translateSys(
+ 'close')
});
} else if (item.action_type ==
"set_subtable_page_content"
) { //宸茬爜鐩�- $this.$data.param.Show_Welcom_Page = false;
+ $this.param.Show_Welcom_Page = false;
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 (value.clear_confirm != false && value.clear == true &&
+ if (value.clear_confirm != false && value
+ .clear == true &&
pageData && pageData.DefList.length > 0
) { //鍒ゆ柇鏄惁娓呯┖椤电鍐呭,姝ｅ湪鐮佺洏鏄惁鏈夋暟鎹� uni.showModal({
- title: $this.translateSys('tip'),
+ title: $this.translateSys(
+ 'tip'),
content: $this.translate(
- "are_you_sure_clear_first") +
- $this.translateSys("quotation_mark_left") +
+ "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'),
+ "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) {
+ pageData
+ .DefList = [];
+ $this
+ .viewAceionContent(
+ value);
+ } else if (res
+ .confirm) {
if (pageData)
- pageData.DefList = [];
- $this.viewAceionContent(value);
+ pageData
+ .DefList = [];
+ $this
+ .viewAceionContent(
+ value);
}
}
});
@@ -2738,45 +2755,70 @@
$this.viewAceionContent(value);
}
} else if (item.action_type ==
+ "select_subtable_page") {
+ var value = item.value;
+ const pageIndex = $this.pageDetail.findIndex((
+ page) => {
+ return value.page_name == page
+ .Name;
+ });
+ if (pageIndex > -1) {
+ $this.setData({
+ current: pageIndex
+ })
+ }
+ } 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") {
+ } 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") {
let 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
}
- } else if (item.action_type == "clear_subpage_rows") {
+ } else if (item.action_type ==
+ "clear_subpage_rows") {
var value = item.value;
- const pageIndex = $this.pageDetail.findIndex((page) => {
- return value.page_name == page.Name;
+ const pageIndex = $this.pageDetail.findIndex((
+ page) => {
+ return value.page_name == page
+ .Name;
});
if (pageIndex > -1) {
- const pageData = $this.pageDetail[pageIndex]
+ const pageData = $this.pageDetail[
+ pageIndex]
pageData.DefList = []
pageData.ExtData = {}
- $this.$set(this.pageDetail, pageIndex, pageData)
+ $this.$set(this.pageDetail, pageIndex,
+ pageData)
}
- } 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)
$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 ==
@@ -2788,8 +2830,8 @@
});
} else {
- if ($this.$data.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
- $this.sava(pageParam, $this.$data.After_OK_Event); //鎵ц纭畾鍚庝簨浠�+ if ($this.After_OK_Event.ID != event.ID) { //鍒ゆ柇褰撳墠浜嬩欢鏄惁鏄‘瀹氬悗浜嬩欢
+ $this.sava(pageParam, $this.After_OK_Event); //鎵ц纭畾鍚庝簨浠�
}
}
@@ -2806,9 +2848,8 @@
}
}
- pageParam.okLoading = false
}).catch(ex => {
- pageParam.okLoading = false
+ console.log(ex);
let tip = typeof ex.errMsg == "string" ? ex.errMsg : ex
uni.showModal({
title: this.translateSys("error") + "8.1",
@@ -3036,45 +3077,6 @@
padding: 0px;
margin: 0;
- .dv-panel-form-item {
- margin: 0;
- padding: 0px;
- }
-
- .uni-forms-item {
- padding-bottom: 5rpx;
- margin-bottom: 0;
-
- .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%;
- }
- }
-
}
@@ -3196,14 +3198,6 @@
.input-disabled {
background-color: #f3f3f3 !important;
- }
-
- ::v-deep .uni-row {
- margin-bottom: 0px;
- }
-
- .view-tabpage ::v-deep .uni-row {
- margin-bottom: 5px;
}
.demo-uni-col {
--
Gitblit v1.9.1