Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/components/GridEtyPromptDialog.vue

@@ -128,12 +128,12 @@ export default {
             .join("\n");
         }
         it["IDX"] = i;
-       //隐藏列，便于取值
-       if(typeof this.promptData.shadow==='object'){
-           for(let k in this.promptData.shadow){
-               it[k]=items[this.promptData.shadow[k]]
-           }
-       }
+        //隐藏列，便于取值
+        if (typeof this.promptData.shadow === "object") {
+          for (let k in this.promptData.shadow) {
+            it[k] = items[this.promptData.shadow[k]];
+          }
+        }
         arr.push(it);
       }
       return arr;
@@ -147,12 +147,12 @@ export default {
         const v = row[this.tableColumn[0].prop].split("\n")[0];
         this.$emit("select-ety", v, this.promptData.rulePath);
       } else {
-        const { modelUrl,isCover, rulePath } = this.promptData;
+        const { modelUrl, isCover, rulePath } = this.promptData;
         let v = {};
         for (let k in modelUrl) {
-          row[k] &&(v[k] = row[k]);
+          row[k] && (v[k] = row[k]);
         }
-        this.$emit("select-ety", v, modelUrl,isCover, rulePath);
+        this.$emit("select-ety", v, modelUrl, isCover, rulePath);
       }
       this.show = false;
       this.currentPage = 1;

src/mixin/commonProcess.js

@@ -170,13 +170,13 @@ export default {
      * @param {String} modelUrl 非机构双击后需要回填的字段路劲,k:对应列，value:应用model路劲,如{TXT:'ledgrp.blk.lcrgod'}
      * @param {String} isCover 非机构双击后需要回填的字段值是覆盖还是叠加，部分覆盖值为对象，false为叠加，如{TXT:false}，k值为modelUrl的k，如全部覆盖则isCover='T',如全部叠加则isCover='',默认全部覆盖
      */
-    showGridPromptDialog(rulePath, columns, shadow, modelUrl, isCover = "T") {
+    showGridPromptDialog(rulePath, columns, shadow, modelUrl, isCover = "T",Dialog='etyDialog') {
       this.executeRule(rulePath).then((res) => {
         if (res.respCode = SUCCESS) {
           if (res.data.params) {
             Utils.copyValueFromVO(this.model, res.data);
           } else {
-            this.root.$refs.etyDialog.show = true
+            this.root.$refs[Dialog].show = true
             this.root.promptData = {
               title: res.data.title,
               columnStr: columns ? columns : res.data.columns,

src/views/Business/Letopn/index.vue

@@ -128,6 +128,12 @@
       </el-form>
       <c-grid-ety-prompt-dialog
         ref="etyDialog"
+        :promptData="promptData"
+        @select-ety="selectEty"
+      >
+      </c-grid-ety-prompt-dialog>
+      <c-grid-ety-prompt-dialog
+        ref="doxpDialog"
         :isPty="false"
         :promptData="promptData"
         @select-ety="selectMsg"

src/views/Public/BlkTextarea.vue

@@ -19,7 +19,7 @@
         type="primary"
         icon="el-icon-search"
         @click="
-          showGridPromptDialog(rulePath, columns, shadow, modelUrl, isCover)
+          showGridPromptDialog(rulePath, columns, shadow, modelUrl, isCover,'doxpDialog')
         "
       >
         ...