Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/brtdcr/event/index.js

@@ -220,6 +220,24 @@ export default {
         default:
           return
       }
+    },
+
+
+    async getDiscrepancyInformation() {
+      this.dialogTableVisible = true
+      let res = await Api.post('/service/brtdcr/getDiscrepancyInformation');
+      this.txtModuleData = res
+      console.log(res)
+    },
+
+    insertTxtModuleToDocdis(row){
+      this.dialogTableVisible = false
+      if (this.model.brdgrp.blk.docdis != ''){
+        this.model.brdgrp.blk.docdis = this.model.brdgrp.blk.docdis  + row.txt
+      }else {
+        this.model.brdgrp.blk.docdis = row.txt + '\n'
+      }
     }
+
   },
 };

src/business/brtdcr/views/Brtdcrd.vue

 <template>
-    <div class="eibs">
-        <c-col>
-        <c-col :span="12">
-            <el-form-item label="不符点信息" prop="brdgrp.blk.docdis">
-                <c-fullbox>
-                    <c-input
-                        :disabled="model.advrefflg=='' && model.advdisflg==''"
-                        type="textarea"
-                        v-model="model.brdgrp.blk.docdis"
-                        maxlength="3500"
-                        :rows="8"
-                        show-word-limit
-                        placeholder="请输入不符点信息"
-                    ></c-input>
-                    <template slot="footer">
-                        <c-button  :disabled="model.advrefflg=='' && model.advdisflg==''" size="small" type="primary" 
-                        >
-                            ...
-                        </c-button>
-                    </template>
-                </c-fullbox>
-            </el-form-item>
-        </c-col>
+  <div class="eibs">
+    <c-col>
+      <c-col :span="12">
+        <el-form-item label="不符点信息" prop="brdgrp.blk.docdis">
+          <c-fullbox>
+            <c-input
+                :disabled="model.advrefflg=='' && model.advdisflg==''"
+                type="textarea"
+                v-model="model.brdgrp.blk.docdis"
+                maxlength="3500"
+                :rows="8"
+                show-word-limit
+                placeholder="请输入不符点信息"
+            ></c-input>
+            <template slot="footer">
+              <c-button :disabled="model.advrefflg=='' && model.advdisflg==''" size="small" type="primary"
+                        @click="getDiscrepancyInformation"
+              >
+                ...
+              </c-button>
+            </template>
+          </c-fullbox>
+        </el-form-item>
+      </c-col>
 
-        <c-col :span="12">
-            <el-form-item>
-                <c-checkbox class="checkbox-left" disabled v-model="model.brdgrp.blk.docdisflg"
-                    >不符点修改</c-checkbox
-                >
-            </el-form-item>
-        </c-col>
-        </c-col>
+      <c-col :span="12">
+        <el-form-item>
+          <c-checkbox class="checkbox-left" disabled v-model="model.brdgrp.blk.docdisflg"
+          >不符点修改
+          </c-checkbox
+          >
+        </el-form-item>
+      </c-col>
+    </c-col>
 
-        <c-col :span="12">
-        <c-docpre
-        :model="model"
-        :argadr="{
+    <c-col :span="12">
+      <c-docpre
+          :model="model"
+          :argadr="{
           path: 'brdgrp.blk.docpre',
           grp: 'brtp',
           code: 'docpre',
         }"
       ></c-docpre>
-      </c-col>
-    </div>
+    </c-col>
+
+    <el-dialog title="Select a text module" :visible.sync="dialogTableVisible">
+      <el-table :data="txtModuleData" height="400px" @row-dblclick="insertTxtModuleToDocdis">
+        <el-table-column property="nam" label="NAME" width="150"></el-table-column>
+        <el-table-column property="extkey" label="MODULE" width="200"></el-table-column>
+        <el-table-column property="language" label="LANGUAGE">ENGLISH</el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+
+
 </template>
 <script>
 import event from "../event";
 import Docpre from "~/views/Public/Docpre";
 
 export default {
-    components: {
+  components: {
     "c-docpre": Docpre,
   },
-    inject: ["root"],
-    props: ["model", "codes"],
-    mixins: [event],
-    data() {
-        return {
-        };
-    },
-    methods: {},
-    created: function () {},
+  inject: ["root"],
+  props: ["model", "codes"],
+  mixins: [event],
+  data() {
+    return {
+      txtModuleData: [],
+      dialogTableVisible: false,
+    };
+  },
+  methods: {},
+  created: function () {
+  },
 };
 </script>
 <style>

src/views/Business/Brtdcr/Brtdcrd.vue

@@ -14,7 +14,7 @@
                         placeholder="请输入不符点信息"
                     ></c-input>
                     <template slot="footer">
-                        <c-button  :disabled="model.advrefflg=='' && model.advdisflg==''" size="small" type="primary" 
+                        <c-button  :disabled="model.advrefflg=='' && model.advdisflg==''" size="small" type="primary"
                 @click="showGridPromptDialog('brtp.docdis.buttxmsel', null, null,{TXT: 'brdgrp.blk.docdis'}, {TXT: false},'doxpDialog')"
                         >
                             ...