From 3ddb7987b031a152309c58dabd949e23d3419a72 Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期五, 01 八月 2025 15:33:50 +0800
Subject: [PATCH] test
---
pages/modal/3037_2.vue | 1526 ++++++++++++++++++++++++++++------------------------------
1 files changed, 733 insertions(+), 793 deletions(-)
diff --git a/pages/modal/3037_2.vue b/pages/modal/3037_2.vue
index 9487d2a..388c9b1 100644
--- a/pages/modal/3037_2.vue
+++ b/pages/modal/3037_2.vue
@@ -1,81 +1,10 @@
<template>
- <view class="uni-page-modal-3017-2">
+ <view class="uni-page-modal-3017-2" :class="largeMode?'large-mode':''">
<!-- 琛ㄥご鏍峰紡 -->
- <view class="v-headStyle" v-for="(item,index) in head_styledef.form.items">
- <!-- 鏅�甯冨眬 -->
- <view v-if="item.name!='Layout' && item.show==true">
- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <!-- 涓嬫媺妗�鍗曢� item.useDict?item.dict:item.selections-->
- <uni-data-select id="dv_select" v-if="item.name=='Select'" :class="item.disabled?'input-disabled':''"
- v-model="item.value" :localdata="item.dict" @change="onEnterChange(item)" :disabled="item.disabled"
- :clear="false"></uni-data-select>
- <!-- 鏂囨湰妗�鏁板瓧妗�-->
- <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>
- <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="focusMateria" @focus="ontap(item)" @keyup.enter="onEnterChange(item)"
- @blur="onEnterChange(item)" :maxlength="-1" />
- <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'">
- <textarea class="uni-input" :class="item.disabled?'input-disabled':''" v-model="item.value"
- :placeholder="item.placeholder" @blur="onEnterChange(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':''" :disabled="item.disabled" @change="onCheckBoxValue"
- :data-attr="item.fieldId" :data-index="index">
- <label v-for="(item2) in item.selections" :key="item2.value">
- <checkbox :value="item2.value" :checked="item.value.includes(item2.value)" />
- <text>{{item2.label}}</text>
- </label>
- </checkbox-group>
- <!-- 鍗曢�妗�-->
- <radio-group class="check_rememberPwd" v-if="item.name=='Radio'"
- :class="item.disabled?'input-disabled':''" :disabled="item.disabled" @change="onRadioBoxValue"
- :data-attr="item.fieldId" :data-index="index">
- <label v-for="(item2) in item.selections" :key="item2.value">
- <radio :value="item2.value" :checked="item2.value === item.value" />
- <text>{{item2.label}}</text>
- </label>
- </radio-group>
- <!-- Switch寮�叧 -->
- <switch v-if="item.name=='Switch'" :class="item.disabled?'input-disabled':''" :disabled="item.disabled"
- v-model="item.value" @change="onModelValue(item)" :style="{'margin-left':'10rpx'}" />
- <!-- 鏃ユ湡鏃堕棿 -->
- <!-- <view class="input-wrapper" v-if="item.name=='TimePicker' || item.name=='DatePicker'">
- <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>
- -->
- <view class="input-wrapper"
- v-if="item.name=='TimePicker' || item.name=='DatePicker'|| item.name=='DatePickerRange'">
- <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)" />
- </view>
- </view>
-
- </view>
+ <OIForm ref="refBaseForm" class="v-headStyle" :form="head_styledef.form"
+ :hiddenIds="head_styledef.hiddenIds ?head_styledef.hiddenIds :[] " @on-focus="ontap"
+ @on-change="onEnterChange" @on-click-prefix="classAttr_extButton" @on-click-suffix="classAttr_extButton">
+ </OIForm>
<!-- 浠庢暟鎹�-->
<view class="v-panel">
<div class="panel_title">{{param.Sub_Cls.Title}}</div>
@@ -105,40 +34,38 @@
<!-- 浠庢暟鎹樉绀鸿鎯呭尯 -->
<view class="v-panellist" v-for="(subpanel,iiindex) in subPanelList" @tap="onPanelClick(iiindex)"
:class="activelist[iiindex].active==true?'bk-active':''">
- <view class="v-area dv-panel" v-for="(item,index) in subpanel.subClassAttr.form.items">
- <div class="dv-panel-input">
- <!-- 鏅�甯冨眬 -->
- <view v-if="item.name!='Layout' && item.show==true">
- <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}锛�/text>
- <span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
- <!-- 鏂囨湰妗�鏁板瓧妗�-->
- <view v-else class="input-wrapper">
- <input :type="item.name=='InputNumber'?'number':'text'" v-model="item.value"
- :placeholder="item.placeholder" :maxlength="-1"
- @on-enter="onDetail1EnterChange(item)" />
- </view>
- </view>
+ <uni-forms class="v-area dv-panel" label-align="right">
+ <view v-for="(item,index) in subpanel.subClassAttr.form.items" :key="index">
<!-- 鏍呮牸甯冨眬 -->
- <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">
- <view v-if="cols!=null">
- <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 v-else class="input-wrapper">
- <input :type="cols.name=='InputNumber'?'number':'text'" v-model="cols.value"
- :placeholder="cols.placeholder" :maxlength="-1"
- @on-enter="onDetail1EnterChange(cols)" />
- </view>
+ <uni-row v-if="item.name == 'Layout'" :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" :key="key">
+ <uni-forms-item v-if="col != null"
+ :label="col.labelWidth === 0 ? '' : col.label? col.label+'锛�:''"
+ :label-width="col.labelWidth || col.labelWidth === 0 ? col.labelWidth : 100+'px'">
+ <view v-if="col.disabled">{{col.value}}</view>
+ <input class="uni-input" v-else-if="col.name=='Input' || col.name=='InputNumber'"
+ :type="col.name=='InputNumber'?'number':'text'" v-model="col.value"
+ :placeholder="col.placeholder" :maxlength="-1" />
+ <view v-else>{{col.value}}</view>
- </view>
+ </uni-forms-item>
+ <uni-forms-item v-else label=""></uni-forms-item>
</uni-col>
</uni-row>
- </div>
- </view>
+ <uni-forms-item v-else :label="item.labelWidth === 0 ? '' : item.label? item.label+'锛�:''"
+ :label-width="item.labelWidth || item.labelWidth === 0 ? item.labelWidth : 100+'px'"
+ :style="{ textAlign: item.setting.align }">
+ <view v-if="item.disabled">{{item.value}}</view>
+ <input v-else-if="item.name=='Input' || item.name=='InputNumber' " class="uni-input"
+ :type="item.name=='InputNumber'?'number':'text'" v-model="item.value"
+ :disabled="item.disabled" :placeholder="item.placeholder" :maxlength="-1" />
+ <view v-else>{{item.value}}</view>
+ </uni-forms-item>
+ </view>
+ </uni-forms>
<view class="v-paneldel" v-if="param.Sub_Cls.Can_Add_Delete == true">
<a href="javascript:;" class="panel_del" @tap="panel_del(iiindex)"><i
class="ace-icon fu-delete"></i></a>
@@ -151,9 +78,9 @@
<view class="view-floor">
<button type="default" @tap="cancel" class="btn_cancel"
v-if="param.Sub_Cls.Can_Add_Delete == true">{{translateSys('cancel')}}</button>
- <button type="default" @tap="sava" class="btn_add" v-if="param.Sub_Cls.Can_Add_Delete == true"
+ <button type="default" @tap="onSave" class="btn_add" v-if="param.Sub_Cls.Can_Add_Delete == true"
:class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
- <button type="default" @tap="sava" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false"
+ <button type="default" @tap="onSave" class="btn_sava" v-else-if="param.Sub_Cls.Can_Add_Delete == false"
:class="saving?'btn_disabled':''" :disabled="saving">{{title}}</button>
</view>
<!-- 鏅�寮圭獥 top bottom center left right -->
@@ -186,7 +113,9 @@
</template>
<script>
- import Base64 from '../../components/js-base64/base64.js'
+ import {
+ Base64
+ } from '@/js/Base64.js';
import utils from "@/js/utils.js"
import {
appGetInfo,
@@ -199,21 +128,17 @@
dataObjDel
} 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'
+ import OIForm from '@/components/oi-form/index.vue'
+ import buttonClickMixin from '@/mixins/button-click.js';
export default {
- modules: {
- Base64,
- },
+ mixins: [buttonClickMixin],
components: {
- OIDatePicker,
- OIDatePickerRange,
- OITimePicker
+ OIForm
},
data() {
return {
+ largeMode: getApp().globalData.largeMode || false,
title: this.translateSys('add2'),
param: {},
edit_inital_event: "", //寮圭獥鍒濆鍖栦簨浠禝D
@@ -246,8 +171,8 @@
uni.setNavigationBarTitle({
title: options.titlename
}); //璁剧疆椤堕儴鏍囬
- this.$data.title = options.titlename;
- this.$data.param = JSON.parse(options.param);
+ this.title = options.titlename;
+ this.param = JSON.parse(options.param);
this.loadData(options.paramValue)
//椤甸潰鍒濆鍖栬幏鍙栫劍鐐�@@ -276,14 +201,14 @@
});
},
async loadData(paramValue) {
- console.log(this.$data.param);
+ console.log(this.param);
//鑾峰彇鏁版嵁绫荤殑鑷畾涔夎〃鍗曞弬鏁� await this.Head_UIStyleGetInfo(this.param.Master_Cls?.ID, this.param.Master_Cls?.UI_Style?.ID);
//浼犲叆鍙傛暟鍊� 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) {
@@ -305,7 +230,7 @@
})
}
- await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.$data.param.Sub_Cls?.UI_Style?.ID);
+ await this.Detail1_UIstyleGetInfo(this.param.Sub_Cls?.ID, this.param.Sub_Cls?.UI_Style?.ID);
},
async Head_UIStyleGetInfo(class_id, style_id) { //鑾峰彇鑷畾涔夎〃鍗曟牱寮� var $this = this;
@@ -324,8 +249,8 @@
if (!result.style_def.includes('"')) styledef = Base64.decode(result
.style_def);
}
- $this.$data.head_styledef = result.style_def ? JSON.parse(styledef) : {};
- // console.log($this.$data.head_styledef);
+ $this.head_styledef = result.style_def ? JSON.parse(styledef) : {};
+ // console.log($this.head_styledef);
if ($this.head_styledef.form?.items) {
$this.head_styledef.form.items.forEach(async (ele, index) => {
ele.show = true;
@@ -340,7 +265,8 @@
$this.head_styledef.form
.model[ele.fieldId] = itemName;
}
- $this.head_styledef.form.items[index].dict = selections.map((a) => {
+ $this.head_styledef.form.items[index].selections = selections.map((
+ a) => {
return {
value: a.value,
text: a.label
@@ -350,6 +276,25 @@
}
});
+ const app = getApp()
+ if (app.globalData.bindClasses) {
+ $this.head_styledef.form.items.push({
+ name: "Input",
+ label: this.translate("classes"),
+ labelWidth: 100,
+ disabled: true,
+ value: app.globalData.classes,
+ setting: {
+ width: 100,
+ height: 50,
+ },
+ bind: {
+ attr: "",
+ },
+ fieldId: "S_CLASSES",
+ })
+ $this.head_styledef.form.model["S_CLASSES"] = app.globalData.classes
+ }
}
if ($this.head_styledef.event?.length > 0) {
$this.head_styledef.event.forEach(async (a) => { //鍒ゆ柇鏄惁鏄垵濮嬪寲浜嬩欢
@@ -386,8 +331,8 @@
if (!result.style_def.includes('"')) styledef = Base64.decode(result
.style_def);
}
- $this.$data.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
- $this.$data.detail1_styledef.SelBut_Checked = true;
+ $this.detail1_styledef = result.style_def ? JSON.parse(styledef) : {};
+ $this.detail1_styledef.SelBut_Checked = true;
if ($this.detail1_styledef.form?.items) {
$this.detail1_styledef.form.items.forEach(async (ele, index) => {
if (ele.useDict == true) { //鍒ゆ柇useDict鏄惁浣跨敤瀛楀吀
@@ -400,7 +345,8 @@
if (itemName) {
$this.detail1_styledef.form.items[ele.fieldId] = itemName;
}
- $this.detail1_styledef.form.items[index].dict = selections.map((a) => {
+ $this.detail1_styledef.form.items[index].selections = selections.map((
+ a) => {
return {
value: a.value,
text: a.label
@@ -457,7 +403,7 @@
$this.head_styledef.form.model[attr] = itemName;
}
$this.head_styledef.form.items[index].dict = list;
- // console.log($this.$data.detail1StyleDefList);
+ // console.log($this.detail1StyleDefList);
} else {
if (itemName) {
$this.detail1_styledef.form.items[index].value = itemName;
@@ -465,7 +411,7 @@
$this.detail1_styledef.form.model[attr] = itemName;
}
$this.detail1_styledef.form.items[index].dict = list;
- console.log($this.$data.detail1_styledef);
+ console.log($this.detail1_styledef);
}
} catch (ex) {
@@ -518,158 +464,175 @@
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- for (var i = 0; i < result.length; i++) {
- if (result[i].choice_list) {
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ for (var i = 0; i < result.length; i++) {
+ if (result[i].choice_list) {
+ for (var c = 0; c < styledef.form.items.length; c++) {
+ var attr = styledef.form.items[c];
+ if (attr.name != 'Layout') {
+ if (attr.fieldId == result[i].attr) {
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "text": val,
+ "value": val
+ });
+ }
+ attr.dict = dictItemList;
+ }
+ } else if (attr.name == 'Layout') {
+ attr.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr) {
+ var dictItemList = [];
+ for (var d in result[i]
+ .choice_list) {
+ var val = result[i]
+ .choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "text": val,
+ "value": val
+ });
+ }
+ col.dict = dictItemList;
+ }
+ }
+ });
+ }
+
+ }
+ }
for (var c = 0; c < styledef.form.items.length; c++) {
var attr = styledef.form.items[c];
+ // console.log(attr[j].Name+'=='+result[i].attr);
+ //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿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) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "text": val,
- "value": val
- });
- }
- attr.dict = dictItemList;
+ 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) {
- var dictItemList = [];
- for (var d in result[i]
- .choice_list) {
- var val = result[i]
- .choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "text": val,
- "value": val
- });
- }
- col.dict = dictItemList;
+ col.value = '';
+ col.oldvalue = '';
+ col.value = result[i].value;
+ col.oldvalue = result[i].value;
+ $this.head_styledef.form.model[col
+ .fieldId] = result[i].value;
}
}
});
}
+ }
- }
}
- for (var c = 0; c < styledef.form.items.length; c++) {
- var attr = styledef.form.items[c];
- // console.log(attr[j].Name+'=='+result[i].attr);
- //鍒ゆ柇琛ㄥ崟閲屾槸鍚︽湁杩斿洖瀛楁锛屾病鏈夊氨瑁呰浇鍒癿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;
+ } else if (data.action[i].action_type == 'set_dlg_attr_show') {
+ var result = action.value;
+ if (type == 'head') {
+ $this.setFormItemVisible(result)
+ // console.log($this.head_styledef);
+ } else {
+ result.forEach(async (attr, key) => {
+ 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;
+ }
+ }
+ });
}
});
- }
+ });
+ var style_def = JSON.parse(JSON.stringify(styledef));
+
+
+ $this.detail1_styledef = [];
+ $this.detail1_styledef = style_def;
+ // console.log($this.detail1_styledef);
}
- 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;
- }
- }
- }
- }
- } else if (data.action[i].action_type == 'set_dlg_attr_show') {
- var result = action.value;
- result.forEach(async (attr, key) => {
- 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;
- }
- }
- });
- }
- });
- });
- var style_def = JSON.parse(JSON.stringify(styledef));
- if (type == 'head') {
- $this.$data.head_styledef = [];
- $this.$data.head_styledef = style_def;
- // console.log($this.$data.head_styledef);
} else {
- $this.$data.detail1_styledef = [];
- $this.$data.detail1_styledef = style_def;
- // console.log($this.$data.detail1_styledef);
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translate('execute_init_event_failed') +
+ this.translateSys("full_stop") +
+ this.translate('reason') + this.translateSys("colon") +
+ this.translateSys("quotation_mark_left") + action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this
+ .translate('tip_action_unprocessed'),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
}
- } else {
- uni.showModal({
- title: this.translateSys("tip"),
- content: this.translate('execute_init_event_failed') +
- this.translateSys("full_stop") +
- this.translate('reason') + this.translateSys("colon") +
- this.translateSys("quotation_mark_left") + action
- .action_type + this.translateSys(
- "quotation_mark_right") + this
- .translate('tip_action_unprocessed'),
- showCancel: false,
- confirmText: this.translateSys('close')
- });
}
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
}
@@ -690,26 +653,25 @@
ontap(item) { //鎵爜鍔熻兘
//console.log(e.target)
getApp().onScan((result) => {
- //console.log(result.decodedata);
+ //console.log(result);
uni.hideKeyboard();
var $this = this;
console.log(item);
- if (item.oldvalue != result.decodedata) {
- item.oldvalue = result.decodedata;
- item.value = result.decodedata;
+ item.value = result
+ let newVal = item.value.trim()
+ if (newVal) {
+ item.oldvalue = newVal;
var attr = item.fieldId;
- $this.head_styledef.form.model[attr] = result.decodedata;
- if (result.decodedata) { //绗竴涓緭鍏ユ涓嶄负绌�- $this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
- // setTimeout(function(){
- // $this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
- setTimeout(function() {
- uni.hideKeyboard();
- }, 1000);
- // },500);
- }
+ $this.head_styledef.form.model[attr] = newVal;
+ $this.focusMateria = true; //鍒濆鍖栵紝绗簩涓緭鍏ユfocus灞炴�
+ // setTimeout(function(){
+ // $this.focusMateria=true; //绗簩涓緭鍏ユ鑾峰彇鐒︾偣
+ setTimeout(function() {
+ uni.hideKeyboard();
+ }, 1000);
+ // },500);
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�- var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+ var eventid = this.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
var obj_attr = this.head_styledef.form.model;
// console.log(obj_attr);
@@ -724,13 +686,13 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX', //this.param.Sub_Cls.ID,
objid: "",
attr: req,
mast_attr: [],
inputParamter: [{
attr: 'mast_input_3037',
- value: result.decodedata
+ value: newVal
}]
}
@@ -743,12 +705,23 @@
// console.log(e.target);
var $this = this;
console.log(item);
- if (item.oldvalue != item.value && item.value.trim() != "") {
- item.oldvalue = item.value;
+ let newVal = item.value
+ if (typeof item.value == "string") {
+ newVal = item.value.trim()
+ 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] = item.value;
+ $this.head_styledef.form.model[attr] = newVal;
+
//瀛愭暟鎹被鎵爜鍖轰簨浠惰剼鏈�- var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+ var eventid = this.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
var obj_attr = this.head_styledef.form.model;
// console.log(obj_attr);
@@ -763,13 +736,13 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX', //this.param.Sub_Cls.ID,
objid: "",
attr: req,
mast_attr: [],
inputParamter: [{
attr: 'mast_input_3037',
- value: item.value
+ value: newVal
}]
}
@@ -800,7 +773,7 @@
});
return;
}
- this.$data.popupType = 'right'
+ this.popupType = 'right'
// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
this.$refs.popup.open(this.popupType);
@@ -910,16 +883,28 @@
.info
.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: $this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: $this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
- if (data != "") {
- var actions = data.action;
- if (actions) {
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actions = data.action || []
for (var i = 0; i < actions.length; i++) {
var action = actions[i];
console.log(action)
@@ -964,7 +949,7 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: $this.$data.param
+ clsid: $this.param
.DataCls
.id,
objid: "",
@@ -1053,8 +1038,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();
@@ -1066,8 +1051,7 @@
rclsid: "",
robjid: "",
userlogin: "",
- clsid: $this.$data
- .param
+ clsid: $this.param
.DataCls.id,
objid: "",
attr: param.req,
@@ -1094,18 +1078,22 @@
});
}
}
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
- } else {
- uni.showModal({
- title: $this.translateSys('tip') + "5.2",
- content: $this.translateSys("quotation_mark_left") +
- "before_click_button" + $this.translateSys(
- "quotation_mark_right") + $this.translateSys(
- "comma") + 'event_id' + eventid,
- showCancel: false,
- confirmText: $this.translateSys('close')
- });
}
+
}
}).catch(ex => {
@@ -1125,10 +1113,16 @@
onEnterChange(item) {
console.log("onEnterChange", item);
- if (item.oldvalue != item.value && item.value.trim() != "") {
- item.oldvalue = item.value;
+ let newVal = item.value
+ if (typeof item.value == "string") {
+ newVal = item.value.trim()
+ if (!newVal)
+ return
+ }
+ if (item.oldvalue != newVal) {
+ item.oldvalue = newVal;
var attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
+ this.head_styledef.form.model[attr] = newVal;
var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠� if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠� this.onChange(onChangeEvent);
@@ -1170,17 +1164,22 @@
scan_ontap(e) { //鎵爜鍖烘壂鐮佸姛鑳� //console.log(e.target)
getApp().onScan((result) => {
- console.log(result.decodedata);
+ console.log(result);
+ item.value = result
+ let newVal = item.value
+ if (typeof item.value == "string") {
+ newVal = item.value.trim()
+ }
var isflag = true;
- for (var i in this.$data.subPanelList) {
- if (this.$data.subPanelList[i].scanCodeVal == result.decodedata)
+ for (var i in this.subPanelList) {
+ if (this.subPanelList[i].scanCodeVal == newVal)
isflag = false;
}
//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
if (isflag) {
uni.hideKeyboard();
- this.$data.scanCodeVal = result.decodedata;
- var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+ this.scanCodeVal = newVal;
+ var eventid = this.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
//涓绘暟鎹被灞炴�
var obj_attr = this.head_styledef.form.model;
@@ -1202,13 +1201,13 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX', //this.param.Sub_Cls.ID,
objid: "",
attr: mast_req,
sub_attr: req,
inputParamter: [{
attr: 'input_3037',
- value: this.$data.scanCodeVal
+ value: this.scanCodeVal
}]
}
@@ -1219,17 +1218,17 @@
},
scan_onevent(e) {
// console.log(e.target);
- if (e.target.value) {
+ if (e.detail.value) {
var isflag = true;
- for (var i in this.$data.subPanelList) {
- if (this.$data.subPanelList[i].scanCodeVal == e.target.value)
+ for (var i in this.subPanelList) {
+ if (this.subPanelList[i].scanCodeVal == e.detail.value)
isflag = false;
}
//瀛愭暟鎹被鎵爜鏌ヨ鏁版嵁
if (isflag) {
uni.hideKeyboard();
- this.$data.scanCodeVal = e.target.value;
- var eventid = this.$data.param.Scan_Code.Input_Change_Event.ID;
+ this.scanCodeVal = e.detail.value;
+ var eventid = this.param.Scan_Code.Input_Change_Event.ID;
if (eventid) {
//涓绘暟鎹被灞炴�
var obj_attr = this.head_styledef.form.model;
@@ -1258,13 +1257,13 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX', //this.param.Sub_Cls.ID,
objid: "",
attr: mast_req,
sub_attr: req,
inputParamter: [{
attr: 'input_3037',
- value: this.$data.scanCodeVal
+ value: this.scanCodeVal
}]
}
@@ -1273,81 +1272,19 @@
}
}
},
- onCheckBoxValue(e) { //缁戝畾Model鍊�- let values = e.detail.value || []
- const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
- if (item?.setting?.colList) {
- const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
- if (col) {
- col.value = values
- let attr = col.fieldId;
- this.head_styledef.form.model[attr] = col.value;
- var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- this.onChange(onChangeEvent);
- }
- return
- }
- } else {
- if (item) {
- item.value = values
- let attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
- var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- this.onChange(onChangeEvent);
- }
- }
- }
-
- },
- onRadioBoxValue(e) { //缁戝畾Model鍊�- let values = e.detail.value || ""
- const item = this.head_styledef.form.items[e.currentTarget?.dataset?.index || 0]
- if (item?.setting?.colList) {
- const col = item.setting.colList[e.currentTarget?.dataset?.iindex || 0]
- if (col) {
- col.value = values
- let attr = col.fieldId;
- this.head_styledef.form.model[attr] = col.value;
- var onChangeEvent = col.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- this.onChange(onChangeEvent);
- }
- return
- }
- } else {
- if (item) {
- item.value = values
- let attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
- var onChangeEvent = item.bind.onChangeEvent; //鍐呭鍙樺寲鍚庝簨浠�- if (onChangeEvent?.id) { //鍐呭鍙樺寲鍚庝簨浠�- this.onChange(onChangeEvent);
- }
- }
-
- }
-
- },
- onModelValue(item) { //缁戝畾Model鍊�- //console.log(e.target)
- var attr = item.fieldId;
- this.head_styledef.form.model[attr] = item.value;
- },
panel_del(index) { //闈㈡澘鍒犻櫎
var $this = this;
- if (this.$data.subPanelList[index].scanCodeVal == this.$data.scanCodeVal) {
- this.$data.scanCodeVal = '';
+ if (this.subPanelList[index].scanCodeVal == this.scanCodeVal) {
+ this.scanCodeVal = '';
}
- if (!this.$data.subPanelList[index].ObjID)
- this.$data.subPanelList.splice(index, 1);
+ if (!this.subPanelList[index].ObjID)
+ this.subPanelList.splice(index, 1);
else {
var dataInfo = {
- class_id: this.$data.param.Sub_Cls.ID,
+ class_id: this.param.Sub_Cls.ID,
class_name: '',
- obj_id: this.$data.subPanelList[index].ObjID
+ obj_id: this.subPanelList[index].ObjID
};
// console.log(dataInfo);
// return;
@@ -1358,7 +1295,7 @@
// console.log(success);
uni.hideLoading();
- $this.$data.subPanelList.splice(index, 1);
+ $this.subPanelList.splice(index, 1);
uni.showModal({
title: this.translateSys("tip"),
content: this.translate("delete_success"),
@@ -1380,7 +1317,7 @@
},
scan_classAttr_extButton(e) { //閫夋嫨鎸夐挳鍓� var $this = this;
- var Before_Select_Event = $this.$data.param.Scan_Code.Before_Select_Event;
+ var Before_Select_Event = $this.param.Scan_Code.Before_Select_Event;
if (!Before_Select_Event) {
uni.showModal({
title: this.translateSys("tip"),
@@ -1397,7 +1334,7 @@
value: obj_attr[a] || "",
}));
var objects = [];
- var subPanelList = $this.$data.subPanelList;
+ var subPanelList = $this.subPanelList;
for (var s = 0; s < subPanelList.length; s++) {
var detail_attr = {};
subPanelList[s].subClassAttr.form.items.forEach(item => {
@@ -1421,19 +1358,19 @@
var req = [];
var enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�- cls_id: 'MBOX', //this.$data.param.Sub_Cls.ID, // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇�+ cls_id: 'MBOX', //this.param.Sub_Cls.ID, // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇� 'button': 'top', // top/bottom
button_name: this.translateSys('add2'),
edit_dlg: {
type: 'small', //灏忕獥鍙�- class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
+ class_id: 'MBOX', //this.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
},
master_cls: {
- cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
+ cls_name: 'MBOX', //$this.param.Master_Cls.Name,
obj_attrs: mast_attr
},
sub_cls: {
- cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
+ cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
objects: objects
}
@@ -1446,7 +1383,7 @@
rclsid: '',
robjid: '',
userlogin: '',
- clsid: 'MBOX', //this.$data.param.Sub_Cls.ID,
+ clsid: 'MBOX', //this.param.Sub_Cls.ID,
objid: "",
attr: [],
global_attr: req,
@@ -1464,15 +1401,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) { //寮规鍙栨秷
@@ -1480,7 +1417,7 @@
},
popup_sava(e) { //寮规纭畾 閫夋嫨鎸夐挳鍚� var $this = this;
- var After_Select_Event = $this.$data.param.Scan_Code.After_Select_Event;
+ var After_Select_Event = $this.param.Scan_Code.After_Select_Event;
if (!After_Select_Event) {
uni.showModal({
title: this.translateSys("tip"),
@@ -1490,7 +1427,7 @@
});
return;
}
- 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++) {
@@ -1520,7 +1457,7 @@
value: obj_attr[a] || "",
}));
- $this.$data.scanCodeVal = name;
+ $this.scanCodeVal = name;
var info = {
eventid: After_Select_Event.ID,
edtype: "7",
@@ -1554,17 +1491,17 @@
var $this = this;
var enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�- cls_id: this.$data.param.Master_Cls.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇�+ cls_id: this.param.Master_Cls.ID, // 鍔熻兘鐐逛富鏁版嵁绫绘爣璇� 'button': 'top', // top/bottom
button_name: this.translateSys('add2'),
master: {
- cls_id: this.$data.param.Master_Cls.ID, // button=bottom鏃�master鐨刢ls_id
+ cls_id: this.param.Master_Cls.ID, // button=bottom鏃�master鐨刢ls_id
//obj_id: '' // button=bottom鏃�master鐨刼bj_id
}
};
enviroment.edit_dlg = {
type: 'small', //灏忕獥鍙�- class_id: this.$data.param.Master_Cls.ID, //褰撳墠鏁版嵁绫籭d
+ class_id: this.param.Master_Cls.ID, //褰撳墠鏁版嵁绫籭d
}
if (data_attr) {
enviroment.edit_dlg.form_control = { //鎵�睘鐨勮〃鍗曟帶浠�@@ -1580,10 +1517,10 @@
// var dataInfo = {
// edtype: info.edtype, eventid: info.eventid, projectid: info.projectid.replace('{','').replace('}',''),
// rclsid: info.rclsid, robjid: info.robjid, userlogin: info.userlogin, clsid: info.clsid, objid: info.objid,
- // attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: '', global_attr: JSON.stringify(this.$data.global_attr)
+ // attr: JSON.stringify(info.attr), extinfo: JSON.stringify(enviroment), inputparameter: '', global_attr: JSON.stringify(this.global_attr)
// }
enviroment = Base64.encode(JSON.stringify(enviroment)); //灏嗗瓧绗︿覆杞崲涓篵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 = {};
@@ -1638,180 +1575,169 @@
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+ var result = data.result || []
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var i = 0; i < actionlist.length; i++) {
- var action = actionlist[i];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- for (var i = 0; i < result.length; i++) {
- if (result[i].choice_list) {
+ for (var i = 0; i < result.length; i++) {
+ for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
+ var attr = $this.head_styledef.form.items[c];
+ 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.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.refdatastore.push(result[i]);
+ }
+ if (length == 0) {
+ for (var j = 0; j < $this.refdatastore.length; j++) {
+ if ($this.refdatastore[j].attr == result[i].attr) {
+ $this.refdatastore[j].value = result[i].value;
+ }
+ }
+ }
+ }
+
+
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: data.result,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ }
+ }
+ try {
+ var actionlist = data.action || []
+ for (var i = 0; i < actionlist.length; i++) {
+ var action = actionlist[i];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ for (var i = 0; i < result.length; i++) {
+ if (result[i].choice_list) {
+ for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
+ var attr = $this.head_styledef.form.items[c];
+ if (attr.name != 'Layout') {
+ if (attr.fieldId == result[i].attr) {
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "text": val,
+ "value": val
+ });
+ }
+ attr.dict = dictItemList;
+ }
+ } else if (attr.name == 'Layout') {
+ attr.setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr) {
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "text": val,
+ "value": val
+ });
+ }
+ col.dict = dictItemList;
+ }
+ }
+ });
+ }
+ }
+ }
for (var c = 0; c < $this.head_styledef.form.items.length; c++) {
var attr = $this.head_styledef.form.items[c];
+ // console.log(attr[j].Name+'=='+result[i].attr);
if (attr.name != 'Layout') {
if (attr.fieldId == result[i].attr) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "text": val,
- "value": val
- });
- }
- attr.dict = dictItemList;
+ 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) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "text": val,
- "value": val
- });
- }
- col.dict = dictItemList;
+ col.value = '';
+ col.oldvalue = '';
+ col.value = result[i].value;
+ col.oldvalue = result[i].value;
+ $this.head_styledef.form.model[col
+ .fieldId] = result[i].value;
}
}
});
}
- }
- }
- 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);
- 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;
- }
- }
- }
- }
- } 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;
- }
- } 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);
- } else if (action.action_type == 'set_global_attr') {
- $this.$data.global_attr = action.value || [];
- }
-
- }
- }
-
- 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];
- 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;
- }
- }
- });
+ } else if (action.action_type == 'set_dlg_attr_show') {
+ var data = action.value;
+ $this.setFormItemVisible(data)
+ // console.log($this.head_styledef);
+ } else if (action.action_type == 'set_global_attr') {
+ $this.global_attr = action.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;
- }
- }
- }
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
}
@@ -1826,6 +1752,27 @@
});
});
},
+ setFormItemVisible(attrs) {
+ if (!Array.isArray(attrs)) {
+ return
+ }
+ const head_styledef = this.head_styledef
+ if (!head_styledef.hiddenIds) {
+ head_styledef.hiddenIds = []
+ }
+ attrs.forEach((attr) => {
+ let index = head_styledef.hiddenIds.findIndex((id) => id == attr.attr);
+ if (attr.show) {
+ if (index > -1) head_styledef.hiddenIds.splice(index, 1);
+ } else {
+ if (index == -1) head_styledef.hiddenIds.push(attr.attr);
+ }
+ });
+
+ this.setData({
+ head_styledef: head_styledef
+ })
+ },
scan_DataObjRunCustomEvent(info, data_attr) {
var $this = this;
var obj_attr = {};
@@ -1838,12 +1785,12 @@
} else {
enviroment = {
'function': '3000', // 鍔熻兘鐐圭紪鍙�- cls_id: 'MBOX', //this.$data.param.Sub_Cls.ID, // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇�+ cls_id: 'MBOX', //this.param.Sub_Cls.ID, // 鍔熻兘鐐逛粠鏁版嵁绫绘爣璇� 'button': 'top', // top/bottom
button_name: this.translateSys('add2'),
edit_dlg: {
type: 'small', //灏忕獥鍙�- class_id: 'MBOX', //this.$data.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
+ class_id: 'MBOX', //this.param.Sub_Cls.ID,//褰撳墠鏁版嵁绫籭d
},
master: {
cls_id: info.clsid, // button=bottom鏃�master鐨刢ls_id
@@ -1853,7 +1800,7 @@
};
}
- var global_attr = this.$data.global_attr;
+ var global_attr = this.global_attr;
if (info.global_attr) {
global_attr = info.global_attr;
}
@@ -1863,7 +1810,7 @@
if (info.inputParamter) {
info.inputParamter = Base64.encode(JSON.stringify(info.inputParamter)); //灏嗗瓧绗︿覆杞崲涓篵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.eventid.includes('{')) info.eventid = '{' + info.eventid + '}';
var dataInfo = {
@@ -1915,100 +1862,19 @@
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
showCancel: false,
confirmText: this.translateSys('close')
});
+ if ([0, 2, 3, 4, -1].includes(data.result_type)) {
+ if (data.result_type == 2) {
+ if (data.result) {
- var actionlist = data.action;
- if (actionlist) {
- console.log(actionlist);
- for (var ii = 0; ii < actionlist.length; ii++) {
- var action = actionlist[ii];
- if (action.action_type == 'set_dlg_attr') {
- var result = action.value;
- for (var i = 0; i < result.length; i++) {
- if (result[i].choice_list) {
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- for (var c = 0; c < $this.$data.subPanelList[s]
- .subClassAttrList.length; c++) {
- var attr = $this.$data.subPanelList[s].subClassAttrList[c]
- .Attr;
- for (var j = 0; j < attr.length; j++) {
- if (attr[j].Name == result[i].attr) {
- if (utils.classUtils.attrTypeIsDict(attr[j]
- .Type)) {
- var dictItemList = [];
- for (var d in result[i].choice_list) {
- var val = result[i].choice_list[d];
- dictItemList.push({
- "CN_S_NAME": val,
- "CN_S_VALUE": val,
- "Name": val,
- "label": val,
- "value": val
- });
- }
- attr[j].dictitem = dictItemList;
- // attr[j].dictitem = result[i].choice_list;
- }
- }
- }
- }
- }
- }
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- for (var c = 0; c < $this.$data.subPanelList[s].subClassAttrList
- .length; c++) {
- var attr = $this.$data.subPanelList[s].subClassAttrList[c]
- .Attr;
- for (var j = 0; j < attr.length; j++) {
- console.log(attr[j].Name + '==' + result[i].attr);
- if (attr[j].Name == result[i].attr) {
- attr[j].Value = result[i].value;
- // attr.value = '';
- // attr.oldvalue = '';
- // attr.value = result[i].value;
- // attr.oldvalue = 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;
- }
- }
- }
- }
- } else if (action.action_type == 'set_global_attr') {
- $this.$actiontr = action.value || [];
- } else if (action.action_type == 'open_common_dlg') { //鎵撳紑渚ф粦寮规
- var $this = this;
- if (action.value.common_dlg_id == 'check_list') {
- $this.$data.check_list = action.value.config;
- if (action.value.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�- $this.$data.popupType = 'right';
- else
- $this.$data.popupType = 'center'
- // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
- $this.$refs.popup.open($this.$data.popupType);
- }
- } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- var result = action.value;
- var $this = this;
- var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
- var scanCodeVal = $this.$data.scanCodeVal;
+ var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef));
+ var scanCodeVal = $this.scanCodeVal;
var rand = '';
for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
rand += Math.floor(Math.random() * 10);
@@ -2021,20 +1887,18 @@
if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹� scanCodeVal = "mast_input_3037-" + rand;
}
- $this.$data.subPanelList.push({
+ $this.subPanelList.push({
scanCodeVal: scanCodeVal,
subClassAttr: list_1
});
- $this.activelist.push({
- active: false
- });
+ var result = data.result || []
for (var i = 0; i < result.length; i++) {
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
+ for (var s = 0; s < $this.subPanelList.length; s++) {
+ if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
if (result[i].attr == "S_ID")
- $this.$data.subPanelList[s].ObjID = result[i].value;
- var _subClassAttr = $this.$data.subPanelList[s].subClassAttr
- .form.items;
+ $this.subPanelList[s].ObjID = result[i].value;
+ var _subClassAttr = $this.subPanelList[s].subClassAttr.form
+ .items;
for (var c = 0; c < _subClassAttr.length; c++) {
if (_subClassAttr[c].name != 'Layout') {
if (_subClassAttr[c].fieldId == result[i].attr)
@@ -2048,97 +1912,195 @@
});
}
}
-
- // $this.$data.subPanelList[s].subClassAttr=list_1;
}
}
- // console.log($this.$data.subPanelList);
+
var length = 0;
- if (!$this.$data.refdatastore.filter(function(s) {
+ if (!$this.refdatastore.filter(function(s) {
return result[i].attr == s.attr
}).length) {
length = 1;
- $this.$data.refdatastore.push(result[i]);
+ $this.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;
+ for (var j = 0; j < $this.refdatastore.length; j++) {
+ if ($this.refdatastore[j].attr == result[i].attr) {
+ $this.refdatastore[j].value = result[i].value;
}
}
}
}
- } else {
+ }
+
+ } else if (typeof data.result == 'string') {
+ if (data.result) {
uni.showModal({
- title: this.translateSys("tip"),
- content: this.translateSys("quotation_mark_left") + action
- .action_type + this.translateSys(
- "quotation_mark_right") + this.translate(
- "tip_action_unprocessed"),
+ title: this.translateSys('tip'),
+ content: data.result,
showCancel: false,
confirmText: this.translateSys('close')
});
}
}
- }
-
- if (data.result) {
- var list_1 = JSON.parse(JSON.stringify(this.$data.detail1_styledef));
- var scanCodeVal = $this.$data.scanCodeVal;
- var rand = '';
- for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
- rand += Math.floor(Math.random() * 10);
- }
- if (inputParamter[0].attr) {
- if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand;
- }
- if (info.attr[0].attr) {
- if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�- scanCodeVal = "mast_input_3037-" + rand;
- }
- $this.$data.subPanelList.push({
- scanCodeVal: scanCodeVal,
- subClassAttr: list_1
- });
- var result = data.result;
- for (var i = 0; i < result.length; i++) {
- for (var s = 0; s < $this.$data.subPanelList.length; s++) {
- if ($this.$data.subPanelList[s].scanCodeVal == scanCodeVal) {
- if (result[i].attr == "S_ID")
- $this.$data.subPanelList[s].ObjID = result[i].value;
- var _subClassAttr = $this.$data.subPanelList[s].subClassAttr.form
- .items;
- for (var c = 0; c < _subClassAttr.length; c++) {
- if (_subClassAttr[c].name != 'Layout') {
- if (_subClassAttr[c].fieldId == result[i].attr)
- _subClassAttr[c].value = result[i].value;
- } else if (_subClassAttr[c].name == 'Layout') {
- _subClassAttr[c].setting.colList.forEach(col => {
- if (col) {
- if (col.fieldId == result[i].attr)
- col.value = result[i].value;
+ try {
+ var actionlist = data.action || []
+ for (var ii = 0; ii < actionlist.length; ii++) {
+ var action = actionlist[ii];
+ if (action.action_type == 'set_dlg_attr') {
+ var result = action.value;
+ for (var i = 0; i < result.length; i++) {
+ if (result[i].choice_list) {
+ for (var s = 0; s < $this.subPanelList.length; s++) {
+ for (var c = 0; c < $this.subPanelList[s]
+ .subClassAttrList.length; c++) {
+ var attr = $this.subPanelList[s].subClassAttrList[c]
+ .Attr;
+ for (var j = 0; j < attr.length; j++) {
+ if (attr[j].Name == result[i].attr) {
+ if (utils.classUtils.attrTypeIsDict(attr[j]
+ .Type)) {
+ var dictItemList = [];
+ for (var d in result[i].choice_list) {
+ var val = result[i].choice_list[d];
+ dictItemList.push({
+ "CN_S_NAME": val,
+ "CN_S_VALUE": val,
+ "Name": val,
+ "label": val,
+ "value": val
+ });
+ }
+ attr[j].dictitem = dictItemList;
+ // attr[j].dictitem = result[i].choice_list;
+ }
+ }
+ }
}
- });
+ }
+ }
+ for (var s = 0; s < $this.subPanelList.length; s++) {
+ for (var c = 0; c < $this.subPanelList[s].subClassAttrList
+ .length; c++) {
+ var attr = $this.subPanelList[s].subClassAttrList[c]
+ .Attr;
+ for (var j = 0; j < attr.length; j++) {
+ console.log(attr[j].Name + '==' + result[i].attr);
+ if (attr[j].Name == result[i].attr) {
+ attr[j].Value = result[i].value;
+ // attr.value = '';
+ // attr.oldvalue = '';
+ // attr.value = result[i].value;
+ // attr.oldvalue = result[i].value;
+ }
+ }
+ }
+ }
+ var length = 0;
+
+ }
+ } else if (action.action_type == 'set_global_attr') {
+ $this.$actiontr = action.value || [];
+ } else if (action.action_type == 'open_common_dlg') { //鎵撳紑渚ф粦寮规
+ var $this = this;
+ if (action.value.common_dlg_id == 'check_list') {
+ $this.check_list = action.value.config;
+ if (action.value.config.appear_style == 'sideslip') //鍒ゆ柇鏄惁鏄晶婊�+ $this.popupType = 'right';
+ else
+ $this.popupType = 'center'
+ // open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦�uni-popup 缁勪欢涓婄粦瀹�type灞炴�
+ $this.$refs.popup.open($this.popupType);
+ }
+ } else if (action.action_type == 'add_subcls_panel') { //涓讳粠鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ var result = action.value;
+ var $this = this;
+ var list_1 = JSON.parse(JSON.stringify(this.detail1_styledef));
+ var scanCodeVal = $this.scanCodeVal;
+ var rand = '';
+ for (var i = 0; i < 5; i++) { //鐢熸垚5浣嶉殢鏈烘暟
+ rand += Math.floor(Math.random() * 10);
+ }
+ if (inputParamter[0].attr) {
+ if (inputParamter[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ if (info.attr[0].attr) {
+ if (info.attr[0].attr == "mast_input_3037") //鍒ゆ柇鏄富鏁版嵁绫绘壂鐮佹煡璇㈡暟鎹�+ scanCodeVal = "mast_input_3037-" + rand;
+ }
+ $this.subPanelList.push({
+ scanCodeVal: scanCodeVal,
+ subClassAttr: list_1
+ });
+ $this.activelist.push({
+ active: false
+ });
+ for (var i = 0; i < result.length; i++) {
+ for (var s = 0; s < $this.subPanelList.length; s++) {
+ if ($this.subPanelList[s].scanCodeVal == scanCodeVal) {
+ if (result[i].attr == "S_ID")
+ $this.subPanelList[s].ObjID = result[i].value;
+ var _subClassAttr = $this.subPanelList[s].subClassAttr
+ .form.items;
+ for (var c = 0; c < _subClassAttr.length; c++) {
+ if (_subClassAttr[c].name != 'Layout') {
+ if (_subClassAttr[c].fieldId == result[i].attr)
+ _subClassAttr[c].value = result[i].value;
+ } else if (_subClassAttr[c].name == 'Layout') {
+ _subClassAttr[c].setting.colList.forEach(col => {
+ if (col) {
+ if (col.fieldId == result[i].attr)
+ col.value = result[i].value;
+ }
+ });
+ }
+ }
+
+ // $this.subPanelList[s].subClassAttr=list_1;
+ }
+ }
+ // console.log($this.subPanelList);
+ var length = 0;
+ if (!$this.refdatastore.filter(function(s) {
+ return result[i].attr == s.attr
+ }).length) {
+ length = 1;
+ $this.refdatastore.push(result[i]);
+ }
+ if (length == 0) {
+ for (var j = 0; j < $this.refdatastore.length; j++) {
+ if ($this.refdatastore[j].attr == result[i].attr) {
+ $this.refdatastore[j].value = result[i].value;
+ }
+ }
}
}
+ } else {
+ uni.showModal({
+ title: this.translateSys("tip"),
+ content: this.translateSys("quotation_mark_left") + action
+ .action_type + this.translateSys(
+ "quotation_mark_right") + this.translate(
+ "tip_action_unprocessed"),
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
}
}
- 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;
- }
- }
- }
+
+ } catch (ex) {
+ let actionList = (data.action || []).map(a => a.action_type).join(';')
+ let tip = typeof ex == 'string' ? ex : ex.message
+ tip = `鎵ц鑴氭湰杩斿洖鐨�{actionList}鏃跺嚭鐜板紓甯革紝璇锋鏌ヨ剼鏈繑鍥炵殑鏁版嵁鏍煎紡鏄惁姝ｇ‘銆�{tip}`
+ uni.showModal({
+ title: this.translateSys('tip'),
+ content: tip,
+ showCancel: false,
+ confirmText: this.translateSys('close')
+ });
+ console.log(ex)
+ return
}
}
}
@@ -2153,13 +2115,20 @@
});
});
},
-
+ onSave() {
+ this.handleButtonClick((done) => {
+ this.sava()
+ setTimeout(() => {
+ done(); // 閲嶇疆鐘舵�
+ }, 1000);
+ });
+ },
//纭畾
sava() {
- if (this.$data.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈�- this.scan_OKDataObjRunCustomEvent(this.$data.param.Before_OK_Event.ID);
- else if (this.$data.param.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈�- this.scan_OKDataObjRunCustomEvent(this.$data.param.After_OK_Event.ID);
+ if (this.param.Before_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍓嶈剼鏈�+ this.scan_OKDataObjRunCustomEvent(this.param.Before_OK_Event.ID);
+ else if (this.param.After_OK_Event) //鍒ゆ柇鍔熻兘鐐瑰弬鏁版槸鍚︽湁纭畾鍚庤剼鏈�+ this.scan_OKDataObjRunCustomEvent(this.param.After_OK_Event.ID);
else
uni.navigateBack({
delta: 1
@@ -2181,7 +2150,7 @@
}));
var objects = [];
- var subPanelList = $this.$data.subPanelList;
+ var subPanelList = $this.subPanelList;
for (var s = 0; s < subPanelList.length; s++) {
var detail_attr = {};
subPanelList[s].subClassAttr.form.items.forEach(item => {
@@ -2204,19 +2173,19 @@
var dataJson = {
master_cls: {
- cls_name: 'MBOX', //$this.$data.param.Master_Cls.Name,
+ cls_name: 'MBOX', //$this.param.Master_Cls.Name,
obj_attrs: req
},
- input_3037: $this.$data.scanCodeVal, //鎵爜鍐呭
- op_type: $this.$data.param.OperationType, //浣滀笟绫诲瀷瀹氫箟
+ input_3037: $this.scanCodeVal, //鎵爜鍐呭
+ op_type: $this.param.OperationType, //浣滀笟绫诲瀷瀹氫箟
sub_cls: {
- cls_name: 'MBOX', //$this.$data.param.Sub_Cls.Name,
+ cls_name: 'MBOX', //$this.param.Sub_Cls.Name,
objects: objects
}
};
// console.log(JSON.stringify(dataJson));
var dataJson = Base64.encode(JSON.stringify(dataJson)); //灏嗗瓧绗︿覆杞崲涓篵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 (!eventID.includes('{')) eventID = '{' + eventID + '}';
var dataInfo = {
ed_type: "7",
@@ -2268,6 +2237,7 @@
} else {
var tip = data.info ? typeof data.info == 'string' ? data.info : data.info.join(
'<br/>') : '';
+ tip = tip || data.err_info
if (tip) uni.showModal({
title: this.translateSys("tip"),
content: tip,
@@ -2275,14 +2245,14 @@
confirmText: this.translateSys('close')
});
- var result = data.result;
- if (eventID != $this.$data.param.After_OK_Event.ID)
- $this.scan_OKDataObjRunCustomEvent($this.$data.param.After_OK_Event.ID);
+ // var result = data.result;
+ if (eventID != $this.param.After_OK_Event.ID)
+ $this.scan_OKDataObjRunCustomEvent($this.param.After_OK_Event.ID);
else {
//鍒锋柊
uni.redirectTo({
- url: '../modal/3037_2?param=' + JSON.stringify($this.$data.param) +
- "&titlename=" + $this.$data.title
+ url: '../modal/3037_2?param=' + JSON.stringify($this.param) +
+ "&titlename=" + $this.title
});
}
}
@@ -2413,61 +2383,46 @@
/* padding: 10rpx 20rpx 4rpx 0px; */
border-radius: 12rpx;
/* margin-bottom: 20rpx; */
- text-align: right;
+
+ .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;
+ }
+
+ .uni-input:hover {
+ border: 1px solid rgb(41, 121, 255);
+ }
+ }
+
+
+
}
.dv-panel:first-child {
padding-top: 10rpx;
}
- .dv-panel-input {
- width: 100%;
- display: inline-block;
- text-align: left;
- }
- .dv-panel .txt_title {
- font-size: 34rpx;
- text-align: right;
- display: inline-block;
- vertical-align: 12px;
- }
-
- .dv-panel input {
- /* vertical-align: middle; */
- display: inline-block;
- border: 1px solid #d5d5d5;
- width: 68%;
- height: 52rpx;
- line-height: 34rpx;
- background: #FFF;
- border-radius: 7px !important;
- color: #2d8cf0;
- padding: 6rpx 8rpx 8rpx;
- font-size: 32rpx;
- font-family: inherit;
- box-shadow: none !important;
- transition-duration: 0.1s;
- margin-top: 0rpx;
- }
-
- .dv-panel input::-webkit-input-placeholder {
- font-size: 10rpx;
- }
-
- .input-disabled {
- background-color: #f3f3f3 !important;
- }
-
- .dv-panel .form-item-span {
- vertical-align: top;
- color: #2d8cf0;
- white-space: normal;
- word-break: break-all;
- display: inline-block;
- width: calc(100% - 100px);
- /* border: 1rpx solid red; */
- }
#dv_select {
display: inline-block;
@@ -2767,20 +2722,5 @@
margin-top: 5px;
}
- // .uni-px-5 {
- // margin: 0;
- // display: inline-block;
- // margin: 0;
- // font-size: 14px;
- // }
- // .uni-select{
- // border: 1px solid #ccc;
- // border-radius: 0;
- // }
- // .uni-section-content{
- // display: inline-block;
- // width: 100px;
- // border: 1px solid red;
- // }
}
</style>
\ No newline at end of file
--
Gitblit v1.9.1