Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Business/Cptopn/Opnp1.vue

@@ -76,12 +76,13 @@
         </el-col>
 
         <el-col :span="24">
-          <el-col :span="10">
+          <el-col :span="14">
             <el-form-item label="汇款金额" prop="cpdgrp.cbs.nom1.cur">
               <c-select
                 v-model="model.cpdgrp.cbs.nom1.cur"
                 style="width: 100%"
                 placeholder=""
+               
               >
                 <el-option
                   v-for="item in codes.cur"
@@ -92,7 +93,7 @@
               </c-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="" label-width="15px" prop="cpdgrp.cbs.nom1.amt">
               <c-input
                 v-model="model.cpdgrp.cbs.nom1.amt"
@@ -128,7 +129,7 @@
         </el-col>
 
         <el-col :span="24">
-          <el-col :span="10">
+          <el-col :span="12">
             <el-form-item label="是否需要核验" prop="cpdgrp.rec.ischktyp"> 
               <c-select
                 v-model="model.cpdgrp.rec.ischktyp"
@@ -145,7 +146,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="10" :offset="2">
+          <el-col :span="11" :offset="1">
             <el-form-item label="预计核验日期" label-width="120px" prop="cpdgrp.rec.paydat">
               <c-date-picker
                 type="date"
@@ -173,7 +174,7 @@
 
         <el-col :span="24">
           <el-form-item label="货物类型">
-            <c-select v-model="model3" style="width: 100%" placeholder="请选择货物类型">
+            <c-select v-model="model.cpdgrp.rec.stagod" style="width: 100%" placeholder="请选择货物类型">
               <el-option
                   v-for="item in codes.godcod"
                   :key="item.value"
@@ -278,7 +279,7 @@
           </el-col>
 
           <el-col :span="10">
-            <el-form-item label="报文类型" label-width="120px">
+            <el-form-item label="报文类型" label-width="120px" prop="cpdgrp.rec.swftyp">
               <c-select style="width: 100%" placeholder="" v-model="model.cpdgrp.rec.swftyp">
                 <el-option v-for="item in codes.swftyp" :label="item.label" :value="item.value" :key="item.value"></el-option>
               </c-select>
@@ -306,6 +307,23 @@
         <el-col :span="4" :offset="20">
           <c-checkbox v-model="model.cpdgrp.rec.tsnflg">同名划转</c-checkbox>
         </el-col>
+        <el-col :span="18">
+      <el-form-item label="清算模式" v-if="model.cpdgrp.cbs.nom1.cur == 'CNY'">
+        <c-select
+        
+          v-model="model.cptp.liqtyp"
+          style="width: 100%"
+          placeholder="请选择清算模式"
+        >
+         <el-option
+                  v-for="item in liqtypOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+        </c-select>
+      </el-form-item>
+    </el-col>
       </el-col>
     </el-col>
 
@@ -1384,6 +1402,11 @@ export default {
         {value:'7',label:'其他企业'},
         {value:'8',label:'私人'},
       ],
+      liqtypOptions:[
+        {value:'B',label:'人行支付系统'},
+        {value:'C',label:'代理行模式'},
+        {value:'O',label:'Other'},
+      ],
       gridPromptDialog: {
         title: '',
         columnStr: '',

src/views/Business/Cptopn/Outp.vue

@@ -40,7 +40,7 @@
       <el-form-item label="付款人属性">
         <c-select style="width: 50%" placeholder="请选择付款人属性">
           <el-option
-            v-for="item in options"
+            v-for="item in codes.cpayeeattr"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -74,7 +74,7 @@
         <el-form-item label="结算方式">
           <c-select style="width: 50%" placeholder="请选择结算方式">
             <el-option
-              v-for="item in options"
+              v-for="item in codes.sbalancemode"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -86,7 +86,7 @@
         <el-form-item label="清算（结算）账户类型">
           <c-select style="width: 70%" placeholder="请选择">
             <el-option
-              v-for="item in options"
+              v-for="item in codes.cpayeraccttyp"
               :key="item.value"
               :label="item.label"
               :value="item.value"

src/views/Business/Cptopn/Setpan.vue

 <template>
-  <div class="eibs-tab">
+  <el-row class="eibs-tab">
     <!-- ===================顶部===================== -->
     <el-col :span="6">
             <el-form-item label="Reference" label-width="100px" prop="setmod.ref">
@@ -11,12 +11,12 @@
                 ></c-input>
             </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="6">
             <el-form-item label="Amount Settled" label-width="150px">
                 <c-input
-                    v-model="temp1"
+                    v-model="model.setmod.doccur"
                     style="width: 100%"
-                    placeholder=""
+                    placeholder="CNY"
                     :readonly="true"
                     
                 ></c-input>
@@ -26,7 +26,7 @@
         <el-col :span="4">
             <el-form-item label="" label-width="20px">
                 <c-input
-                    v-model="temp2"
+                    v-model="model.setmod.docamt"
                     :readonly="true"
                     placeholder=""
                 ></c-input>
@@ -34,14 +34,21 @@
         </el-col>
 
         <el-col :span="6">
-            <el-form-item label="Type" label-width="100px">
-                <c-input
-                    v-model="temp3"
-                    readonly
+            <el-form-item label="类型" label-width="100px">
+                <c-select
+                    v-model="model.setmod.dspflg"
+                    disabled
                     style="width: 100%"
-                    placeholder=""
+                    placeholder="请选择Type of settlement"
                 >
-                </c-input >
+                    <el-option
+                        v-for="item in codes.dspflg"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </c-select>
             </el-form-item>
         </el-col>
 
@@ -109,7 +116,7 @@
     <el-col :span="22" style="margin-bottom: 18px" :offset="1">
       <c-table
         style="text-align: center"
-        :list="data"
+        :list="model.setmod.setfog.setfol"
         :paginationShow="false"
         :border="true"
       >
@@ -265,6 +272,7 @@
                 </el-table-column>
             </c-table>
         </el-col>
+        <setpan-dialog v-if="dialogVisible2" :visible="dialogVisible2" :model="model" :idx="index" :codes="codes"/>
         <!--=================== Settlement:================== -->
         <el-col :span="24" style="text-align: left">
             <el-form-item label="Settlement:" label-width="100px">
@@ -273,7 +281,7 @@
         <el-col :span="22" style="margin-bottom: 18px" :offset="1">
             <c-table
                 style="text-align: center"
-                :list="data"
+                :list="model.setmod.setglg.setgll"
                 :paginationShow="false"
                 :border="true"
             >
@@ -341,31 +349,50 @@
                 <el-table-column label="" width="auto"> </el-table-column>
             </c-table>
         </el-col>
-  </div>
+  </el-row>
 </template>
 <script>
 import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Cptopn/Event";
+import SetpanDialog from "./SetpanDialog.vue";
+import Utils from "~/utils/index"
 
 export default {
     inject: ['root'],
   props: ["model", "codes"],
+  components: { SetpanDialog },
   data() {
     return {
-        temp1:'USD',
-        temp2:'0.00',
-        temp3:'final',
+         
+            dialogVisible2: false,
+           
+            dialog2: {
+                feetxtinf:"",
+                feetxt:"",
+            },
+            index: 0,
         data:[]
     };
-    },
-    methods: { 
-        dispDefault() {
-
+  },
+  methods: { 
+      ...Event,
+       dispDefault(){
+            Api.post("cptopn/executeDefault/mac",Utils.getRequestDataFn.call(this)).then(res=>{
+                 Utils.copyValueFromVO(this.model, res.data)
+            })
+            
+        },
+         
+        detail2(index, row) {
+             Api.post("cptopn/executeRule/det",Utils.getRequestDataFn.call(this)).then(res=>{
+            this.dialogVisible2 = true;
+            this.index = index;
+            this.dialog2 = row
+             })
         },
-        ...Event 
-    },
-    created: function () {},
+  },
+  created: function () {},
 };
 </script>
 <style>

src/views/Business/Cptopn/Wg.vue

@@ -85,7 +85,8 @@ export default {
     return {
     };
   },
-  methods: { ...Event },
+  methods: { ...Event ,
+  },
   created: function () {},
 };
 </script>

src/views/Business/Cptopn/index.vue

@@ -50,10 +50,10 @@
             <m-wg :model="model" :codes="codes"/>
           </el-tab-pane>
           
-          <el-tab-pane label="境内汇款申请书-基础信息" v-if="model.bopmod.basflg">
+          <el-tab-pane label="境内汇款申请书-基础信息" v-if="model.bopmod.szflg === '2' && model.bopmod.basflg">
             <m-dbe :model="model" :codes="codes"></m-dbe>
           </el-tab-pane>
-          <el-tab-pane label="境外汇款申请书-基础信息" v-if="model.bopmod.basflg">
+          <el-tab-pane label="境外汇款申请书-基础信息" v-if="model.bopmod.szflg === '1' && model.bopmod.basflg">
             <m-dbb :model="model" :codes="codes"></m-dbb>
           </el-tab-pane>
 
@@ -61,7 +61,7 @@
             <!--PD000002 -->
             <m-cnyp :model="model" :codes="codes"/>
           </el-tab-pane>
-          <el-tab-pane label="2111跨境支出信息">
+          <el-tab-pane label="2111跨境支出信息" v-if="model.cnybop.outflg==='1'">
             <m-outp :model="model" :codes="codes"></m-outp>
         </el-tab-pane>
         </el-tabs>