n20-common-lib 2.4.5 → 2.4.7

package/nstc-g6/components/Search/src/main copy.vue

@@ -7,7 +7,7 @@
 <template>
   <div class="filter-custom-box">
     <div>
-    {{formModel}}
+      {{ formModel }}
     </div>
     <el-popover
       ref="popover"
@@ -18,7 +18,7 @@
     >
       <div class="filter-custom-box-main">
         <div class="filter-custom-box-main-header">
-          <div class="filter-text">{{ $t("common_w_0046") }}</div>
+          <div class="filter-text">{{ $t('common_w_0046') }}</div>
           <div class="filter-close-img" @click="closePopover">
             <img :src="filterCloseImg" alt="" />
           </div>
@@ -35,38 +35,23 @@
           />
         </div>
         <div class="filter-custom-box-main-more">
-          <span @click="moreCondition">{{ $t("common_w_0047") }}</span>
+          <span @click="moreCondition">{{ $t('common_w_0047') }}</span>
         </div>
         <div class="filter-custom-box-main-footer">
-          <el-button
-            type="primary"
-            class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b"
-            @click="confirmAction"
-            >{{ $t("common_w_0002_1") }}</el-button
-          >
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="重置本次操作"
-            placement="top-start"
-          >
-            <el-button
-              class="nstc-g6-common-btn-3 nstc-g6-common-btn-size-b"
-              @click="resetAction"
-              >{{ $t("common_w_0037") }}</el-button
-            >
+          <el-button type="primary" class="nstc-g6-common-btn-1 nstc-g6-common-btn-size-b" @click="confirmAction">{{
+            $t('common_w_0002_1')
+          }}</el-button>
+          <el-tooltip class="item" effect="dark" content="重置本次操作" placement="top-start">
+            <el-button class="nstc-g6-common-btn-3 nstc-g6-common-btn-size-b" @click="resetAction">{{
+              $t('common_w_0037')
+            }}</el-button>
           </el-tooltip>
         </div>
       </div>
       <div slot="reference" class="filter-opt">
         <div class="filter-opt-temp" @click.stop="init">
           <img class="svg-box" :src="searchImg" alt="" style="display: block" />
-          <img
-            class="g6-img svg-box-active"
-            :src="searchImgActive"
-            alt=""
-            style="display: none"
-          />
+          <img class="g6-img svg-box-active" :src="searchImgActive" alt="" style="display: none" />
           <!-- <span class="filter-text">{{$t('common_w_0046')}}</span> -->
         </div>
       </div>
@@ -85,120 +70,117 @@
 
 <script>
 // import filterImg from '@/theme/theme1/img/global/filter@2x.png'
-import filterImg from "@/theme/theme1/img/global/filter.svg";
-import filterImgActive from "@/theme/theme1/img/global/filterActive.svg";
-import filterCloseImg from "@/theme/theme1/img/global/filterClose@2x.png";
-import searchImg from "@/theme/theme1/img/global/hourglass.svg";
-import searchImgActive from "@/theme/theme1/img/global/searchActive.svg";
-import NstcTableSet from "^/TableSet/src/main";
-import NstcForm from "^/Form/Component";
-import { getDynamicUnit } from "@/api/common";
+import filterImg from '@/theme/theme1/img/global/filter.svg'
+import filterImgActive from '@/theme/theme1/img/global/filterActive.svg'
+import filterCloseImg from '@/theme/theme1/img/global/filterClose@2x.png'
+import searchImg from '@/theme/theme1/img/global/hourglass.svg'
+import searchImgActive from '@/theme/theme1/img/global/searchActive.svg'
+import NstcTableSet from '^/TableSet/src/main'
+import NstcForm from '^/Form/Component'
+import { getDynamicUnit } from '@/api/common'
 
 export default {
-  name: "NstcSearch",
+  name: 'NstcSearch',
 
   components: {
     NstcTableSet,
-    NstcForm,
+    NstcForm
   },
 
   props: {
     defaultConfig: {
       type: Object,
       default: () => {
-        return {};
-      },
+        return {}
+      }
     },
     config: {
       type: Object,
       default: () => {
         return {
-          pageUUID: "",
-          moduleNo: "",
-          queryType: "",
-        };
-      },
+          pageUUID: '',
+          moduleNo: '',
+          queryType: ''
+        }
+      }
     },
     defaultValue: {
       type: Object,
       default: () => {
-        return {};
-      },
+        return {}
+      }
     },
     valueConfig: {
       type: Object,
       default: () => {
-        return {};
-      },
-    },
+        return {}
+      }
+    }
   },
 
   data() {
     return {
-      placement:'bottom',
+      placement: 'bottom',
       filterImg,
       filterCloseImg,
       filterImgActive,
       searchImg,
       searchImgActive,
       conditionSetFlag: false,
-      defaultType: "condition",
+      defaultType: 'condition',
       formModel: {},
       reset: false,
       defaultSet: [],
-      setTitle: "筛选条件",
+      setTitle: '筛选条件',
       popoverShowFlag: false,
       queryTypeObj: {
         all: 1, // 全部
         columnSet: 2, // 表格设置
-        condition: 3, // 条件设置
+        condition: 3 // 条件设置
       },
       loadingFlag: false,
       hasLoad: false,
       formConfig: [],
-      oldFormModel: {},
-    };
+      oldFormModel: {}
+    }
   },
 
   computed: {
     labelWidth() {
-      let l = 0;
+      let l = 0
       this.defaultSet.map((i) => {
-        l = Math.max(i[`name`].length, l);
-      });
-      return l === 0 ? "120" : l * 16 + 12;
-    },
+        l = Math.max(i[`name`].length, l)
+      })
+      return l === 0 ? '120' : l * 16 + 12
+    }
   },
   watch: {
     defaultSet: {
       handler(value) {
         if (value && Array.isArray(value) && value.length) {
-          const that = this;
+          const that = this
           this.formConfig = that.defaultSet.map((item) => {
-            let mold = that.typeConversion(item.type);
-            let options = [];
+            let mold = that.typeConversion(item.type)
+            let options = []
             try {
-              options = JSON.parse(item.options);
+              options = JSON.parse(item.options)
             } catch (error) {
-              options = [];
+              options = []
             }
             // item.multiple  添加默认配置
-            const customConfig = that.defaultConfig[item.id] || {};
+            const customConfig = that.defaultConfig[item.id] || {}
             let data = [
               {
                 mold: mold.type, // 组件名称
                 name: item.name, // 表单选项的名称
-                prop:
-                  item.type == "select" && item.multiple
-                    ? item.id + "s"
-                    : item.id, // 绑定的key值
+                prop: item.type == 'select' && item.multiple ? item.id + 's' : item.id, // 绑定的key值
                 options: options, //item.options ? JSON.parse(item.options):[], // 下拉选择框的选项
                 url: that.removeQuotation(item.url), // 远程查询的url
                 formConfig: item.formConfig || [], // 弹窗查询的 选择表单
                 columns: item.columns || [], // 弹框查询： 的表格配置
                 valueKey: that.removeQuotation(item.valueKey),
                 labelKey: that.removeQuotation(item.labelKey),
-                httpMethod: item.httpMethod || "get", // 请求方式
+                httpMethod: item.httpMethod || 'get', // 请求方式
                 lazyLoad: item.lazyLoad || false, // 请求方式
                 placeholder: item.placeholder,
                 width: item.width || 224,
@@ -215,64 +197,58 @@ export default {
                 resProp: item.resProp || null,
                 isCache: item.isCache,
                 class: {
-                  "filter-condition-input": [
-                    "input",
-                    "nstcSelectTree",
-                  ].includes(mold.type), // 用于控制组件长度
-                  [item.className || "null-custom-class"]: true,
+                  'filter-condition-input': ['input', 'nstcSelectTree'].includes(mold.type), // 用于控制组件长度
+                  [item.className || 'null-custom-class']: true
                 },
                 ...customConfig,
-                isInitRequest: item.name === '融资单位' && item.id  // 特殊处理
-              },
-            ];
+                isInitRequest: item.name === '融资单位' && item.id // 特殊处理
+              }
+            ]
 
             // 判断是否设置默认值
-            if (!["", null, undefined].includes(this.defaultValue[item.id])) {
-              data[0].default = this.defaultValue[item.id];
+            if (!['', null, undefined].includes(this.defaultValue[item.id])) {
+              data[0].default = this.defaultValue[item.id]
             }
 
             if (mold.attr) {
-              data[0].type = mold.attr;
+              data[0].type = mold.attr
             }
 
             if (item.bind && item.bind instanceof Object) {
               // 不能改变原来的属性
-              const bindKey = Object.keys(item.bind);
-              const dataKey = Object.keys(data[0]);
-              const tempKey = bindKey.filter((k) => !dataKey.includes(k));
+              const bindKey = Object.keys(item.bind)
+              const dataKey = Object.keys(data[0])
+              const tempKey = bindKey.filter((k) => !dataKey.includes(k))
 
               tempKey.map((k) => {
-                data[0][k] = item.bind[k];
-              });
+                data[0][k] = item.bind[k]
+              })
             }
 
             /**
              * 特殊自定义组件属性处理
              */
-            if (
-              item.type === "nstcSelectTree" ||
-              item.type === "nstcSelectTreeList"
-            ) {
-              data[0].defaultProps = item.defaultProps;
-              data[0].tagProps = item.tagProps;
-              data[0].nodeKey = item.nodeKey;
-              data[0].params = item.params;
-              data[0].queryKey = item.queryKey;
-              data[0].label = item.label;
+            if (item.type === 'nstcSelectTree' || item.type === 'nstcSelectTreeList') {
+              data[0].defaultProps = item.defaultProps
+              data[0].tagProps = item.tagProps
+              data[0].nodeKey = item.nodeKey
+              data[0].params = item.params
+              data[0].queryKey = item.queryKey
+              data[0].label = item.label
             }
-            if (item.id === "branchBankNo") {
-              data[0].defaultProps = item.defaultProps;
-              data[0].nodeKey = item.nodeKey;
-              data[0].params = item.params;
-              data[0].queryKey = item.queryKey;
-              data[0].filterable = item.filterable;
-              data[0].httpMethod = item.httpMethod;
-              data[0].queryKey = item.queryKey;
-              data[0].lazyLoad = item.lazyLoad;
-              data[0].pageMode = item.pageMode;
-              data[0].pageCurrentKey = item.pageCurrentKey;
-              data[0].pageSizeKey = item.pageSizeKey;
-              data[0].remote = item.remote;
+            if (item.id === 'branchBankNo') {
+              data[0].defaultProps = item.defaultProps
+              data[0].nodeKey = item.nodeKey
+              data[0].params = item.params
+              data[0].queryKey = item.queryKey
+              data[0].filterable = item.filterable
+              data[0].httpMethod = item.httpMethod
+              data[0].queryKey = item.queryKey
+              data[0].lazyLoad = item.lazyLoad
+              data[0].pageMode = item.pageMode
+              data[0].pageCurrentKey = item.pageCurrentKey
+              data[0].pageSizeKey = item.pageSizeKey
+              data[0].remote = item.remote
             }
 
             // 包含金额
@@ -290,15 +266,15 @@ export default {
             //   };
             // }
             // console.log('自定义设置条件data....', data[0])
-            return data;
-          });
+            return data
+          })
           setTimeout(() => {
-            this.setValue();
-          }, 0);
+            this.setValue()
+          }, 0)
         }
       },
       immediate: true,
-      deep: true,
+      deep: true
     },
 
     /**
@@ -308,11 +284,11 @@ export default {
     formModel: {
       deep: true,
       handler(data) {
-        this.$emit("form-change", data, this.formConfig);
-      },
-    },
+        this.$emit('form-change', data, this.formConfig)
+      }
+    }
   },
-  mounted(){
+  mounted() {
     console.log(444)
   },
   methods: {
@@ -320,111 +296,102 @@ export default {
      * 组件联动，避免多次触发nstcform.watch.config
      */
     updateFormConfig(newConfig) {
-      this.formConfig = newConfig;
+      this.formConfig = newConfig
     },
 
     clickTreeNode(queryKey, data) {
       if (queryKey) {
-        this.formModel[queryKey] = data[queryKey];
+        this.formModel[queryKey] = data[queryKey]
       }
     },
     /**
      * 提交保存成功
      */
     handleConfirm() {
-      console.log("查询条件设置成功", this.formModel);
+      console.log('查询条件设置成功', this.formModel)
       // 缓存下之前的数据
-      const cache = JSON.parse(JSON.stringify(this.formModel));
-      this.init("update", () => {
-        this.formModel = cache;
-      });
-      this.popoverShowFlag = true;
+      const cache = JSON.parse(JSON.stringify(this.formModel))
+      this.init('update', () => {
+        this.formModel = cache
+      })
+      this.popoverShowFlag = true
     },
 
     async init(flag, cb) {
-      this.popoverShowFlag = !this.popoverShowFlag;
-      if (this.hasLoad && flag !== "update") {
-        this.changeDefaultSet();
+      this.popoverShowFlag = !this.popoverShowFlag
+      if (this.hasLoad && flag !== 'update') {
+        this.changeDefaultSet()
 
         this.$nextTick(() => {
-          this.$forceUpdate();
-        });
-        return;
+          this.$forceUpdate()
+        })
+        return
       }
-      this.loadingFlag = true;
-      this.defaultSet = [];
+      this.loadingFlag = true
+      this.defaultSet = []
       const res = await getDynamicUnit({
         ...this.config,
-        queryType: 3,
-      });
-      this.loadingFlag = false;
-      this.hasLoad = true;
-      this.defaultSet = res;
-      this.changeDefaultSet();
+        queryType: 3
+      })
+      this.loadingFlag = false
+      this.hasLoad = true
+      this.defaultSet = res
+      this.changeDefaultSet()
       this.$nextTick(() => {
-        this.updatePop();
-        this.$forceUpdate();
-        cb && cb();
-      });
+        this.updatePop()
+        this.$forceUpdate()
+        cb && cb()
+      })
     },
     changeDefaultSet() {
       this.defaultSet = this.defaultSet.map((item) => {
-        let nItem = Object.assign({}, item);
-        nItem.disabled = this.valueConfig[item.id]
-          ? this.valueConfig[item.id].disabled || false
-          : false;
-        this.valueConfig[item.id] &&
-          (nItem.label = this.valueConfig[item.id].label);
+        let nItem = Object.assign({}, item)
+        nItem.disabled = this.valueConfig[item.id] ? this.valueConfig[item.id].disabled || false : false
+        this.valueConfig[item.id] && (nItem.label = this.valueConfig[item.id].label)
         nItem.options = this.valueConfig[item.id]
           ? JSON.stringify(this.valueConfig[item.id].options) || []
-          : item.options;
-        nItem.time = new Date().getTime();
-        nItem.clearable = this.valueConfig[item.id]
-          ? this.valueConfig[item.id].clearable
-          : true;
-        return nItem;
-      });
+          : item.options
+        nItem.time = new Date().getTime()
+        nItem.clearable = this.valueConfig[item.id] ? this.valueConfig[item.id].clearable : true
+        return nItem
+      })
     },
     setValue() {
-      let newObj = {};
+      let newObj = {}
       for (let key1 in this.valueConfig) {
-        let item = this.valueConfig[key1];
-        let keyObj = this.defaultSet.find(
-          (item) => item.id === key1 && item.type === "select" && item.multiple
-        );
+        let item = this.valueConfig[key1]
+        let keyObj = this.defaultSet.find((item) => item.id === key1 && item.type === 'select' && item.multiple)
         if (item.value) {
-          this.$set(newObj, keyObj ? key1 + "s" : key1, item.value);
+          this.$set(newObj, keyObj ? key1 + 's' : key1, item.value)
         }
       }
       // this.formModel = {...this.formModel,...this.oldFormModel, ...newObj}
-      if (JSON.stringify(this.oldFormModel) !== "{}") {
+      if (JSON.stringify(this.oldFormModel) !== '{}') {
         // 旧配置中的字段不在新的配置中，则需要移除对应的缓存值
         this.defaultSet.forEach(({ id, multiple, type, queryKey }) => {
-          const isExist =
-            Reflect.has(this.oldFormModel, id) ||
-            Reflect.has(this.oldFormModel, id + "s");
+          const isExist = Reflect.has(this.oldFormModel, id) || Reflect.has(this.oldFormModel, id + 's')
           // 在缓存中存在，则取缓存的值
           if (isExist) {
-            if (type === "select" && multiple) {
-              this.formModel[id + "s"] = this.oldFormModel[id + "s"];
+            if (type === 'select' && multiple) {
+              this.formModel[id + 's'] = this.oldFormModel[id + 's']
             } else {
-              this.formModel[id] = this.oldFormModel[id];
+              this.formModel[id] = this.oldFormModel[id]
             }
           } else {
-            this.formModel[id] = this.defaultSet[id];
+            this.formModel[id] = this.defaultSet[id]
           }
-        });
+        })
         // 新配置中移除了某些字段，需要将缓存中的字段移除
         Object.keys(this.oldFormModel).forEach((k) => {
           const isExist = this.defaultSet.find((item) => {
-            return item.id === k || item.id + "s" === k || item.queryKey == k;
-          });
+            return item.id === k || item.id + 's' === k || item.queryKey == k
+          })
           if (!isExist) {
-            delete this.formModel[k];
+            delete this.formModel[k]
           }
-        });
+        })
       }
-      this.formModel = { ...this.formModel, ...newObj };
+      this.formModel = { ...this.formModel, ...newObj }
     },
     /**
      * 类型转化方法
@@ -434,69 +401,69 @@ export default {
       const mold = [
         {
           // 时间
-          type: "datepicker",
-          attr: "daterange",
-        },
-      ];
+          type: 'datepicker',
+          attr: 'daterange'
+        }
+      ]
       // 筛选对应需要添加属性的数据
       // eg:
-      let isAddAttr = mold.filter((x) => x.attr === type);
+      let isAddAttr = mold.filter((x) => x.attr === type)
 
       return isAddAttr.length !== 0
         ? {
             type: isAddAttr[0].type,
-            attr: isAddAttr[0].attr,
+            attr: isAddAttr[0].attr
           }
         : {
             type: type,
-            attr: null,
-          };
+            attr: null
+          }
     },
 
     /**
      * 查询更多条件
      */
     moreCondition() {
-      this.conditionSetFlag = true;
+      this.conditionSetFlag = true
     },
 
     /**
      * 确认查询
      */
     confirmAction() {
-      this.popoverShowFlag = false;
-      this.oldFormModel = JSON.parse(JSON.stringify(this.formModel));
+      this.popoverShowFlag = false
+      this.oldFormModel = JSON.parse(JSON.stringify(this.formModel))
       // 格式化金额
-      this.$emit("search", this.formModel);
+      this.$emit('search', this.formModel)
     },
 
     /**
      * 去掉后台返回字段的”
      */
     removeQuotation(str) {
-      return str ? str.replace(/"/g, "") : "";
+      return str ? str.replace(/"/g, '') : ''
     },
 
     /**
      * 重置
      */
     resetAction() {
-      this.reset = true;
-      this.oldFormModel = {};
-      this.changeDefaultSet("reset");
+      this.reset = true
+      this.oldFormModel = {}
+      this.changeDefaultSet('reset')
       setTimeout(() => {
-        this.$emit("reset", this.formModel);
-      }, 100);
+        this.$emit('reset', this.formModel)
+      }, 100)
     },
 
     /**
      * 关闭
      */
     closePopover() {
-      this.reset = true;
+      this.reset = true
       this.$nextTick(() => {
-        this.popoverShowFlag = false;
-      });
+        this.popoverShowFlag = false
+      })
     },
 
     /**
@@ -505,15 +472,14 @@ export default {
     openPopover() {},
 
     updatePop() {
-      this.$refs.popover.updatePopper();
+      this.$refs.popover.updatePopper()
     }
-  },
-};
+  }
+}
 </script>
 
-
 <style lang="scss">
-@import "~@/theme/theme1/styles/variables.scss";
+@import '~@/theme/theme1/styles/variables.scss';
 .filter-custom-box {
   .interval-input-custom {
   }
@@ -604,4 +570,3 @@ export default {
   padding-right: 0px !important;
 }
 </style>
-

package/nstc-g6/components/approvelTwo/main.vue

@@ -86,9 +86,7 @@ export default {
           attributes: {},
           groupNo: this.$route.query.groupNo || this.$route.params.groupNo,
           message: this.message,
-          procInstId:
-            this.$route.query.processInstanceId ||
-            this.$route.params.processInstanceId,
+          procInstId: this.$route.query.processInstanceId || this.$route.params.processInstanceId,
           taskId: this.$route.query.taskId || this.$route.params.taskId,
           typeCode: this.$route.query.typeCode || this.$route.params.typeCode
         }
@@ -172,9 +170,7 @@ export default {
     pendingBtn(val) {
       switch (val) {
         case 0: // 返回
-          window.closeTagsForBackPage
-            ? window.closeTagsForBackPage(this.$route.fullPath)
-            : this.$router.go(-1)
+          window.closeTagsForBackPage ? window.closeTagsForBackPage(this.$route.fullPath) : this.$router.go(-1)
           break
 
         case 1: // 暂存