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

src/components/GridEtyPromptDialog.vue

@@ -154,13 +154,14 @@ export default {
 			this.currentPage = currentPage;
 		},
         selectEty(row, column, event) {
-            const str = this.data[row.IDX]
-            let v = "";
-            if (this.type === 'extkey') {
-                v = str.split("\t")[4].trim()
-            } else if (this.type === 'bankno') {
-                v = str.split("\t")[0].trim()
-            }
+            // const str = this.data[row.IDX]
+            // let v = "";
+            // if (this.type === 'extkey') {
+            //     v = str.split("\t")[4].trim()
+            // } else if (this.type === 'bankno') {
+            //     v = str.split("\t")[0].trim()
+            // }
+            const v = row[this.tableColumn[0].prop].split("\n")[0]
             this.$emit("select-ety", v, this.rulePath)
             this.show = false;
             this.currentPage = 1;

src/config/CodeTable/index.js

@@ -4145,10 +4145,10 @@ const CodeTable = {
 		{label:"终结付款",value:"FNAL" },
 	],
 	paytype:[
-		{label:"票汇",value:"2" },
-		{label:"其他",value:"3" },
 		{label:"电汇",value:"0" },
 		{label:"信汇",value:"1" },
+		{label:"票汇",value:"2" },
+		{label:"其他",value:"3" },
 	],
 	payuil:[
 		{label:"English",value:"EN" },
@@ -5164,9 +5164,9 @@ const CodeTable = {
 		{value:"3",label:"不申报" },
 	],
 	sztyp:[
-		{label:"1",value:"跨境收支" },
-		{label:"2",value:"境内交易" },
-		{label:"3",value:"不申报" },
+		{label:"跨境收支",value:"1" },
+		{label:"境内交易",value:"2" },
+		{label:"账户结售汇",value:"3" },
 	],
 	tag:[
 		{label:"File Name",value:"N" },

src/mixin/commonProcess.js

 import _ from "lodash"
 import commonDeclare from "./commonDeclare"
 import commonApi from "./commonApi"
+import Utils from "~/utils"
+
 export default {
   mixins: [commonApi,commonDeclare],
   data: function () {
@@ -86,6 +88,13 @@ export default {
         }
       }
       return "blur";
+    },
+    /**
+     * 更新Model
+     * @param {any} data model数据
+     */
+    updateModel(data) {
+      Utils.copyValueFromVO(this.model, data);
     }
   },
   computed:{

src/model/Cptopn/Pattern.js

@@ -186,7 +186,7 @@ export default {
     ],
 
     "cpdgrp.rec.amtf33b":[
-        {type: "number", required: false, message: "必输项"},
+        {required: false, message: "必输项"},
         {max: 16,message:"整数位不能超过12位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -223,7 +223,7 @@ export default {
     ],
 
     "cpdgrp.rec.amt71f":[
-        {type: "number", required: false, message: "必输项"},
+        {required: false, message: "必输项"},
         {max: 16,message:"整数位不能超过12位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/utils/index.js

@@ -223,13 +223,14 @@ export default class Utils {
         return async function(rule, value, callback){
             //调用具体的check
             const res = await this.exeuteCheck(key)
-            if (res.respCode == SUCCESS){
+            // if (res.respCode == SUCCESS){
+                
+            // }
             if (Object.hasOwnProperty.call(res.fieldErrors, key)) {
-                    callback(res.fieldErrors[key])
+                callback(new Error(res.fieldErrors[key]))
             } else {
                 callback();
             }
         }
     }
-    }
 }
\ No newline at end of file

src/views/Business/Cptopn/Opnp1.vue

@@ -216,7 +216,7 @@
                 placeholder="请选择汇款性质"
               >
               <el-option
-                  v-for="item in codes.trntyp"
+                  v-for="item in trntyp"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -348,6 +348,7 @@
                 v-model="model.cptp.payeecountcode"
                 maxlength="3"
                 placeholder="请输入收款人常驻国家/地区代码"
+                @keyup.enter.native="payeecountcodeEvent"
               ></c-input>
             </el-form-item>
           </el-col>
@@ -626,6 +627,7 @@
           v-model="model.cptp.pyebchkey"
           maxlength="14"
           placeholder="请输入收款人"
+          @keyup.enter.native="pyebchkeyEvent"
         ></c-input>
       </el-form-item>
     </el-col>
@@ -1633,28 +1635,133 @@
         ></c-input>
       </el-form-item>
     </el-col> -->
+
+    <c-grid-ety-prompt-dialog ref="etyDialog"
+      :title="gridPromptDialog.title" 
+      :columnStr="gridPromptDialog.columnStr" 
+      :data="gridPromptDialog.data"
+      :type="gridPromptDialog.type"
+      :rulePath="gridPromptDialog.rulePath"
+      v-on:select-ety="selectEty"
+      >
+    </c-grid-ety-prompt-dialog>
   </div>
 </template>
 <script>
 import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
+import CommonProcess from "~/mixin/CommonProcess";
 import Event from "~/model/Cptopn/Event";
-import Utils from "~/utils";
+import Utils from "~/utils"
 
 export default {
   inject: ["root"],
   props: ["model", "codes"],
+  mixins: [CommonProcess],
   data() {
     return {
-      liqtypOptions: [
-        { value: "B", label: "人行支付系统" },
-        { value: "C", label: "代理行模式" },
-        { value: "O", label: "Other" },
-        { value: "S", label: "CIPS系统" },
+      model3:'',
+      options1:[
+        {value:'AUD',label:'AUD 澳大利亚元'},
+        {value:'CAD',label:'CAD 加拿大元'},
+        {value:'CHF',label:'CHF 瑞士法郎'},                 
+        {value:'CNY',label:'CNY 人民币'},                              
+        {value:'DKK',label:'DKK 丹麦克郎'},                              
+        {value:'EUR',label:'EUR 欧元'},                              
+        {value:'FIM',label:'FIM 芬兰马克'},                              
+        {value:'FRF',label:'FRF 法国法郎'},                              
+        {value:'GBP',label:'GBP 英镑'},                              
+        {value:'HKD',label:'HKD 港币'},                              
+        {value:'JPY',label:'JPY 日元'},                              
+        {value:'KRW',label:'KRW 韩元'},                              
+        {value:'MOP',label:'MOP 澳门元'},                              
+        {value:'NOK',label:'NOK 挪威克郎'},
+        {value:'NZD',label:'NZD 新西兰元'},
+        {value:'SEK',label:'SEK 瑞典克郎'},
+        {value:'SGD',label:'SGD 新加坡元'},
+        {value:'THB',label:'THB 泰国铢'},
+        {value:'TWD',label:'TWD 新台湾元'},
+        {value:'USD',label:'USD 美元'},
+        ],
+      trntyp:[
+        {value:'0',label:'贸易'},
+        {value:'1',label:'非贸易'},
+        {value:'2',label:'资本'},
+        {value:'3',label:'其他'},
+      ],
+      options10:[
+        {value:'1',label:'工业企业'},
+        {value:'2',label:'私营企业'},
+        {value:'3',label:'三资企业'},
+        {value:'4',label:'外贸企业'},
+        {value:'5',label:'保险企业'},
+        {value:'6',label:'商业企业'},
+        {value:'7',label:'其他企业'},
+        {value:'8',label:'私人'},
+      ],
+      liqtypOptions:[
+        {value:'B',label:'人行支付系统'},
+        {value:'C',label:'代理行模式'},
+        {value:'O',label:'Other'},
       ],
+      gridPromptDialog: {
+        title: '',
+        columnStr: '',
+        data: [],
+        type: '',
+        rulePath: ''
+      }
     };
   },
-  methods: { ...Event, onCptpGetmod() {} },
+  methods: { 
+    payeecountcodeEvent() {
+      this.executeRule("cptp.payeecountcode").then((res) => {
+          if (res.respCode = "AAAAAA"){
+              if (res.data.params) {
+                  this.updateModel(res.data);  
+              } else {
+                  this.$refs.etyDialog.show = true
+                  this.gridPromptDialog.title = res.data.title
+                  this.gridPromptDialog.columnStr = res.data.columns
+                  this.gridPromptDialog.data = res.data.vals.rows
+                  this.gridPromptDialog.type = 'extkey'
+                  this.gridPromptDialog.rulePath = 'cptp.payeecountcode'
+              }
+          }
+        }
+      )
+    },
+    pyebchkeyEvent() {
+      this.executeRule("cptp.pyebchkey").then((res) => {
+        if (res.respCode = "AAAAAA"){
+            if (res.data.params) {
+                this.updateModel(res.data);  
+            } else {
+                this.$refs.etyDialog.show = true
+                this.gridPromptDialog.title = res.data.title
+                this.gridPromptDialog.columnStr = res.data.columns
+                this.gridPromptDialog.data = res.data.vals.rows
+                this.gridPromptDialog.type = 'extkey'
+                this.gridPromptDialog.rulePath = 'cptp.pyebchkey'
+            }
+          }
+        }
+      )
+    },
+    selectEty(val, rulePath) {
+        const props = rulePath.replaceAll(".", "_")
+        const obj = {}
+        obj[props] = val;
+        Utils.copyValueFromVO(this.model, obj);
+        this.executeRule(rulePath).then((res) => {
+            if (res.respCode = "AAAAAA"){
+                Utils.copyValueFromVO(this.model, res.data);
+            }
+        });
+    },
+    onCptpGetmod() {},
+    ...Event 
+  },
   created: function () {},
 };
 </script>

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"
+                >
+                    <el-option
+                        v-for="item in codes.dspflg"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
                     >
-                </c-input >
+                    </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,25 +349,49 @@
                 <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: { ...Event },
+  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
+             })
+        },
+  },
   created: function () {},
 };
 </script>