Merge branch 'master' of http://121.37.118.194:8000/r/~jt/MES-PDA

cuiqian2004

2024-08-12 792a7de9550294e9ab2df42402402ef966153ff2

 pages/modal/3200.vue

@@ -39,25 +39,8 @@
                  <div class="dv-listHtml-Panel" v-if="ListHtml_Panel" v-html="ListHtml_Panel[ii]" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
              param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
              param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
                     <!-- <div class="dv_panel_content">
                  <div class="dv_panel_attr">
                    <label>No：</label>
                    <span>TA240129-00001</span>

                  </div>
                  <div class="dv_panel_attr">
                    <div class="dv_box_node">
                     <p><span>毛料线边</span></p>
                     <label>L002-1</label>
                    </div>
                    <i class="mobox-normal-right"></i>
                    <div class="dv_box_node">
                     <p><span>毛料线边</span></p>
                     <label>L003-3</label>
                    </div>
                  </div>
               </div> -->
                  </div>
                  <!-- 自定义表单类型显示 -->
                  <div class="dv-panel-input" v-if="!ListHtml_Panel" :style="param.ListPage.CheckBox==true && param.ListPage.Click_View==true?'width:85%;':
              param.ListPage.CheckBox==false && param.ListPage.Click_View==true?'width:91%;':
              param.ListPage.CheckBox==true && param.ListPage.Click_View==false?'width:88%;':'width:100%;'">
@@ -201,9 +184,9 @@

      <view class="view-floor">
         <button type="default" @click="cancel" class="btn_cancel"
            :style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">关闭</button>
            :style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("close")}}</button>
         <button type="default" @click="Refresh" class="btn_refresh"
            :style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">刷新</button>
            :style="{'width':param.ListPage.Page_Button.length>0?'39.5%':'48.5%'}">{{translateSys("refresh")}}</button>
         <view class="uni-padding-wrap" v-if="param.ListPage.Page_Button.length>0">
            <view class="uni-btn-v">
               <a @tap="actionSheetTap">
@@ -290,7 +273,40 @@
         }); //设置顶部标题 
         this.$data.title = options.titlename;
         this.$data.param = JSON.parse(options.param);
         this.initial();


         this.styledef = {};
         this.head_styledef = {
            form: {
               items: []
            }
         };
         this.detail1_styledef = {};
         this.detail1StyleDefList = [];
         this.detail2_styledef = {};
         this.detail2StyleDefList = [];
         this.ListHtml_Panel = "";
         this.ListPageHtml_Show = {
            name: "",
            event: {
               id: "",
               name: ""
            }
         };
         this.items = [];
         this.active_id = '';
         this.activelist = [];

         if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML页面") {
            // HTML页面
            //获取数据类的HTML页面
            await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id, options
               .paramValue);
         } else {
            await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);

            await this.initial(options.paramValue);
         }
         // this.isFilter=true;
         // if(this.param.ShowFilter)
         //   this.isFilter=false;
@@ -320,43 +336,61 @@
         // this.focusMateria=true; 
      },
      methods: {
         //初始化
         async initial() {
            this.styledef = {};
            this.head_styledef = {
               form: {
                  items: []
               }
            };
            this.detail1_styledef = {};
            this.detail1StyleDefList = [];
            this.detail2_styledef = {};
            this.detail2StyleDefList = [];
            this.items = [];
            this.active_id = '';
            this.activelist = [];
            this.ListHtml_Panel = "";
            this.ListPageHtml_Show = {
               name: "",
               event: {
                  id: "",
                  name: ""
               }
            };
         //
         setData: function(obj) {
            let that = this;
            let keys = [];
            let val, data;

            Object.keys(obj).forEach(function(key) {
               keys = key.split(".");
               val = obj[key];
               data = that.$data;
               keys.forEach(function(key2, index) {
                  if (index + 1 == keys.length) {
                     that.$set(data, key2, val);
                  } else {
                     if (!data[key2]) {
                        that.$set(data, key2, {});
                     }
                  }
                  data = data[key2];
               });
            });
         },

         //初始化
         async initial(paramValue) {
            this.isFilter = true;
            if (this.param.ShowFilter)
               this.isFilter = false;
            //获取数据类的自定义表单参数
            if (this.param.Query_Panel) {
               this.Head_UIStyleGetInfo(this.param.DataCls.id, this.param.Query_Panel.id);
            }
            if (this.param.ListPage.ListItem_UIDef?.ui_type == "HTML页面") {
               // HTML页面
               //获取数据类的HTML页面
               await this.Html_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
            } else {
               await this.Detail1_UIstyleGetInfo(this.param.DataCls.id, this.param.ListPage.ListItem_UIDef.id);
               await this.Head_UIStyleGetInfo(this.param.DataCls.id, this.param.Query_Panel.id);
               //传入参数值
               if (paramValue) {
                  const attrs = paramValue.attrs || [];
                  (this.$data.head_styledef?.form?.items || []).forEach(async (ele, index) => {
                     if (ele.name != "Layout") {
                        attrs.forEach(async (ele2, index2) => {
                           if (ele.fieldId == ele2.name) {
                              ele.value = ele2.value;
                           }
                        });
                     } else {
                        ele.setting.colList.forEach(async (col) => {
                           if (col) {
                              attrs.forEach(async (ele2,
                                 index2) => {
                                 if (col.fieldId == ele2.name) {
                                    col.value = ele2.value;
                                 }
                              });
                           }
                        });
                     }
                  })
               }
            }
            this.orderby = this.param.Order ? this.param.Order : 'T_CREATE Desc';
            if (this.param.Query_Event) {
@@ -368,6 +402,7 @@
               this.query_id = "";
               await this.loadDataGetList();
            }

         },
         //滚动到底部后懒加载数据
         async scrolltolower(e) {
@@ -479,7 +514,7 @@
            });

         },
         async Html_UIstyleGetInfo(class_id, style_id) { //获取自定义表单样式
         async Html_UIstyleGetInfo(class_id, style_id, paramValue) { //获取自定义表单样式
            var $this = this;
            var dataInfo = {
               class_id: class_id,
@@ -496,8 +531,11 @@
                     if (!ret.result.style_def.includes('"')) styledef = Base64.decode(ret.result
                        .style_def);
                  }
                  // console.log(styledef);
                  $this.ListPageHtml_Show = ret.result.style_def ? JSON.parse(styledef) : {};
                  // console.log($this.ListPageHtml_Show);

                  $this.initial(paramValue);
               } else {
                  uni.showModal({
                     title: this.translateSys("error") + "10",
@@ -524,45 +562,34 @@
               dict_id: dict.id,
               dict_name: dict.name
            };
            // console.log(dataInfo);
            this.$store.dispatch('DictGetInfo', dataInfo).then(async (success) => {
               console.log(success);
               if (success.err_code == 0) {
                  if (type == 'mast') {
                     var list = [];
                     var itemName = '';
                     success.result.dict_item_list.forEach((item) => {
                        if (item.is_default == '1')
                           itemName = item.name;
                        list.push({
                           text: item.value,
                           value: item.name,
                        });
            try {
               const success = await this.getDictInfo(dataInfo)
               if (type == 'mast') {
                  var list = [];
                  var itemName = '';
                  success.result.dict_item_list.forEach((item) => {
                     if (item.is_default == '1')
                        itemName = item.name;
                     list.push({
                        text: item.value,
                        value: item.name,
                     });
                     //有默认值，显示默认值
                     if (itemName) {
                        $this.head_styledef.form.items[index].value = itemName;
                        var attr = $this.head_styledef.form.items[index].fieldId;
                        $this.head_styledef.form.model[attr] = itemName;
                     }
                     $this.head_styledef.form.items[index].dict = list;
                     var head_styledef = JSON.parse(JSON.stringify($this.head_styledef));
                     $this.head_styledef = [];
                     $this.head_styledef = head_styledef;
                  } else {
                     // $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
                     // this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
                  }

               } else {
                  uni.showModal({
                     title: this.translateSys("error") + "3.1",
                     content: success.err_msg,
                     showCancel: false,
                     confirmText: this.translateSys("cancel")
                  });
                  //有默认值，显示默认值
                  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;
               } else {
                  // $this.$data.subClassAttrList[index].attr_list[key].dictitem=success.result;
                  // this.$store.commit("subClassAttrList", $this.$data.subClassAttrList);
               }
            }).catch(ex => {
            } catch (ex) {
               // console.log(ex);
               uni.showModal({
                  title: this.translateSys("error") + "3",
@@ -570,7 +597,36 @@
                  showCancel: false,
                  confirmText: this.translateSys("cancel")
               });
            });
            }
         },
         getDictInfo(info) { //Mobox3得到得到字典信息字典项列表
            const loginInfo = this.$store.getters.loginid
            const mobxoSApi = this.$store.getters.getMobxoSApi
            return new Promise((resolve, reject) => {
               uni.request({
                  url: mobxoSApi + 'api/dict/GetInfo2?sessionid=' + loginInfo.result.session_id,
                  data: info,
                  method: 'POST',
                  dataType: "json",
                  success: (_res) => {
                     // console.log(_res);
                     const ret = _res.data
                     if (ret.err_code == 0) {
                        resolve(ret);
                     } else {
                        reject({
                           "errMsg": ret.err_msg
                        });
                     }
                  },
                  fail: (err) => {
                     // console.log(err);
                     reject(err);
                  }
               })

            })

         },

         // 执行查询事件
@@ -591,13 +647,18 @@
                        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: this.translateSys("tip"),
                              content: tip,
                              showCancel: false,
                              confirmText: this.translateSys("cancel")
                           });
                           else uni.showModal({
                           if (result.ret == 801) {
                              if (this.param.Only_Script_Error) {
                                 let pos = tip.indexOf("：");
                                 if (pos > -1) tip = tip.substring(pos + 1);
                              }
                              uni.showModal({
                                 title: this.translateSys("tip"),
                                 content: tip,
                                 showCancel: false,
                                 confirmText: this.translateSys("cancel")
                              });
                           } else uni.showModal({
                              title: this.translateSys("tip"),
                              content: tip + ',' + this.translateSys('tip') + ':' + result
                                 .ret,
@@ -707,6 +768,7 @@
                     if (ret.result) {
                        $this.page_count = ret.result.page_count;
                        if (ret.result.page_count > 1) $this.query_id = ret.result.query_id;
                        // console.log($this.ListPageHtml_Show.event);
                        if ($this.ListPageHtml_Show.event.id) {
                           ret.result.obj_list.forEach((obj) => {
                              var info = {
@@ -950,9 +1012,24 @@
               if (btn.FunCode == "Add" || btn.FunCode == "Modify") {
                  if (btn.Edit_dlg.Model == "small") {
                     this.showAddSmallDialog(btn, style, enviroment);
                  } else {
                     uni.showModal({
                        title: this.translateSys("tip"),
                        content: this.translateSys("unrealized"),
                        showCancel: false,
                        confirmText: this.translateSys("cancel")
                     });
                  }
               } else if (btn.FunCode == "Delete") {
                  this.DeleteObj(btn, style, enviroment);
                  // } else if (btn.FunCode == "TriggerEvent") {
                  //   this.triggerEvent(btn, style, enviroment);
               } else if (btn.FunCode == "TriggerEvent") {
                  this.TriggerEvent(btn, style, enviroment);
                  // } else if (btn.FunCode == "TriggerEvent") {
                  //   this.triggerEvent(btn, style, enviroment);
               } else if (btn.FunCode == "RelatedFunction") {
                  this.RelatedFunction(btn, style, enviroment);
                  // } else if (btn.FunCode == "TriggerEvent") {
                  //   this.triggerEvent(btn, style, enviroment);
               } else {
@@ -1056,6 +1133,207 @@
            });

         },
         //执行事件
         async TriggerEvent(btn, style, enviroment) { //执行触发事件
            try {
               let obj_attr = {
                  S_ID: this.styledef.form.objId
               };
               style.form.attrs.forEach((attr) => {
                  obj_attr[attr.name] = attr.value;
               });

               if (!this.ListPageHtml_Show.event.id) {
                  //判断没有HTML页面事件
                  // console.log(this.detail2_styledef);
                  this.detail2_styledef.form.items.forEach(async (ele, index) => {
                     if (ele.name != "Layout") {
                        if (!obj_attr[ele.fieldId]) {
                           obj_attr[ele.fieldId] = ele.value;
                        }
                     } else if (ele.name == "Layout") {
                        ele.setting.colList.forEach(async (col, key) => {
                           if (col) {
                              if (!obj_attr[col.fieldId]) {
                                 obj_attr[col.fieldId] = col.value;
                              }
                           }
                        });
                     }
                  });
               }

               const dataInfo = {
                  ed_type: 0,
                  start_transaction: true,
                  class_id: btn.clsId,
                  event_id: btn.event.id,
                  data_obj_id: this.styledef.form.objId,
                  obj_attr: obj_attr,
               }
               this.$store.dispatch('runCustomEvent', dataInfo).then(ret => {
                  // console.log(ret);
                  if (ret.err_code == 0) {
                     var result = ret.result;
                     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) {
                           if (this.param.Only_Script_Error) {
                              let pos = tip.indexOf("：");
                              if (pos > -1) tip = tip.substring(pos + 1);
                           }
                           uni.showModal({
                              title: this.translateSys("tip"),
                              content: tip,
                              showCancel: false,
                              confirmText: this.translateSys("cancel")
                           });
                        } else uni.showModal({
                           title: this.translateSys("tip"),
                           content: tip + ',' + this.translateSys('tip') +
                              ':' +
                              result
                              .ret,
                           showCancel: false,
                           confirmText: this.translateSys("cancel")
                        });
                        return false;
                     } else {
                        var tip = result.info ? typeof result.info == 'string' ? result
                           .info :
                           result.info.join('<br/>') : '';
                        if (tip) uni.showModal({
                           title: this.translateSys("tip"),
                           content: tip,
                           showCancel: false,
                           confirmText: this.translateSys("cancel")
                        });

                     }
                  } else {
                     uni.showModal({
                        title: this.translateSys("error") + "8",
                        content: ret.err_msg,
                        showCancel: false,
                        confirmText: this.translateSys("cancel")
                     });
                  }

               }).catch(ex => {
                  // console.log(ex);
                  uni.showModal({
                     title: this.translateSys("error") + "8.1",
                     content: ex.errMsg,
                     showCancel: false,
                     confirmText: this.translateSys("cancel")
                  });
               });
            } catch (ex) {
               var tip = typeof ex == "string" ? ex : ex.message;
               uni.showModal({
                  title: this.translateSys("error"),
                  content: tip,
                  showCancel: false,
                  confirmText: this.translateSys("cancel")
               });
               this.showError(ex);
            }
         },
         //跳转
         async RelatedFunction(btn, style, enviroment) {

            if (
               btn.Related_Function?.Def_Code == "3018" ||
               btn.Related_Function?.Def_Code == "3037" ||
               btn.Related_Function?.Def_Code == "3200" ||
               btn.Related_Function?.Def_Code == "3201" ||
               btn.Related_Function?.Def_Code == "5600" ||
               btn.Related_Function?.Def_Code == "5601" ||
               btn.Related_Function?.Def_Code == "5602"
            ) {
               let name = btn.Related_Function?.Def_Code
               if (btn.Related_Function?.Def_Code == "3018" || btn.Related_Function?.Def_Code == "3037")
                  name = btn.Related_Function?.Def_Code + "_2"

               var $this = this;
               var json = {
                  app_id: appId,
               };
               this.$store.dispatch('appGetInfo', json).then(success => {
                  // console.log(success);
                  if (success.err_code == 0) {
                     if ((success.result || []).length > 0) {
                        const app = success.result[0]
                        var param = "";
                        var appName = app.list_name || app.name
                           .Name;
                        var paramStr = app.param
                        if (paramStr) {
                           //mobox2的param是json字符串
                           param = paramStr.replace(/\\/g, "");
                           //mobox3的param是base64字符串
                           if (!paramStr.includes('"')) param = Base64.decode(paramStr);
                        }
                        if (!param) {
                           uni.showModal({
                              title: this.translateSys("tip"),
                              content: this.translate('tip_no_app_param'),
                              showCancel: false,
                              confirmText: this.translateSys("cancel")
                           });
                           return;
                        }

                        uni.navigateTo({
                           url: '../modal/' + name + '?param=' + param + "&titlename=" +
                              appName +
                              "&type=relatedFunction&paramValue=" + JSON.stringify(style
                                 .form),
                           events: {
                              relatedFunction: function(data) {
                                 console.log(data);
                                 $this.Refresh();
                              },
                           }
                        });
                     } else {
                        uni.showModal({
                           title: this.translateSys("error"),
                           content: this.translate("function_not_exist"),
                           showCancel: false,
                           confirmText: this.translateSys("cancel")
                        });
                     }
                  } else {
                     uni.showModal({
                        title: this.translateSys("error"),
                        content: success.msg,
                        showCancel: false,
                        confirmText: this.translateSys("cancel")
                     });
                  }
               }).catch(ex => {
                  // console.log(ex);
                  uni.showModal({
                     title: this.translateSys("error"),
                     content: ex.errMsg,
                     showCancel: false,
                     confirmText: this.translateSys("cancel")
                  });
               });
            } else {
               uni.showModal({
                  title: this.translateSys("error"),
                  content: this.translate("cannot_related_function"),
                  showCancel: false,
                  confirmText: this.translateSys("cancel")
               });

            }
         },
         //执行后处理事件
         async AfterProcess_Event(clsId, afterProcess_Event, enviroment) {
            try {
@@ -1094,7 +1372,8 @@
                  var attr = item.fieldId;
                  this.head_styledef.form.model[attr] = item.value;
                  var onChangeEvent = item.bind.onChangeEvent; //内容变化后事件
                  var onSuffixClickCallbackEvent = item.bind.onSuffixClickCallbackEvent; //后图标点击事件
                  var onSuffixClickCallbackEvent = item.bind
                     .onSuffixClickCallbackEvent; //后图标点击事件
                  var onSuffixClickEvent = item.bind.onSuffixClickEvent; //后图标点击回调
                  var isflag = false;

@@ -1196,24 +1475,34 @@
                     if (ret.err_code == 0) {
                        var result = ret.result;
                        if (result.ret != 0) {
                           var tip = result.err_info ? typeof result.err_info == 'string' ? result
                           var tip = result.err_info ? typeof result.err_info ==
                              'string' ?
                              result
                              .err_info : result.err_info.join('<br/>') : '';
                           if (result.ret == 801) uni.showModal({
                           if (result.ret == 801) {
                              if (this.param.Only_Script_Error) {
                                 let pos = tip.indexOf("：");
                                 if (pos > -1) tip = tip.substring(pos + 1);
                              }
                              uni.showModal({
                                 title: this.translateSys("tip"),
                                 content: tip,
                                 showCancel: false,
                                 confirmText: this.translateSys("cancel")
                              });
                           } else uni.showModal({
                              title: this.translateSys("tip"),
                              content: tip,
                              showCancel: false,
                              confirmText: this.translateSys("cancel")
                           });
                           else uni.showModal({
                              title: this.translateSys("tip"),
                              content: tip + ',' + this.translateSys('tip') + ':' + result
                              content: tip + ',' + this.translateSys('tip') +
                                 ':' +
                                 result
                                 .ret,
                              showCancel: false,
                              confirmText: this.translateSys("cancel")
                           });
                           return false;
                        } else {
                           var tip = result.info ? typeof result.info == 'string' ? result.info :
                           var tip = result.info ? typeof result.info == 'string' ? result
                              .info :
                              result.info.join('<br/>') : '';
                           if (tip) uni.showModal({
                              title: this.translateSys("tip"),
@@ -1227,16 +1516,23 @@
                                 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;
                                          }
                                       });
                                    });
                                    $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 {
@@ -1274,7 +1570,8 @@
               var tip = typeof ex == "string" ? ex : ex.message;
               uni.showModal({
                  title: this.translateSys("error") + "8.2",
                  content: this.translate('execute_after_change_event_failed') + this.translateSys(
                  content: this.translate('execute_after_change_event_failed') + this
                     .translateSys(
                        "comma") +
                     this.translate('reason') + this.translateSys("colon") + tip,
                  showCancel: false,
@@ -1301,23 +1598,33 @@
                  if (ret.err_code == 0) {
                     var result = ret.result;
                     if (result.ret != 0) {
                        var tip = result.err_info ? typeof result.err_info == 'string' ? result
                        var tip = result.err_info ? typeof result.err_info ==
                           'string' ?
                           result
                           .err_info : result.err_info.join('<br/>') : '';
                        if (result.ret == 801) uni.showModal({
                        if (result.ret == 801) {
                           if (this.param.Only_Script_Error) {
                              let pos = tip.indexOf("：");
                              if (pos > -1) tip = tip.substring(pos + 1);
                           }
                           uni.showModal({
                              title: this.translateSys("tip"),
                              content: tip,
                              showCancel: false,
                              confirmText: this.translateSys("cancel")
                           });
                        } else uni.showModal({
                           title: this.translateSys("tip"),
                           content: tip,
                           showCancel: false,
                           confirmText: this.translateSys("cancel")
                        });
                        else uni.showModal({
                           title: this.translateSys("tip"),
                           content: tip + ',' + this.translateSys('tip') + ':' + result.ret,
                           content: tip + ',' + this.translateSys('tip') +
                              ':' +
                              result.ret,
                           showCancel: false,
                           confirmText: this.translateSys("cancel")
                        });
                        return false;
                     } else {
                        var tip = result.info ? typeof result.info == 'string' ? result.info : result
                        var tip = result.info ? typeof result.info == 'string' ? result
                           .info : result
                           .info.join('<br/>') : '';
                        if (tip) uni.showModal({
                           title: this.translateSys("tip"),
@@ -1328,24 +1635,31 @@

                        if (result.result_type == 0 && result.action) {
                           result.action.forEach(item => {
                              if (item.action_type == "goback_to_pre_page") { //返回上一页
                              if (item.action_type ==
                                 "goback_to_pre_page") { //返回上一页
                                 var value = item.value;
                                 uni.navigateBack({
                                    delta: 1, //返回层数，2则上上页
                                 });
                              } else if (item.action_type == "hidden_button") { //隐藏按钮
                              } else if (item.action_type ==
                                 "hidden_button") { //隐藏按钮
                                 var value = item.value;
                                 value.forEach(btn => {
                                    var index = $this.param.ListPage.Page_Button
                                       .findIndex(button => button.ShowName ==
                                    var index = $this.param
                                       .ListPage
                                       .Page_Button
                                       .findIndex(button => button
                                          .ShowName ==
                                          btn)
                                    if (index > -1)
                                       $this.param.ListPage.Page_Button.splice(
                                       $this.param.ListPage
                                       .Page_Button.splice(
                                          index, 1)
                                 })
                                 // } else if(item.action_type == "refresh_cur_row"){ //
                                 //    var value = item.value;
                              } else if (item.action_type == "set_panel_html") { //显示Html页面
                              } else if (item.action_type ==
                                 "set_panel_html") { //显示Html页面
                                 // var value = item.value;
                                 $this.ListHtml_Panel = item.value;
                                 // $this.detail1StyleDefList.forEach((ele,index)=>{
@@ -1354,15 +1668,23 @@

                              } else {
                                 uni.showModal({
                                    title: this.translateSys("tip"),
                                    title: this.translateSys(
                                       "tip"),
                                    content: this.translateSys(
                                          "quotation_mark_left") + item
                                       .action_type + this.translateSys(
                                          "quotation_mark_right") + this
                                          "quotation_mark_left"
                                       ) +
                                       item
                                       .action_type + this
                                       .translateSys(
                                          "quotation_mark_right"
                                       ) +
                                       this
                                       .translate(
                                          "tip_action_unprocessed"),
                                          "tip_action_unprocessed"
                                       ),
                                    showCancel: false,
                                    confirmText: this.translateSys("cancel")
                                    confirmText: this.translateSys(
                                       "cancel")
                                 });
                              }
                           });
@@ -1445,13 +1767,17 @@
            var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
            list.forEach(ls => {
               var where = ls.trim()
               if (where.startsWith('(') && where.endsWith(')')) where = where.replace(/^\(/, '').replace(
               if (where.startsWith('(') && where.endsWith(')')) where = where.replace(
                  /^\(/,
                  '').replace(
                  /\)$/, '')
               if (where.toLowerCase().includes(' and ')) {
                  // 二级and放在第一级数组中
                  where.split(/ and /i).forEach(li => {
                     var l = li.trim()
                     if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(
                     if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
                        /^\(/,
                        '').replace(
                        /\)$/, '')
                     var sep = ''
                     for (var i = 0; i < seps.length; i++) {
@@ -1462,21 +1788,33 @@
                     }
                     if (sep) {
                        var values = l.split(new RegExp(sep, 'i'))
                        var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
                        var field = values[0]?.trim().replace(/^\[/, '')
                           .replace(
                              /\]$/, '')
                        var value = ''
                        var op = sep.trim()

                        if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes(
                              'select ') && values[1]?.toLowerCase().includes(' from ')) {
                           value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
                           if (value.startsWith('(') && value.endsWith(')')) value = value
                        if ([' in', ' not in'].includes(sep) && values[1]
                           ?.toLowerCase().includes(
                              'select ') && values[1]?.toLowerCase()
                           .includes(
                              ' from ')) {
                           value = l.replace(field, '').replace(
                              /^\s*(in|not in)\s*/i, '').trim()
                           if (value.startsWith('(') && value.endsWith(')'))
                              value = value
                              .replace(/^\(/, '').replace(/\)$/, '').trim()
                        } else {
                           value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
                           value = values[1]?.trim().replace(/^\'/, '')
                              .replace(
                                 /\'$/, '')

                           if (['in', 'not in'].includes(op)) {
                              value = value.replace(/^\(/, '').replace(/\)$/, '')
                              value = value.split(',').map(v => v.trim().replace(/^\'/, '')
                              value = value.replace(/^\(/, '').replace(/\)$/,
                                 '')
                              value = value.split(',').map(v => v.trim()
                                 .replace(
                                    /^\'/, '')
                                 .replace(/\'$/, ''))
                           }
                        }
@@ -1492,7 +1830,9 @@
                  var s = []
                  where.split(/ or /i).forEach(li => {
                     var l = li.trim()
                     if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(
                     if (l.startsWith('(') && l.endsWith(')')) l = l.replace(
                        /^\(/,
                        '').replace(
                        /\)$/, '')
                     var sep = ''
                     for (var i = 0; i < seps.length; i++) {
@@ -1503,21 +1843,33 @@
                     }
                     if (sep) {
                        var values = l.split(new RegExp(sep, 'i'))
                        var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
                        var field = values[0]?.trim().replace(/^\[/, '')
                           .replace(
                              /\]$/, '')
                        var value = ''
                        var op = sep.trim()

                        if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes(
                              'select ') && values[1]?.toLowerCase().includes(' from ')) {
                           value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
                           if (value.startsWith('(') && value.endsWith(')')) value = value
                        if ([' in', ' not in'].includes(sep) && values[1]
                           ?.toLowerCase().includes(
                              'select ') && values[1]?.toLowerCase()
                           .includes(
                              ' from ')) {
                           value = l.replace(field, '').replace(
                              /^\s*(in|not in)\s*/i, '').trim()
                           if (value.startsWith('(') && value.endsWith(')'))
                              value = value
                              .replace(/^\(/, '').replace(/\)$/, '').trim()
                        } else {
                           value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
                           value = values[1]?.trim().replace(/^\'/, '')
                              .replace(
                                 /\'$/, '')

                           if (['in', 'not in'].includes(op)) {
                              value = value.replace(/^\(/, '').replace(/\)$/, '')
                              value = value.split(',').map(v => v.trim().replace(/^\'/, '')
                              value = value.replace(/^\(/, '').replace(/\)$/,
                                 '')
                              value = value.split(',').map(v => v.trim()
                                 .replace(
                                    /^\'/, '')
                                 .replace(/\'$/, ''))
                           }
                        }
@@ -1533,7 +1885,9 @@
                  var li = where
                  // 单一查询条件直接放在第一级数组中
                  var l = li.trim()
                  if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
                  if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '')
                     .replace(
                        /\)$/, '')
                  var sep = ''
                  for (var i = 0; i < seps.length; i++) {
                     if (l.toLowerCase().includes(seps[i])) {
@@ -1547,18 +1901,23 @@
                     var value = ''
                     var op = sep.trim()

                     if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') &&
                     if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase()
                        .includes('select ') &&
                        values[1]?.toLowerCase().includes(' from ')) {
                        value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
                        if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '')
                        value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '')
                           .trim()
                        if (value.startsWith('(') && value.endsWith(')')) value = value
                           .replace(/^\(/, '')
                           .replace(/\)$/, '').trim()
                     } else {
                        value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')

                        if (['in', 'not in'].includes(op)) {
                           value = value.replace(/^\(/, '').replace(/\)$/, '')
                           value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/,
                              ''))
                           value = value.split(',').map(v => v.trim().replace(/^\'/,
                                 '')
                              .replace(/\'$/,
                                 ''))
                        }
                     }
                     sql.push([{
@@ -1696,7 +2055,7 @@
      }

      .dv-panel-buticon .btn-padding {
         padding: 0rpx 20rpx;
         padding: 10rpx 20rpx;
         display: inline-block;
         vertical-align: middle;
      }