完善ditsel查询。明天继续优化

src/components/SearchInput.vue

@@ -146,48 +146,28 @@ export default {
       this.resultDisplay = false;
       // TODO
       
-      let link = "";
-      switch(row.OBJTYP.trim()){
-        case "DID":
-          link = "ditsel"
-          break
-        case "LID":
-          link = "litsel"
-          break;
-        case "CPD":
-          link = "cptsel"
-          break;
-        case "DED":
-          link = "detsel"
-          break;
-        case "LED":
-          link = "letsel"
-          break;
-        case "BPD":
-          link = "bptsel"
-          break;
-        case "CCD":
-          link = "cctsel"
-          break;
-        case "GED":
-          link = "getsel"
-          break;
-        case "GID":
-          link = "gitsel"
-          break;
-        case "MCD":
-          link = "mctsel"
-          break;
-         case "TRD":
-          link = "trtsel"
-          break;
+      
+      let trns = {
+        did:"ditsel",
+        lid:"litsel",
+        cpd:"cptsel",
+        ded:"detsel",
+        led:"letsel",
+        bpd:"bptsel",
+        ccd:"cctsel",
+        ged:"getsel",
+        gid:"gitsel",
+        mcd:"mctsel",
+        trd:"trtsel"
         }
+      let objtyp = row.OBJTYP.trim().toLowerCase()
+      let link = trns[objtyp];
       console.log("go to ..."+link);
       if(!link){
         this.$notify.error({title: '错误',message: '未知的objtyp:'+row.OBJTYP+"!"})
         return
       }
-      this.$router.push({name:link.toUpperCase().substring(0,1)+link.substring(1),query:{ownref:row.OWNREF.trim()}})
+      this.$router.push({name:link.toUpperCase().substring(0,1)+link.substring(1),query:{ownref:row.OWNREF.trim(),objtyp}})
     },
     focusInput() {
       if (this.searchResult.length > 0) {

src/mixin/commonApi.js

@@ -21,8 +21,8 @@ export default {
         executeDefault(rulePath, params) {
             return Api.post(this.declareParams.trnName + "/executeDefault/" + rulePath, this.wrapper(params))
         },
-        executeRule(rulePath, params) {
-            return Api.post(this.declareParams.trnName + "/executeRule/" + rulePath, this.wrapper(params))
+        executeRule(rulePath, params,delayCb) {
+            return Api.post(this.declareParams.trnName + "/executeRule/" + rulePath, this.wrapper(params,delayCb))
         },
         async checkAll(params) {
             const res = await Api.post(this.declareParams.trnName + "/checkAll", this.wrapper(params))

src/mixin/commonProcess.js

 import commonDeclare from "./commonDeclare"
 import commonApi from "./commonApi"
+import commonGlobalSearch from "./commonGlobalSearch";
 import Utils from "~/utils"
 import _ from "~/utils/Lodash.js";
 
 export default {
-  mixins: [commonApi, commonDeclare],
+  mixins: [commonApi, commonDeclare,commonGlobalSearch],
   data: function () {
     return {
       // 弹框回填
@@ -130,15 +131,17 @@ export default {
     /**
      * 以函数形式获取model（请求参数），保证取到的是最新赋值的
      * @param {any} params 参数
+     * @param {any} selfCb 允许延时组数 参数
      * @returns 
      */
-    wrapper(params) {
+    wrapper(params,delayCb) {
       params = params || {}
       const fn = async () => {
         const that = this;
         const data = await new Promise(resolve => {
           // 保证前一次请求结果赋值VO完成
           setTimeout(() => {
+            delayCb && delayCb()
             const d = Utils.flatObject(that.model)
             resolve(d)
           }, 0)

src/views/Business/Ditsel/Sel.vue

@@ -1035,7 +1035,7 @@
         <el-divider />
       </el-form-item>
     </c-col>
-    <c-col :offset="12" :span="10">
+    <!-- <c-col :offset="12" :span="10">
       <el-tabs tab-position="right" @tab-click="change">
         <el-tab-pane label="信用证">
           <sel-mune :data="items.item1" />
@@ -1062,7 +1062,7 @@
           <sel-mune :data="items.item8"
         /></el-tab-pane>
       </el-tabs>
-    </c-col>
+    </c-col> -->
     <!-- <c-col :span="12">
             <c-checkbox v-model="model.bddget.clsflg"
                 >which contracts to show</c-checkbox

src/views/Business/Ditsel/index.vue

@@ -45,500 +45,8 @@ export default {
       tabVal: "sel",
       trnName: "ditsel",
       model: new Ditsel().data,
-      // defaultRule:Default,
-      // rules:this.mergeRules(Pattern,Check),
       rules: Pattern,
       codes: {},
-      // init: {
-      //     uri: "/ditsel/init",
-      //     fileName: "ditsel.json",
-      //     method: "post",
-      //     basePath: "{{basePath}}",
-      //     scheme: "{{schemes}}",
-      //     host: "{{host}}",
-      //     consume: "0",
-      //     produce: "0",
-      // },
-      // checkAll: {
-      //     uri: "/ditsel/checkAll",
-      //     fileName: "ditsel.json",
-      //     method: "post",
-      //     basePath: "{{basePath}}",
-      //     scheme: "{{schemes}}",
-      //     host: "{{host}}",
-      //     consume: "0",
-      //     produce: "0",
-      // },
-      // saveData: {
-      //     uri: "/ditsel/saveData",
-      //     fileName: "ditsel.json",
-      //     method: "post",
-      //     basePath: "{{basePath}}",
-      //     scheme: "{{schemes}}",
-      //     host: "{{host}}",
-      //     consume: "0",
-      //     produce: "0",
-      // },
-      pending: {
-        uri: "/ditsel/pending",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      getElcsRef: {
-        uri: "/ditsel/getElcsRef",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      registerDocument: {
-        uri: "/ditsel/registerDocument",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      imgecm: {
-        uri: "/ditsel/imgecm",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      recpanSearch: {
-        uri: "/ditsel/recpanSearch",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      recpanShow: {
-        uri: "/ditsel/recpanShow",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      recpanResend: {
-        uri: "/ditsel/recpanResend",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      showMessage: {
-        uri: "/ditsel/showMessage",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      imgmodRefresh: {
-        uri: "/ditsel/imgmodRefresh",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      imgmodDelete: {
-        uri: "/ditsel/imgmodDelete",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_sptpentrbp: {
-        uri: "/ditsel/default/sptpentrbp",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub1: {
-        uri: "/ditsel/default/cfgfil.hotsub1",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_bitmap: {
-        uri: "/ditsel/default/cfgfil.bitmap",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub9: {
-        uri: "/ditsel/default/cfgfil.hotsub9",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub8: {
-        uri: "/ditsel/default/cfgfil.hotsub8",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub7: {
-        uri: "/ditsel/default/cfgfil.hotsub7",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub6: {
-        uri: "/ditsel/default/cfgfil.hotsub6",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub5: {
-        uri: "/ditsel/default/cfgfil.hotsub5",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub4: {
-        uri: "/ditsel/default/cfgfil.hotsub4",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub3: {
-        uri: "/ditsel/default/cfgfil.hotsub3",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub2: {
-        uri: "/ditsel/default/cfgfil.hotsub2",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_dspadvnbr: {
-        uri: "/ditsel/default/selbut.dspadvnbr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_didgrp_avbnam: {
-        uri: "/ditsel/default/didgrp.avbnam",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_didgrp_rec_expplc: {
-        uri: "/ditsel/default/didgrp.rec.expplc",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_matp_mattxtlab: {
-        uri: "/ditsel/default/matp.mattxtlab",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_dsptrdclsdat: {
-        uri: "/ditsel/default/dsptrdclsdat",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_dsputlnbr: {
-        uri: "/ditsel/default/selbut.dsputlnbr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_didgrp_adv_pts_nam: {
-        uri: "/ditsel/default/didgrp.adv.pts.nam",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_trnpenlab_descr: {
-        uri: "/ditsel/default/selbut.trnpenlab_descr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_trnpenlab: {
-        uri: "/ditsel/default/selbut.trnpenlab",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_sptpenlab: {
-        uri: "/ditsel/default/selbut.sptpenlab",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_dsprevnbr: {
-        uri: "/ditsel/default/selbut.dsprevnbr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_sptpentrbp_descr: {
-        uri: "/ditsel/default/sptpentrbp_descr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_zcdat: {
-        uri: "/ditsel/default/zcdat",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_trnpentrbp_descr: {
-        uri: "/ditsel/default/trnpentrbp_descr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_trpnttyp: {
-        uri: "/ditsel/default/trpnttyp",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_dspbrdclsdat: {
-        uri: "/ditsel/default/dspbrdclsdat",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_subtxt1: {
-        uri: "/ditsel/default/cfgfil.subtxt1",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_dspamenbr: {
-        uri: "/ditsel/default/selbut.dspamenbr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_bddgrp_rec_matdat: {
-        uri: "/ditsel/default/bddgrp.rec.matdat",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_dsppndram: {
-        uri: "/ditsel/default/selbut.dsppndram",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_sptpenlab_descr: {
-        uri: "/ditsel/default/selbut.sptpenlab_descr",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_selbut_dspclsdat: {
-        uri: "/ditsel/default/selbut.dspclsdat",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_trnpentrbp: {
-        uri: "/ditsel/default/trnpentrbp",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub10: {
-        uri: "/ditsel/default/cfgfil.hotsub10",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
-      default_cfgfil_hotsub11: {
-        uri: "/ditsel/default/cfgfil.hotsub11",
-        fileName: "ditsel.json",
-        method: "post",
-        basePath: "{{basePath}}",
-        scheme: "{{schemes}}",
-        host: "{{host}}",
-        consume: "0",
-        produce: "0",
-      },
     };
   },
   methods: {},