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/brtset/event/buildCommons.js

@@ -73,6 +73,7 @@ export default {
       cbsMap: {
         MAX: model.brdgrp.cbs.max,
         OPN1: model.brdgrp.cbs.opn1,
+        OPN2: model.brdgrp.cbs.opn2,
         MAC: model.brdgrp.cbs.mac,
         MAC2: model.brdgrp.cbs.mac2,
         OPC2: model.brdgrp.cbs.opc2,

src/business/litcan/event/buildCommons.js

@@ -31,6 +31,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'LID',
+        objinr: model.lidgrp.rec.inr,
         ownref: model.lidgrp.rec.ownref,
         opndat: model.lidgrp.rec.opndat,
         expdat: model.lidgrp.rec.expdat,
@@ -47,10 +48,12 @@ export default {
         purpos: model.lidgrp.rec.purpos,
         revflg: model.lidgrp.rec.revflg,
         cnfsta: model.lidgrp.rec.cnfsta,
+        rmbclg: model.lidgrp.rec.rmbclg,
       },
       cbsMap: {
         MAX: model.lidgrp.cbs.max,
         OPN1: model.lidgrp.cbs.opn1,
+        NOM1: model.lidgrp.cbs.nom1,
         MAC: model.lidgrp.cbs.mac,
         MAC2: model.lidgrp.cbs.mac2,
         OPC2: model.lidgrp.cbs.opc2,

src/business/litrog/event/index.js

@@ -140,7 +140,7 @@ export default {
       let params = {
         userId: window.sessionStorage.userId || 'ZL',
         ptytyp: ptytyp,
-        extkey: this.model.gidgrp[type.toLowerCase()].pts.extkey,
+        extkey: this.model.brdgrp[type.toLowerCase()].pts.extkey,
       };
       let res = await Api.post('/service/ptspta/list', params);
       if (res.respCode == SUCCESS) {
@@ -156,7 +156,7 @@ export default {
       };
       let res = await Api.post('/service/ptspta/fetch', params);
       if (res.respCode == SUCCESS) {
-        this.$set(this.model.gidgrp, row.role.toLowerCase(), res.data);
+        this.$set(this.model.brdgrp, row.role.toLowerCase(), res.data);
       }
     },
     // 业务信息=》基本信息=》支出目的

src/business/litrog/views/Rog.vue

@@ -371,44 +371,63 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
-        <el-form-item label="地址编码" prop="brdgrp.prb.pts.extkey">
-          <c-fullbox>
-            <c-input
-              v-model="model.brdgrp.prb.pts.extkey"
-              maxlength="16"
-              placeholder="请输入地址编码"
-            ></c-input>
-
-            <template slot="footer">
-              <c-button
-                style="margin: 0 5px 0 10px; padding: 0 12px"
-                size="small"
-                type="primary"
-                icon="el-icon-info"
-              >
-              </c-button>
-              <c-button style="margin: 0 0" size="small" type="primary">
-                详情
-              </c-button>
-            </template>
-          </c-fullbox>
-        </el-form-item>
-      </c-col>
+<!--      <c-col :span="24">-->
+<!--        <el-form-item label="地址编码" prop="brdgrp.prb.pts.extkey">-->
+<!--          <c-fullbox>-->
+<!--            <c-input-->
+<!--              v-model="model.brdgrp.prb.pts.extkey"-->
+<!--              maxlength="16"-->
+<!--              placeholder="请输入地址编码"-->
+<!--            ></c-input>-->
+
+<!--            <template slot="footer">-->
+<!--              <c-button-->
+<!--                style="margin: 0 5px 0 10px; padding: 0 12px"-->
+<!--                size="small"-->
+<!--                type="primary"-->
+<!--                icon="el-icon-info"-->
+<!--              >-->
+<!--              </c-button>-->
+<!--              <c-button style="margin: 0 0" size="small" type="primary">-->
+<!--                详情-->
+<!--              </c-button>-->
+<!--            </template>-->
+<!--          </c-fullbox>-->
+<!--        </el-form-item>-->
+<!--      </c-col>-->
+
+<!--      <c-col :span="24">-->
+<!--        <el-form-item label="地址信息" prop="brdgrp.prb.pts.adrblk">-->
+<!--          <c-input-->
+<!--            :rows="5"-->
+<!--            type="textarea"-->
+<!--            v-model="model.brdgrp.prb.pts.adrblk"-->
+<!--            maxlength="200"-->
+<!--            show-word-limit-->
+<!--            placeholder="请输入地址信息"-->
+<!--          ></c-input>-->
+<!--        </el-form-item>-->
+<!--      </c-col>-->
 
       <c-col :span="24">
-        <el-form-item label="地址信息" prop="brdgrp.prb.pts.adrblk">
-          <c-input
-            :rows="5"
-            type="textarea"
-            v-model="model.brdgrp.prb.pts.adrblk"
-            maxlength="200"
-            show-word-limit
-            placeholder="请输入地址信息"
-          ></c-input>
-        </el-form-item>
+        <c-ptap
+            :model="model"
+            :argadr="{
+            title: '地址编码',
+            grp: 'brdgrp',
+            rol: 'prb',
+          }"
+            @keyup.enter.native="
+                queryGridEtyPromptDialogData('PRB', 'C')
+              "
+            :noRef="true"
+            :disabled="true"
+            :isAdrblk="true"
+        >
+        </c-ptap>
       </c-col>
 
+
       <c-col :span="24">
         <el-form-item label="发票类型" prop="brdgrp.rec.invtyp">
           <c-select
@@ -425,8 +444,10 @@
 </template>
 <script>
 import event from '../event';
+import Ptap from "~/views/Public/Ptap";
 
 export default {
+  components: {"c-ptap": Ptap },
   inject: ['root'],
   props: ['model', 'codes'],
   mixins: [event],