PDA长时间未退出导致SessionID过期，提示‘登录已过期，请重新登录’改进

jt

2024-04-01 33ca0619ee10adc9f307480a5f58bb77bb142ffd

 pages/modal/5600.vue

@@ -1,4 +1,7 @@
<style>
.v-headStyle:first-child{
   margin-top: 15rpx;
}
.v-headStyle .txt_title{
  font-size: 34rpx;
  text-align: right;
@@ -55,20 +58,24 @@
   vertical-align: 18rpx;
}
.view-content{
   min-height: 760rpx;
   min-height: 750rpx;
   /* border:1px solid red; */
}
.dv-panel{
    background-color:#EAFED9;
    background-color:#efefef;
    padding: 20rpx 20rpx 4rpx 0px;
    border-radius: 12rpx;
    margin-bottom: 20rpx;
    margin: 10rpx 0 20rpx 0;
   text-align: right;
   /* border: 1px solid red; */
}
.dv-panel-input{
   width: 100%;
    display: inline-block;
   text-align: left;
}
.dv-panel-input .dv-input{
   margin-bottom: 2rpx;
}
.dv-panel .txt_title{
  font-size: 34rpx;
@@ -106,13 +113,25 @@
}

.dv-panel-button{
    display: inline-block;
   margin-right: 20rpx;
   /* display: inline-block;
   margin-right: 20rpx; */
   width: 100%;
   text-align: left;
   padding-bottom: 20rpx;
}
.dv-panel-button button {    
.dv-panel-button checkbox-group { 
    padding-left: 20px;
   display: inline-block;
}
.dv-panel-button button { 
   text-align: left;   
   line-height: 1.8;
    border: none;
   font-size: 34rpx;
   width: 180rpx;   
   display: inline-block;
    float: right;
   text-align: center;
}
button.btn_cancel {
   width:49.5%;
@@ -137,13 +156,84 @@
   display: inline-block;
}
.logo {
   height: 50px;
    width: 230px;
   height: 100rpx;
    width: 460rpx;
    display: flex;
    margin: 38% auto;
}
.dv-border{
   border: 1px solid red;
}
.view-imagetext{
  text-align: center;
  width: 88%;
  padding: 20rpx 40rpx 0px 40rpx;
  /* border:1px solid red; */
}
.view-imagetext .view-imagetext-uploadlist {
  padding: 30rpx 0px 10rpx 0px;
  vertical-align: middle;
  display: inline-block;
  width: 100%;
  height: 100%;
  text-align: center;
  line-height: 100%;
  border: 2rpx solid transparent;
  border-radius: 8rpx;
  overflow: hidden;
  background: #fff;
  position: relative;
  /* box-shadow: 0 2rpx 2rpx rgba(0, 0, 0, 0.2);
  margin-right: 8rpx; */
}
.view-imagetext .txt-text{
  display: block;
  margin: 20rpx;
  font-weight: bold;
}
.view-detalist-centen{
  text-align: center;
  width: 100%;
}
  
.view-detalist-centen .txt-detalist{
  background: #94D5EF;
  display: block;
  width: 100%;
  font-size: 36rpx;
  line-height: 80rpx;
  font-weight: 500;
}
.panel-active{
  border:2px solid red;
}
.bk-active{
  background-color: #D6FCB2;
}
#dv_select{
   display: inline-block;
   width: 66%; 
   background: #FFF;
   border-radius: 0 !important;
   color: #2d8cf0;
   /* padding: 10rpx 8rpx 12rpx; */
   font-size: 34rpx;
   font-family: inherit;
   box-shadow: none !important;
   transition-duration: 0.1s;
   margin-top: 0rpx;
   vertical-align: 20rpx;
}
#dv_select .uni-select{
   border: 2rpx solid #ccc;
   border-radius: 0 !important;
   color: #2d8cf0;	
}
#dv_select .uni-select__input-text{
   color: #2d8cf0;	
}
.input-disabled{
   background-color: #f3f3f3 !important;
}
</style>
<style lang="scss">
@@ -164,23 +254,32 @@
   .demo-uni-row .uni-input{
      width: calc(100% - 120px);
   }
	
</style>



<template>
   <view class="content">
      <!-- 表头样式 -->
      <view class="v-headStyle" v-for="(item,index) in head_styledef.form.items" >
         <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}：</text>
         <view class="input-wrapper">
         <!-- 下拉框-单选 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="onChange(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="onEnterChange(item)">&#xe568;</text>
            <input
               class="uni-input"
               :type="item.name=='Input'?'text':'text'" 
               :class="item.disabled?'input-disabled':''"
               :type="item.name=='Input'?'text':'number'" 
               v-model="item.value"
               :disabled="item.disabled"
               :placeholder="item.placeholder"
@@ -197,132 +296,165 @@
          </view>
      </view>
      <view class="view-content">
         <!-- 页签 -->
         <view class="dv-tab">
            <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem"
               styleType="button">
            </uni-segmented-control>
         <!-- 图文/文本 -->
         <view class="view-imagetext" v-if="param.Show_Welcom_Page==true">
           <div class="view-imagetext-uploadlist">
            <image :src="param.Welcome_Page.Img" 
            :style="{'width':param.Welcome_Page.Width+'px','height':param.Welcome_Page.Height+'px'}"></image>
            <text class="txt-text" 
               :style="{'color':param.Welcome_Page.Txt_Color,'font-size':param.Welcome_Page.Font_Size+'px','font-family':param.Welcome_Page.Font}"
            >{{param.Welcome_Page.Text}}</Text>
           </div>
         </view>
         <!-- 正在码盘 -->
         <view class="view-tabpage" v-if="current==0">
            <image class="logo" v-if="detail1StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
				
            <!-- <div class="dv-panel">
                <div class="dv-panel-input">
                  <div >
                     <text class="txt_title" style="width:100px">test：</text>
                     <span class="form-item-span" >1111</span>
         <!-- 码盘界面 -->
         <view v-if="param.Show_Welcom_Page==false">
            <!-- 页签 -->
            <view class="dv-tab">
               <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem"
                  styleType="button">
               </uni-segmented-control>
            </view>
            <!-- 码盘界面 -->
            <view class="view-tabpage" id="tabpanel" v-if="current==0">
               <image class="logo" v-if="detail1StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
               <!-- <div class="dv-panel">
                  <div class="dv-panel-input">
                     <div >
                        <text class="txt_title" style="width:100px">test：</text>
                        <span class="form-item-span" >1111</span>
                     </div>
                     <div >
                        <text class="txt_title" style="width:100px">test：</text>
                        <span class="form-item-span" >1111</span>
                     </div>
                     <div>
                        <uni-row class="demo-uni-row">
                           <uni-col :span="12">
                              <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                              <span class="form-item-span" >ffaaa</span>
                           </uni-col>
                           <uni-col :span="12">
                              <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                              <span class="form-item-span" >ffaaaffaaaffaaaffaaaffaaa</span>
                           </uni-col>
                        </uni-row>
                     </div>
                     <div>
                        <uni-row class="demo-uni-row">
                           <uni-col :span="12">
                              <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                              <span class="form-item-span" >fsfegfs</span>
                           </uni-col>
                           <uni-col :span="12">
                              <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                              <input type="number" class="uni-input input-margintop" style="width: calc(100% - 120px);"/>
                           </uni-col>
                        </uni-row>
                     </div>
                  </div>
                    <div >
                     <text class="txt_title" style="width:100px">test：</text>
                     <span class="form-item-span" >1111</span>
                  <div class="dv-panel-button">
                     <button type="warn" @tap="delItem(0)">删除</button>
                  </div>
                  <div>
                     <uni-row class="demo-uni-row">
                        <uni-col :span="12">
                           <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                           <span class="form-item-span" >ffaaa</span>
                        </uni-col>
                        <uni-col :span="12">
                           <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                           <span class="form-item-span" >ffaaaffaaaffaaaffaaaffaaa</span>
                        </uni-col>
                     </uni-row>
                  </div>
                  <div>
                     <uni-row class="demo-uni-row">
                        <uni-col :span="12">
                           <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                           <span class="form-item-span" >fsfegfs</span>
                        </uni-col>
                        <uni-col :span="12">
                           <text class="txt_title dv-form-item-col" style="width:100px">test：</text>
                           <input type="number" class="uni-input input-margintop" style="width: calc(100% - 120px);"/>
                        </uni-col>
                     </uni-row>
               </div> -->
               <div class="dv-panel" v-for="(style,ii) in detail1StyleDefList" 
                  @tap="onPanelClick(ii)"
                  :id="'tabpanel'+style.form.htmlobjId"
                  :class="style.form.htmlobjId==active_id?'bk-active':activelist[ii].active==true?'bk-active':''">
                  <div class="dv-panel-input">
                     <div class="dv-input" v-for="(item,index) in style.form.items">
                        <!-- 普通布局 -->
                        <view v-if="item.name!='Layout'">
                           <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}：</text>
                           <span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
                           <input
                              class="uni-input"
                              v-if="!item.disabled"
                              :type="item.name=='InputNumber'?'number':'text'" 
                              :value="item.value" 
                              :disabled="item.disabled"
                              :placeholder="item.placeholder"
                           />
                        </view>
                        <!-- 栅格布局 -->
                        <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
                           <uni-col 
                              :span="24 / item.setting.col"
                              v-for="(cols,key) in item.setting.colList" 
                           >
                              <view v-if="cols!=null" >
                                 <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}：</text>
                                 <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
                                 <input
                                    class="uni-input"
                                    v-if="!cols.disabled"
                                    :type="cols.name=='InputNumber'?'number':'text'" 
                                    :value="cols.value" 
                                    :disabled="cols.disabled"
                                    :placeholder="cols.placeholder"
                                 />
                              </view>
                           </uni-col>
                        </uni-row>
                     </div>
                   </div>
                  <div class="dv-panel-button">
                     <checkbox-group v-if="param.Sub_Page[0].Select_Button==true">
                        <label>
                           <checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
                           <!-- <text></text> -->
                        </label>
                     </checkbox-group>
                     <!-- <button type="primary" @click="savaItem(ii)" v-if="param.Sub_Page[0].OK_Button==true">保存</Button> -->
                     <button type="warn" @tap="delItem(ii)" v-if="param.Sub_Page[0].Del_Button==true">删除</button>
                  </div>
               </div>
               <div class="dv-panel-button">
                  <button type="warn" @tap="delItem(0)">删除</button>
            </view>
            <!-- 已码盘界面 -->
            <view class="view-tabpage2" v-if="current==1">
               <image class="logo" v-if="detail2StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
               <div class="dv-panel" v-for="(style,ii) in detail2StyleDefList">
                  <div class="dv-panel-input">
                     <div v-for="(item,index) in style.form.items">
                        <!-- 普通布局 -->
                        <view v-if="item.name!='Layout'">
                           <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}：</text>
                           <span class="form-item-span">{{item.value}}</span>
                        </view>
                        <!-- 栅格布局 -->
                        <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
                           <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">{{cols.value}}</span>
                              </view>
                           </uni-col>
                        </uni-row>
                     </div>
                  </div>
                  <div class="dv-panel-button">
                     <checkbox-group v-if="param.Sub_Page[1].Select_Button==true">
                        <label>
                           <checkbox :value="style.SelBut_Checked" :checked="style.SelBut_Checked" />
                           <!-- <text></text> -->
                        </label>
                     </checkbox-group>
                     <!-- <button type="primary" @click="savaDataObj(style,ii)" v-if="param.Sub_Page[1].OK_Button==true">保存</Button> -->
                     <button type="warn" @tap="delDataObj(style,ii)" v-if="param.Sub_Page[1].Del_Button==true">删除</button>
                  </div>
               </div>
            </div> -->
            <div class="dv-panel" v-for="(style,ii) in detail1StyleDefList">
                <div class="dv-panel-input">
                    <div v-for="(item,index) in style.form.items">
                        <!-- 普通布局 -->
                     <view v-if="item.name=='Input'">
                        <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}：</text>
                        <span class="form-item-span" v-if="item.disabled">{{item.value}}</span>
                        <input
                           class="uni-input"
                           v-if="!item.disabled"
                           :type="item.name=='InputNumber'?'number':'text'" 
                           :value="item.value" 
                           :disabled="item.disabled"
                           :placeholder="item.placeholder"
                        />
                     </view>
                        <!-- 栅格布局 -->
                     <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
                        <uni-col 
                           :span="24 / item.setting.col"
                           v-for="(cols,key) in item.setting.colList" 
                        >
                           <view v-if="cols!=null" >
                              <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}：</text>
                              <span class="form-item-span" v-if="cols.disabled">{{cols.value}}</span>
                              <input
                                 class="uni-input"
                                 v-if="!cols.disabled"
                                 :type="cols.name=='InputNumber'?'number':'text'" 
                                 :value="cols.value" 
                                 :disabled="cols.disabled"
                                 :placeholder="cols.placeholder"
                              />
                           </view>
                        </uni-col>
                     </uni-row>
                    </div>
                 </div>
                <div class="dv-panel-button">
                  <button type="warn" @tap="delItem(0)">删除</button>
                </div>
            </div>
         </view>
         <!-- 已码盘 -->
         <view class="view-tabpage2" v-if="current==1">
            <image class="logo" v-if="detail2StyleDefList.length==0" src="../../images/mobox_log_200x40.png"></image>
            <div class="dv-panel" v-for="(style,ii) in detail2StyleDefList">
                <div class="dv-panel-input">
                    <div v-for="(item,index) in style.form.items">
                        <!-- 普通布局 -->
                     <view v-if="item.name!='Layout'">
                        <text class="txt_title" :style="{'width':item.labelWidth+'px'}">{{item.label}}：</text>
                        <span class="form-item-span">{{item.value}}</span>
                     </view>
                        <!-- 栅格布局 -->
                     <uni-row class="demo-uni-row" v-if="item.name=='Layout'">
                        <uni-col 
                           :span="24 / item.setting.col"
                           v-for="(cols,key) in item.setting.colList" 
                        >
                           <view v-if="cols!=null" >
                              <text class="txt_title" :style="{'width':cols.labelWidth+'px'}">{{cols.label}}：</text>
                              <span class="form-item-span">{{cols.value}}</span>
                           </view>
                        </uni-col>
                     </uni-row>
                    </div>
                </div>
               <div class="dv-panel-button">
                   <button type="warn" @tap="delDataObj(style,ii)">删除</button>
               </div>
            </div>
            </view>
         </view>
      </view>
      <view>
      <view v-if="current==0 && param.Sub_Page[0].OK_Button==true">
         <button type="default" @tap="cancel" class="btn_cancel">取消</button>
          <button type="primary" @tap="ok" class="btn_add">确定</button>
      </view>
      <view v-if="current==1 && param.Sub_Page[1].OK_Button==true">
         <button type="default" @tap="cancel" class="btn_cancel">取消</button>
          <button type="primary" @tap="ok2" class="btn_add">确定</button>
      </view>
    </view>
</template>
@@ -336,6 +468,7 @@
  data() {
    return {
     title:'码盘',
     ClsID:'CG_Detail',
      param: {},
     focusMateria:false,
     head_styledef:{
@@ -349,21 +482,38 @@
      detail2StyleDefList:[],
     // 分段器数据
     current: 0,
     items: ['正在码盘', '已码盘'],
     Before_OK_Event:{},
      After_OK_Event:{},
     items: [],
      active_id:'',
     activelist:[],
    };
  },
  onLoad(options) {
   // console.log(options);
   uni.setNavigationBarTitle({ title: options.titlename}); //设置顶部标题 
   this.$data.title = options.titlename;
   this.$data.param = JSON.parse(options.param);
   // console.log(this.$data.param);
    //获取CG_Detail（托盘货品表）数据类的自定义表单参数
   this.Head_UIStyleGetInfo('CG_Detail',this.$data.param.Head_Panel_Style.ID);
   this.Detail1_UIstyleGetInfo('CG_Detail',this.$data.param.Detail_List_Panel1_Style.ID);
   this.Detail2_UIstyleGetInfo('CG_Detail',this.$data.param.Detail_List_Panel2_Style.ID);
    //获取数据类的自定义表单参数
   this.Head_UIStyleGetInfo(this.$data.ClsID,this.$data.param.Input_UI_Style.ID);
	
   //加载初始界面
   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);
   }
   //加载Tab页签
   this.$data.items.push(this.$data.param.Sub_Page[0].Name);
   this.$data.items.push(this.$data.param.Sub_Page[1].Name);
   this.Detail1_UIstyleGetInfo(this.ClsID,this.$data.param.Sub_Page[0].UI_Style.ID);
   this.Detail2_UIstyleGetInfo(this.ClsID,this.$data.param.Sub_Page[1].UI_Style.ID);
	
   console.log(this.$data.param);
   //页面初始化获取焦点
   // this.focusMateria=true; 
  },	
  },
  methods: {
    async Head_UIStyleGetInfo(class_id,style_id){   //获取自定义表单样式
      var $this = this;
@@ -384,7 +534,11 @@
            $this.$data.head_styledef = ret.result.style_def? JSON.parse(styledef): {};
            // this.form = this.head_styledef.form.model;
            // console.log($this.$data.head_styledef);
				
            $this.$data.head_styledef.form.items.forEach(async (ele,index) => {
                if(ele.useDict==true){ //判断useDict是否使用字典
                    await this.DictGetInfo(ele.bind.dict,index,'mast');
                }
            });
         }else{
            uni.showModal({title:"错误1",content:ret.err_msg,showCancel:false,confirmText:"取消"});
         }
@@ -411,12 +565,17 @@
                 if(!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result.style_def);
            }
            $this.$data.detail1_styledef = ret.result.style_def? JSON.parse(styledef): {};
            $this.$data.detail1_styledef.SelBut_Checked = true;
            // console.log($this.$data.detail1_styledef);
            // $this.$data.detail1StyleDefList.push($this.$data.detail1_styledef);
            // let aa = JSON.stringify(this.detail1_styledef);
            // var aa = JSON.stringify(this.detail1_styledef);
            // $this.$data.detail1StyleDefList.push(JSON.parse(aa));
            // console.log($this.$data.detail1StyleDefList);
				
            $this.detail1_styledef.form.items.forEach(async (ele,index) => {
                if(ele.useDict==true){ //判断useDict是否使用字典
                    await this.DictGetInfo(ele.bind.dict,index,'sub');
                }
            });
         }else{
            uni.showModal({title:"错误2",content:ret.err_msg,showCancel:false,confirmText:"取消"});
         }
@@ -443,6 +602,7 @@
                 if(!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result.style_def);
            }
            $this.$data.detail2_styledef = ret.result.style_def? JSON.parse(styledef): {};
            $this.$data.detail2_styledef.SelBut_Checked = true;
            // console.log($this.$data.detail2_styledef);
            
         }else{
@@ -454,6 +614,61 @@
      });
        
    },
   async DictGetInfo(dict,index,type){ //Mobox3得到得到字典信息字典项列表
      this.data=[];
      var $this = this;
      var dataInfo ={
         dict_id: dict.id,
         dict_name: dict.name
      };
      // console.log(dataInfo);
      this.$store.dispatch('DictGetInfo',dataInfo).then(async (success)=>{
         console.log(success);
         if (success.err_code == 0) {
            var list=[];
            var itemName='';
            success.result.dict_item_list.forEach((item) => {
                if(item.is_default=='1')
                    itemName = item.name;
                list.push({
                    text:item.value,
                    value:item.name,
                });
            });
				
            if(type=='mast'){//有默认值，显示默认值
               if(itemName){
                  $this.head_styledef.form.items[index].value=itemName;
                  var attr = $this.head_styledef.form.items[index].fieldId;
                  $this.head_styledef.form.model[attr] = itemName;
               }
               $this.head_styledef.form.items[index].dict=list;
               var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
               $this.head_styledef=[];
               $this.head_styledef = head_styledef;
               // console.log($this.head_styledef);
            }
            else{
               if(itemName){
                  $this.detail1_styledef.form.items[index].value=itemName;
                  var attr = $this.detail1_styledef.form.items[index].fieldId;
                  $this.detail1_styledef.form.model[attr] = itemName;
               }
               $this.detail1_styledef.form.items[index].dict=list;
               var detail1_styledef = JSON.parse(JSON.stringify($this.detail1_styledef));
               $this.detail1_styledef=[];
               $this.detail1_styledef = detail1_styledef;
               // console.log($this.$data.detail1_styledef);
            }
				
         }else{
            uni.showModal({title:"错误3.1",content:success.err_msg,showCancel:false,confirmText:"取消"});
         }
      }).catch(ex=>{
         // console.log(ex);
         uni.showModal({title:"错误3",content:ex.errMsg,showCancel:false,confirmText:"取消"});
      });
   },
   
   ontap(item){ //扫码功能
      // var $ele = e;
@@ -462,8 +677,25 @@
         console.log(result.decodedata);
         item.value = result.decodedata;
         uni.hideKeyboard();
			
         var $this = this;
			
         // if(item.value=='B61DF51DD50645CEB9D152DD77D2466A'){
         //    this.active_id = 'B61DF51DD50645CEB9D152DD77D2466A';
         //    // var target = uni.createSelectorQuery().select('#B61DF51DD50645CEB9D152DD77D2466A');
         //    uni.createSelectorQuery()
         //        .select("#tabpanel")//对应外层节点
         //        .boundingClientRect((container) => {
         //            uni.createSelectorQuery()
         //            .select("#B61DF51DD50645CEB9D152DD77D2466A")//目标节点
         //            .boundingClientRect((target) => {
         //                uni.pageScrollTo({
         //                scrollTop: target.top - container.top,//滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
         //                });
         //            })
         //            .exec();
         //        })
         //        .exec();
         // }
         console.log(item);
         if(item.oldvalue != item.value){
             item.oldvalue = item.value;
@@ -483,7 +715,7 @@
               //    $this.focusMateria=true; //第二个输入框获取焦点
                  setTimeout(function(){
                     uni.hideKeyboard();
                  },100);
                  },1000);
               // },500);
            }
             // if(onSuffixClickCallbackEvent.id){   //后图标点击事件
@@ -534,7 +766,7 @@
           var $this = this;
           var dataInfo={
               ed_type: 0,
            start_transaction: '',
            start_transaction: true,
               class_id: this.$data.head_styledef.form.clsId,
            class_name: '',
               event_id: event.id,
@@ -555,40 +787,92 @@
              // console.log(ret);
              if (ret.err_code == 0) {
               var result = ret.result; 
                 if(result.result_type == 0 && result.action){
                     result.action.forEach(item=>{
                         if(item.action_type == "insert_subtable_page_row"){ //码盘中
                             var value = item.value;
                             $this.viewAceionRow(value);
                         } else if(item.action_type == "set_subtable_page_content"){  //已码盘
                             var value = item.value;
                             if(value.clear == true && $this.$data.detail1StyleDefList.length>0){ //判断是否清空页签内容,正在码盘是否有数据
                           uni.showModal({
                              title: '提示',
                              content: '系统检测到有正在码盘中的货品，继续操作会清空，是否继续？',
                              success: function (res) {
                                 if (res.confirm) {
                                   $this.$data.detail1StyleDefList=[];
                                   $this.$data.detail2StyleDefList=[];
                                   $this.viewAceionContent(value);
                                 } else if (res.cancel) {
                                   $this.$data.detail2StyleDefList=[];
                                   $this.viewAceionContent(value);
               if (result.ret != 0) {
                   var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result.err_info.join('<br/>') : '';
                   if (result.ret == 801) uni.showModal({title:'提示',content:tip,showCancel:false,confirmText:"取消"});
                   else uni.showModal({title:'提示',content:tip+',提示:'+result.ret,showCancel:false,confirmText:"取消"});
                  return false;
               }else{
                  var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : '';
                  if (tip) uni.showModal({title:'提示',content:tip,showCancel:false,confirmText:"取消"});
					
                  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;
                           var value = item.value;
                           $this.viewAceionRow(value);
                        } 
                        else if(item.action_type == "set_subtable_page_content"){  //已码盘
                           $this.$data.param.Show_Welcom_Page=false;
                           var value = item.value;
                           if(value.clear == true && $this.$data.detail1StyleDefList.length>0 && value.page_name == $this.$data.param.Sub_Page[0].Name){ //判断是否清空页签内容,正在码盘是否有数据
                              uni.showModal({
                                 title: '提示',
                                 content: '系统检测到有正在码盘中的货品，继续操作会清空，是否继续？',
                                 success: function (res) {
                                    if (res.confirm) {
                                      $this.$data.detail1StyleDefList=[];
                                      $this.viewAceionContent(value);
                                    } else if (res.cancel) {
                                      $this.$data.detail1StyleDefList=[];
                                      $this.viewAceionContent(value);
                                    }
                                 }
                              });
                           } else {
                              if(value.page_name == $this.$data.param.Sub_Page[0].Name){ //判断返回的action的page_name是否是待分拣
                                $this.$data.detail1StyleDefList=[];
                              }else{
                                $this.$data.detail2StyleDefList=[];
                              }
                              $this.viewAceionContent(value);
                           }
                        } 
                        else if(item.action_type == "select_subtable_page_row"){
                           // value = {"page_name":"码盘中", "row":{"id":"xx"}}
                           var value = item.value;
                           $this.detail1StyleDefList.forEach(ele=>{
                             $this.activelist[index].active = false;
                             if(ele.form.objId == value.row.id){
                              ele.SelBut_Checked = true;
                              $this.active_id = ele.form.htmlobjId;
                              //自动滚动到指定元素
                              uni.createSelectorQuery()
                                  .select("#tabpanel")//对应外层节点
                                  .boundingClientRect((container) => {
                                      uni.createSelectorQuery()
                                      .select("#tabpanel"+ele.form.htmlobjId)//目标节点
                                      .boundingClientRect((target) => {
                                          uni.pageScrollTo({
                                          scrollTop: target.top - container.top,//滚动到实际距离是元素距离顶部的距离减去最外层盒子的滚动距离
                                          });
                                      })
                                      .exec();
                                  })
                                 .exec();
                             }
                           });
                             } else {
                                 $this.$data.detail2StyleDefList=[];
                                 $this.viewAceionContent(value);
                             }
                         }
                     });
                 }else{
                  // this.detail2StyleDefList=[];
                     if(result.info){
                     uni.showModal({title:"错误4.3",content:result.info,showCancel:false,confirmText:"取消"});
                        }
                        else if(item.action_type == "set_dlg_attr"){
                          // value = {"attr":"xxx", "value":"xxx"}
                          var data = item.value;
                          $this.$data.head_styledef.form.items.forEach(async (ele,index) => {
                            data.forEach(async (ele2,index) => {
                              if(ele.fieldId == ele2.attr){
                                ele.value = ele2.value;
                              }
                            });
                          });
                        }
                     });
                  }else{
                     // this.detail2StyleDefList=[];
                     if(result.info){
                        uni.showModal({title:"错误4.3",content:result.info,showCancel:false,confirmText:"取消"});
                     }
                  }
                 }
               }
                 
              }else{
                 uni.showModal({title:"错误4",content:ret.err_msg,showCancel:false,confirmText:"取消"});
@@ -610,6 +894,10 @@
       var styleStr = JSON.stringify(this.$data.detail1_styledef);
      if(type){ //确定后脚本进入加载已码盘数据
          styleStr = JSON.stringify(this.$data.detail2_styledef);
      }else{
         if(data.page_name == this.$data.param.Sub_Page[1].Name){ //判断返回的action的page_name是否是已分拣
           styleStr = JSON.stringify(this.$data.detail2_styledef); //待分拣
         }
      }
       var detailStyle = JSON.parse(styleStr);
       data.row.attrs.forEach(attr=>{
@@ -630,16 +918,32 @@
          this.$data.detail2StyleDefList.push(detailStyle);
          // console.log(this.$data.detail2StyleDefList);
      }else{
         this.$data.detail1StyleDefList.push(detailStyle);
       // console.log(this.$data.detail1StyleDefList);
         if(data.page_name == this.$data.param.Sub_Page[1].Name){ //判断返回的action的page_name是否是已分拣
             detailStyle.form.objId = data.row.id;
             this.$data.detail2StyleDefList.push(detailStyle);
             // console.log(this.$data.detail2StyleDefList);
         }else{
            detailStyle.form.htmlobjId = data.row.id?data.row.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
            detailStyle.form.objId = data.row.id;
            detailStyle.form.attrs = data.row.attrs;
            this.$data.detail1StyleDefList.push(detailStyle);
             this.activelist.push({active:false});
            // console.log(this.$data.detail1StyleDefList);
         }
      }
   },
   //加载已码盘内容
   viewAceionContent(data){
      var $this = this;
       data.content.forEach(cont=>{
           var styleStr = JSON.stringify(this.$data.detail2_styledef);
           var styleStr = JSON.stringify($this.$data.detail2_styledef);
         if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //判断返回的action的page_name是否是码盘中
           styleStr = JSON.stringify($this.$data.detail1_styledef); //码盘中
         }
           var detailStyle = JSON.parse(styleStr);
           detailStyle.form.objId = cont.id;
         detailStyle.SelBut_Checked = data.checkbox??true;
         detailStyle.form.objId = cont.id;
         detailStyle.form.htmlobjId = cont.id?cont.id.replace(/-/g,'').replace('{','').replace('}',''):'null';
           cont.attrs.forEach(attr=>{
             detailStyle.form.items.forEach(ele=>{ 
               if(ele.name!='Layout'){
@@ -653,9 +957,16 @@
               }
             });
           });
           this.$data.detail2StyleDefList.push(detailStyle);
         detailStyle.form.attrs = cont.attrs;
         if(data.page_name == $this.$data.param.Sub_Page[0].Name){ //判断返回的action的page_name是否是码盘中
           $this.$data.detail1StyleDefList.push(detailStyle); //码盘中
           $this.activelist.push({active:false});
           // console.log($this.$data.detail1StyleDefList);
         }else{
           $this.$data.detail2StyleDefList.push(detailStyle); //已码盘
         // console.log($this.$data.detail2StyleDefList);
         }
       });
         // console.log(this.detail2StyleDefList);
   },
   onClickItem(e) { //选择页签
      // console.log(e);
@@ -667,7 +978,7 @@
   delItem(index){  //删除码盘中样式面板
       this.detail1StyleDefList.splice(index,1);
   },
    delDataObj(style,index){  //删除已码盘数
   delDataObj(style,index){  //删除已码盘数
      // console.log(style);
     var $this = this;
     uni.showModal({
@@ -704,15 +1015,25 @@
     });
      
    },
	
   ok(){ //确定
      // var $this = this;
      // console.log(this.$data.param.Before_OK_Event);
    //    console.log(this.$data.param.After_OK_Event);
       if(this.$data.param.Before_OK_Event) //是否有确定前事件
           this.sava(this.$data.param.Before_OK_Event);
       else if(this.$data.param.After_OK_Event)  //是否有确定后事件
           this.sava(this.$data.param.After_OK_Event);
   onPanelClick(value){
      // console.log(value);
      this.active_id='';
       this.activelist.forEach(ele=>{
           ele.active = false;
       });
       this.activelist[value].active = true;
      // console.log(this.$data.activelist);
   },
   //确定
   ok(){
        this.Before_OK_Event = this.param.Sub_Page[0].Before_ok;
        this.After_OK_Event = this.param.Sub_Page[0].After_ok;
        // console.log(this.Before_OK_Event);
        // console.log(this.After_OK_Event);
       if(this.$data.Before_OK_Event.ID) //是否有确定前事件
           this.sava(this.$data.Before_OK_Event);
       else if(this.$data.After_OK_Event.ID)  //是否有确定后事件
           this.sava(this.$data.After_OK_Event);
   },
   sava(event){
      var $this = this;
@@ -738,10 +1059,34 @@
           }else
             detail_attr[item.fieldId] = item.value;
         });
         detailAttrList.push(detail_attr);
		  
        detail_attr['id'] = style.form.objId;
        if($this.param.Sub_Page[0].Select_Button==true){ //判断选择按钮是否为true
          if(style.SelBut_Checked==true) 
            detailAttrList.push(detail_attr);
        } else 
          detailAttrList.push(detail_attr);
       });
       // console.log(detailAttrList);
	    
      //获取正在码盘里没有显示的字段
      this.$data.detail1StyleDefList.forEach(style=>{
        style.form.attrs.forEach(attr => {
          for(var key in detailAttrList){
              if(style.form.objId == detailAttrList[key]['id']){
              var keys = Object.keys(detailAttrList[key]);
              var isflag = true;
              keys.forEach((ele) => {
                if(ele == attr.attr) isflag = false;
              });
              if(isflag) {
                detailAttrList[attr.attr] = attr.value;
              }
           }
          } 
        });
      });
      // console.log(detailAttrList);
    //    return;
      var input_param = Base64.encode(
          JSON.stringify(
            Object.keys(head_attr).map((a) => ({
@@ -762,75 +1107,106 @@
      });
      // console.log(jsonlist);
      jsonlist.forEach(async (json,key)=>{
         await $this.runCustomEvent(event,input_param,json);
         await $this.runCustomEvent(event,input_param,json,'1');
      });
				
        //       var data_json = Base64.encode(
        //           JSON.stringify(jsonlist)
        //       );
            // var $this = this;
            // var dataInfo={
            //   ed_type: 0,
            //   start_transaction: '',
            //   class_id: this.$data.head_styledef.form.clsId,
            //   class_name: '',
            //   event_id: this.$data.param.After_OK_Event.ID,
            //   event_name: '',
            //   data_obj_id: '',
            //   obj_attr: '',
            //   prj_id: '',
            //   ref_cls_id: '',
            //   rel_obj_id: '',
            //   user_login: '',
            //   data_json: data_json,
            //   compose_info: '',
            //   ext_info: '',
            //   global_attr: '',
            //   input_param: input_param,
            // };
        //       // console.log(dataInfo);
            // this.$store.dispatch('runCustomEvent',dataInfo).then(res=>{
            //    console.log(res);
            //    if (res.err_code == 0) {
            //       var result = res.result; 
            //       if(result.result_type == 0){
            //           $this.$data.head_styledef.form.items.forEach((item,index) => {
            //            if(item.fieldId != "S_CNTR_CODE"){
            //               item.value = '';
            //               item.oldvalue = '';
            //               $this.$data.head_styledef.form.model[item.fieldId] = '';
            //            }
            //           });
            //           $this.$data.detail1StyleDefList=[];
            //           // $this.$data.detail2StyleDefList=[];
            //           uni.showModal({title:"提示",content:"码盘成功",showCancel:false,confirmText:"取消"});
						    
            //       }else{
            //          // $this.$data.detail2StyleDefList=[];
            //           if(result.info){
            //            uni.showModal({title:"提示",content:result.info,showCancel:false,confirmText:"取消"});
            //          }
            //       }
            //    }else{
            //       uni.showModal({title:"错误8",content:res.err_msg,showCancel:false,confirmText:"取消"});
            //    }
            // }).catch(ex=>{
            //    // console.log(ex);
            //    uni.showModal({title:"错误8.1",content:ex.errMsg,showCancel:false,confirmText:"取消"});
            // });
   },
    ok2(){
        this.Before_OK_Event = this.param.Sub_Page[1].Before_ok;
        this.After_OK_Event = this.param.Sub_Page[1].After_ok;
        // console.log(this.Before_OK_Event);
        // console.log(this.After_OK_Event);
        if(this.$data.Before_OK_Event.ID) //是否有确定前事件
            this.sava2(this.$data.Before_OK_Event);
        else if(this.$data.After_OK_Event.ID)  //是否有确定后事件
            this.sava2(this.$data.After_OK_Event);
    },
    sava2(event){
       var $this = this;
        if(this.$data.detail2StyleDefList.length==0){
          uni.showModal({title:"提示",content:"没有已码盘的数据！",showCancel:false,confirmText:"取消"});
          return false;
        }
        //获取表头属性
        var head_attr = {};
        this.$data.head_styledef.form.items.forEach(item => {
          head_attr[item.fieldId] = item.value;
        });
        // console.log(head_attr);
        //获取正在码盘属性
        var detailAttrList = [];
        this.$data.detail2StyleDefList.forEach(style=>{
          var detail_attr={};
         style.form.items.forEach(item => {
            if(item.name == "Layout"){  //判断是否是栅栏格式
              item.setting.colList.forEach(cols => {
                if(cols!=null) detail_attr[cols.fieldId] = cols.value;
              });
            }else
              detail_attr[item.fieldId] = item.value;
          });
    	  
         detail_attr['id'] = style.form.objId;
         if($this.param.Sub_Page[1].Select_Button==true){ //判断选择按钮是否为true
           if(style.SelBut_Checked==true) 
             detailAttrList.push(detail_attr);
         } else 
           detailAttrList.push(detail_attr);
        });
        // console.log(detailAttrList);
       //获取正在码盘里没有显示的字段
       this.$data.detail2StyleDefList.forEach(style=>{
         style.form.attrs.forEach(attr => {
           for(var key in detailAttrList){
              if(style.form.objId == detailAttrList[key]['id']){
               var keys = Object.keys(detailAttrList[key]);
               var isflag = true;
               keys.forEach((ele) => {
                 if(ele == attr.attr) isflag = false;
               });
               if(isflag) {
                 detailAttrList[attr.attr] = attr.value;
               }
           }
           } 
         });
       });
       // console.log(detailAttrList);
     //    return;
       var input_param = Base64.encode(
           JSON.stringify(
             Object.keys(head_attr).map((a) => ({
               attr: a,
               value: head_attr[a] || "",
             }))
           )
       );
        var jsonlist=[];
       detailAttrList.forEach(attr=>{
           jsonlist.push({
             id:'',
             attrs: Object.keys(attr).map((a) => ({
               attr: a,
               value: attr[a] || "",
             }))
           });
       });
       // console.log(jsonlist);
       jsonlist.forEach(async (json,key)=>{
          await $this.runCustomEvent(event,input_param,json,'2');
       });
    },
    //执行确定脚本
    async runCustomEvent(event,input_param,json){
    async runCustomEvent(event,input_param,json,type){
      var $this = this;
      var data_json = Base64.encode(
          JSON.stringify(json)
      );
      var dataInfo={
        ed_type: 0,
        start_transaction: '',
        class_id: this.$data.head_styledef.form.clsId,
          start_transaction: true,
        class_id: this.$data.ClsID,
        class_name: '',
        event_id: this.$data.param.After_OK_Event.ID,
        event_id: event.ID,
        event_name: '',
        data_obj_id: '',
        obj_attr: '',
@@ -849,48 +1225,76 @@
         console.log(res);
         if (res.err_code == 0) {
            var result = res.result; 
            if(result.result_type == 0){
              if(result.action){
               result.action.forEach(item=>{
                 if(item.action_type == "insert_subtable_page_row"){ //码盘中
                   var value = item.value;
                   //加载已经码盘数据
                    $this.viewAceionRow(value,'add');
                     //清空条码内容
                  $this.$data.head_styledef.form.items.forEach((item,index) => {
                     if(item.fieldId != "S_CNTR_CODE"){
                       item.value = '';
                         item.oldvalue = '';
                       $this.$data.head_styledef.form.model[item.fieldId] = '';
                     }
                  });
                  //清除正在码盘中成功的数据
                  $this.$data.detail1StyleDefList.forEach((style,index)=>{
                    if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){ 
                     $this.$data.detail1StyleDefList.splice(index,1);
                     return;
            if (result.ret != 0) {
                var tip = result.err_info ? typeof result.err_info == 'string' ? result.err_info : result.err_info.join('<br/>') : '';
                if (result.ret == 801) uni.showModal({title:'提示',content:tip,showCancel:false,confirmText:"取消"});
                else uni.showModal({title:'提示',content:tip+',提示:'+result.ret,showCancel:false,confirmText:"取消"});
               return false;
            }else{
               var tip = result.info ? typeof result.info == 'string' ? result.info : result.info.join('<br/>') : '';
               if (tip) uni.showModal({title:'提示',content:tip,showCancel:false,confirmText:"取消"});
				
               if(result.result_type == 0){
                 if(result.action){
                  result.action.forEach(item=>{
                    if(item.action_type == "insert_subtable_page_row"){ //码盘中
                     var value = item.value;
                     //加载已经码盘数据
                     $this.viewAceionRow(value,'add');
                     //清空条码内容
                     $this.$data.head_styledef.form.items.forEach((item,index) => {
                        if(item.fieldId != "S_CNTR_CODE"){
                          item.value = '';
                          item.oldvalue = '';
                          $this.$data.head_styledef.form.model[item.fieldId] = '';
                        }
                     });
                     //清除正在码盘中成功的数据
                     $this.$data.detail1StyleDefList.forEach((style,index)=>{
                       if(style.form.items[0].fieldId == json.attrs[0].attr && style.form.items[0].value == json.attrs[0].value){ 
                        $this.$data.detail1StyleDefList.splice(index,1);
                        return;
                       }
                     });
                     // this.detail2StyleDefList=[];
                     uni.showModal({title:"提示",content:"码盘成功",showCancel:false,confirmText:"取消"});
                   //  } else if(item.action_type == "refresh"){  //刷新
                   //    var value = item.value;
                     // //刷新当前页面
                     // // location.reload();
                     // uni.redirectTo({
                     //    url:'../modal/5600?param='+JSON.stringify(this.$data.param)+"&titlename="+this.$data.title
                     // });
                   //  } else if(item.action_type == "prompt"){  //打开系统提示弹框
                   //    var value = '';
                     // item.value.forEach(ele=>{
                     //    if(value) value+='\n';
                     //    value+=ele;
                     // });
                     // uni.showModal({title:"系统提示",content:value,showCancel:false,confirmText:"关闭"});
                    }
                  });
                   // this.detail2StyleDefList=[];
                  uni.showModal({title:"提示",content:"码盘成功",showCancel:false,confirmText:"取消"});
                 }else{
                  if($this.$data.After_OK_Event.ID != event.ID){ //判断当前事件是否是确定后事件
                     if(type=='1'){
                        $this.sava($this.$data.After_OK_Event); //执行确定后事件
                     }else{
                        $this.sava2($this.$data.After_OK_Event); //执行确定后事件
                     }
                  }
                 }
               });
              }else{
               if($this.$data.param.After_OK_Event.ID != event.ID){ //判断当前事件是否是确定后事件
                   $this.sava($this.$data.param.After_OK_Event); //执行确定后事件
               }
              }
            }else{
               // $this.$data.detail2StyleDefList=[];
                if(result.info){
                 uni.showModal({title:"提示",content:result.info,showCancel:false,confirmText:"取消"});
               }else{
                  // $this.$data.detail2StyleDefList=[];
                  if(result.info){
                    uni.showModal({title:"提示",content:result.info,showCancel:false,confirmText:"取消"});
                  }
               }
            }
         }else{
            uni.showModal({title:"错误8",content:res.err_msg,showCancel:false,confirmText:"取消"});
         }
      }).catch(ex=>{
          let tip = typeof ex == "string" ? ex : ex.errMsg;
          var tip = typeof ex == "string" ? ex : ex.errMsg;
         uni.showModal({title:"错误8.1",content:"执行“确定后”事件失败：" + tip,showCancel:false,confirmText:"取消"});
      });
   },