Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/views/Business/Bdtset/index.vue

@@ -46,7 +46,9 @@
  
             <!--PD000000 -->
            <el-tab-pane label="费用及账务" name="setpan">
+               <c-content>
                     <m-setpan :model="model" :codes="codes"/>
+               </c-content>
            </el-tab-pane>
  
             <!--PD000001 -->

src/views/Business/Infbfd/Infsea.vue

@@ -447,8 +447,7 @@
        </c-col>
     </c-row> 
     -->
-    <m-busbtn ref="childs" :ownref="ownref" @onChoose="onChoose"
-        >11</m-busbtn
+    <m-busbtn ref="childs" :ownref="ownref" trnCode="detsel" ownrefPath="dedgrp" :model="detselModel" @onChoose="onChoose"></m-busbtn
     >
 
     </div>
@@ -460,6 +459,7 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infbfd/Event";
 //交易跳转逻辑
+import DetselModel from "~/model/Detsel"
 import BusNavbar from "~/views/Public/BusNavbar";
 
 export default {
@@ -469,6 +469,7 @@ export default {
     components: { "m-busbtn": BusNavbar },
     data() {
         return {
+            detselModel:new DetselModel().data,
             ownref: "",
             initdialog: false,
             dialogTableVisible: false,

src/views/Business/Infbfd/index.vue

@@ -7,12 +7,16 @@
   
             <!--PD000006 -->
            <el-tab-pane label="查询" name="infsea">
+               <c-content>
                     <m-infsea :model="model" :codes="codes"/>
+               </c-content>
            </el-tab-pane>
  
 
            <el-tab-pane label="内容" name="ovwp">
+               <c-content>
                     <m-ovwp :model="model" :codes="codes"/>
+               </c-content>
            </el-tab-pane>
  
           <!--

src/views/Public/Docpan.vue

@@ -153,6 +153,48 @@
             </el-table-column>
             </c-istream-table-docpan>
         </c-col>
+        <c-col :span="12" style="margin-top:20px">
+            <c-col :span="24">
+                <el-form-item
+                    label="国内证落款"
+                    prop="trnmod.trndoc.advnam"
+                >
+                    <c-input
+                        v-model="model.trnmod.trndoc.advnam"
+                        maxlength="50"
+                        placeholder="请输入"
+                    ></c-input>
+                </el-form-item>
+            </c-col>
+            <c-col :span="24">
+                <el-form-item
+                    label="修改申请人名称"
+                    prop="trnmod.trndoc.amdapl"
+                    v-if=" root.trnName== 'detame' || root.trnName == 'bftsnd'"
+                >
+                    <c-input
+                        v-model="model.trnmod.trndoc.amdapl"
+                        maxlength="100"
+                        placeholder="请输入"
+                    ></c-input>
+                </el-form-item>
+            </c-col>
+            <c-col :span="24">
+                <el-form-item
+                    label="国内证通知书"
+                    prop="trnmod.trndoc.advdoc"
+                    v-if=" root.trnName== 'detopn' || root.trnName == 'detame'"
+                >
+                    <c-select
+                        v-model="model.trnmod.trndoc.advdoc"
+                        placeholder="请选择"
+                        style="width: 100%"
+                        :code="codes.trndoc_advdoc"
+                    >
+                    </c-select>
+                </el-form-item>
+            </c-col>
+        </c-col>
         <template>
             <el-dialog
                 :title="title"

src/views/Public/Setpan.vue

@@ -903,6 +903,10 @@
                         </c-col>
                     </c-row>
                 </el-form>
+                <span slot="footer" class="dialog-footer">
+                    <c-button type="primary" @click="saveDialog3">确 定</c-button>
+                    <c-button @click="detpDialogVisible = false">取 消</c-button>
+                </span>
             </el-dialog>
         </template>
 
@@ -970,7 +974,7 @@ export default {
         },
         saveDialog() {
             this.dialogVisible = false;
-            this.model.setmod.setfog.setfol[this.index] = this.dialog;
+            this.model.setmod.setfog.setfol.splice(this.index, 1, this.dialog);
         },
         // 第二个表格
         addRowSetfel() {
@@ -1008,6 +1012,10 @@ export default {
         },
 
         // 第三个表格
+        saveDialog3() {
+            this.detpDialogVisible = false;
+            this.model.setmod.setglg.setgll.splice(this.index, 1, this.dialog3)
+        },
         async handleDetail(index, row) {
             const that = this;
             const rule = "setmod.setglg.setgll(" + (index + 1) + ").det";

src/views/Public/SetpanDialog.vue

@@ -95,7 +95,7 @@
           <c-col :span="8">
             <el-form-item label="优惠百分比">
               <c-input v-model="formData.dctrat">
-                <template #append>%</template>
+                <template #suffix>%</template>
               </c-input>
             </el-form-item>
           </c-col>
@@ -339,7 +339,7 @@ export default {
   },
   methods: {
     saveDialog() {
-      this.model.setmod.setfeg.setfel[this.idx] = this.formData;
+      this.model.setmod.setfeg.setfel.splice(this.idx, 1, this.formData);
       this.visiable = false;
     },
     beforeClose(done) {