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

src/components/CodeLabel.vue

@@ -9,7 +9,8 @@
 </template>
 
 <script>
-import Api from "~/service/Api"
+import { getCodetable } from "~/service/business/codeTable"
+
 export default {
   props: {
     value: {
@@ -115,7 +116,7 @@ export default {
       if(args.lang == "ZH"){
         args.lang = "CN";
       }
-      Api.post("getCodetable",args).then(rtnmsg=>{
+      getCodetable(args).then(rtnmsg=>{
         if(rtnmsg.respCode==SUCCESS){
           this.dbCodeList=rtnmsg.data
         }

src/components/Select.vue

@@ -31,7 +31,8 @@
 </template>
 
 <script>
-import Api from "~/service/Api"
+import { getCodetable } from "~/service/business/codeTable"
+
 export default {
   props: {
     value: {
@@ -132,7 +133,7 @@ export default {
       if(args.lang == "ZH"){
         args.lang = "CN";
       }
-      Api.post("getCodetable",args).then(rtnmsg=>{
+      getCodetable(args).then(rtnmsg=>{
         if(rtnmsg.respCode==SUCCESS){
           this.dbCodeList=rtnmsg.data
         }

src/lang/local/en/common.js

@@ -41,5 +41,8 @@ export default {
     unfold: "Unfold",
     reset: "Reset",
     toolBar: "ToolBar"
+  },
+  other: {
+    please_enter: 'Please enter the '
   }
 };

src/lang/local/zh/common.js

@@ -41,5 +41,8 @@ export default {
     unfold: "展开",
     reset: "重置",
     toolBar: "工具条"
+  },
+  other: {
+    please_enter: '请输入'
   }
 };

src/mixin/commonApi.js

 import Vue from "vue"
 import Api from "~/service/Api"
+import { display } from "~/service/business/file"
 import Utils from "../utils"
 
 export default {
     data() {
-       
     },
-    created(){
-        if(this.root){
+    created() {
+        if (this.root) {
             //非顶级vue实例，不需要执行
             return;
         }
-        if(this.codes){
-            Vue.set(this.codes,"codeSet",{})
+        if (this.codes) {
+            Vue.set(this.codes, "codeSet", {})
         }
     },
     mounted() {
         //this.restoreDisplay()
     },
     methods: {
-        updapteValueSet(values){
-            if(!values){
+        updateValueSet(values) {
+            if (!values) {
                 return
             }
             //顶级实例，进入设置
-            if(!this.root){
-                for(let key in values){
-                    Vue.set(this.codes.codeSet,key,values[key])
+            if (!this.root) {
+                for (let key in values) {
+                    Vue.set(this.codes.codeSet, key, values[key])
                 }
             }
-            else{
-                this.root.updapteValueSet(values)
+            else {
+                this.root.updateValueSet(values)
             }
         },
         //获取后台setValues、setCodeValues传来的动态码，并自动转为码表值
-        getValues(key){
+        getValues(key) {
             let arr = this.codes.codeSet[key]
-            if(!arr)
+            if (!arr)
                 return undefined
-            return arr.map(item=>{
-               let itemArr =  item.split("\t")
-               if(itemArr.length > 1)
-                    return {label:item,value:itemArr[0]}
+            return arr.map(item => {
+                let itemArr = item.split("\t")
+                if (itemArr.length > 1)
+                    return { label: item, value: itemArr[0] }
                 else
-                    return {label:itemArr[0],value:itemArr[0]}
+                    return { label: itemArr[0], value: itemArr[0] }
             })
         },
-        showBackendErrors(fieldErrors){
+        showBackendErrors(fieldErrors) {
             // 清除之前的校验状态
-            if(!this.getRoot().$refs.modelForm){
+            if (!this.getRoot().$refs.modelForm) {
                 return
             }
             this.getRoot().$refs.modelForm.clearValidate();
             const fields = this.getRoot().$refs.modelForm.fields;
-            Utils.positioningErrorMsg(fieldErrors, fields);
             const tab = Utils.positioningErrorMsg(fieldErrors, fields);
             return tab;
         },
-        loading(text){
+        loading(text) {
             const loading = this.$loading({
                 lock: true,
                 text,
@@ -66,48 +65,47 @@ export default {
             });
             return loading
         },
-        getRoot(){
+        getRoot() {
             return (this.root || this)
         },
         async init(params) {
             const loading = this.loading("交易加载中")
-            let rtnmsg = await Api.post(this.declareParams.trnName + "/init", { params })
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            let rtnmsg = await Api.post(this.requestPrefix + "/init", { params })
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
             }
             loading.close()
             return rtnmsg
         },
-        
         async save(params) {
             const loading = this.loading("正在保存交易")
-            let rtnmsg = await Api.post(this.declareParams.trnName + "/saveData", this.wrapper(params))
+            let rtnmsg = await Api.post(this.requestPrefix + "/saveData", this.wrapper(params))
             loading.close()
             return rtnmsg
         },
-        async executeCheck(rulePath,params){
+        async executeCheck(rulePath, params) {
             const loading = this.loading("校验进行中")
-            let rtnmsg = await  Api.post(this.declareParams.trnName+"/executeCheck/"+rulePath, this.wrapper(params))
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            let rtnmsg = await Api.post(this.requestPrefix + "/executeCheck/" + rulePath, this.wrapper(params))
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
                 this.showBackendErrors(rtnmsg.fieldErrors)
             }
             loading.close()
             return rtnmsg
         },
         async executeDefault(rulePath, params) {
-            let rtnmsg = await  Api.post(this.declareParams.trnName + "/executeDefault/" + rulePath, this.wrapper(params))
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            let rtnmsg = await Api.post(this.requestPrefix + "/executeDefault/" + rulePath, this.wrapper(params))
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
                 this.showBackendErrors(rtnmsg.fieldErrors)
             }
             return rtnmsg
         },
-        async executeRule(rulePath, params,delayCb) {
+        async executeRule(rulePath, params, delayCb) {
             const loading = this.loading("正在请求数据")
-            let rtnmsg = await  Api.post(this.declareParams.trnName + "/executeRule/" + rulePath, this.wrapper(params,delayCb))
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            let rtnmsg = await Api.post(this.requestPrefix + "/executeRule/" + rulePath, this.wrapper(params, delayCb))
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
                 this.showBackendErrors(rtnmsg.fieldErrors)
             }
             loading.close()
@@ -115,18 +113,18 @@ export default {
         },
         async checkAll(params) {
             const loading = this.loading("正在校验数据")
-            const rtnmsg = await Api.post(this.declareParams.trnName + "/checkAll", this.wrapper(params))
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            const rtnmsg = await Api.post(this.requestPrefix + "/checkAll", this.wrapper(params))
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
             }
             loading.close()
             return rtnmsg
         },
         async pedding(params) {
             const loading = this.loading("正在暂存数据")
-            const rtnmsg = await  Api.post(this.declareParams.trnName + "/pending", this.wrapper(params))
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            const rtnmsg = await Api.post(this.requestPrefix + "/pending", this.wrapper(params))
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
             }
             loading.close()
             return rtnmsg
@@ -136,19 +134,18 @@ export default {
             if (!inr)
                 return
             const loading = this.loading("快照数据加载中")
-            let data = await Api.post("display/" + inr)
-            if(data.data)
-            {
+            let data = await display(inr)
+            if (data.data) {
                 Utils.copyValueFromVO(this.model, JSON.parse(data.data))
-            }else{
-                this.$notify.error({title: '错误',message: '快照文件加载失败！'});
+            } else {
+                this.$notify.error({ title: '错误', message: '快照文件加载失败！' });
             }
             loading.close()
         },
         async executeNotify(params) {
-            const rtnmsg = await  Api.post(this.declareParams.trnName + "/executeNotify", this.wrapper(params))
-            if(rtnmsg.respCode == SUCCESS){
-                this.updapteValueSet(rtnmsg.codeSet)
+            const rtnmsg = await Api.post(this.requestPrefix + "/executeNotify", this.wrapper(params))
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateValueSet(rtnmsg.codeSet)
             }
             return rtnmsg
         },

src/mixin/commonDeclare.js

-export default{
-    data(){
+export default {
+    data() {
         return {
-            version:"1.0",
-            trnName:"",
+            version: "1.0",
+            trnName: "",
         }
     },
-    computed:{
-        declareParams(){
+    computed: {
+        declareParams() {
             return {
                 version: this.version,
+                // 交易名
                 trnName: this.root ? this.root.trnName : this.trnName,
+                // 交易类型（进口、出口、买方、卖方等，为模块划分做准备）
+                trnType: this.getTrnType()
             }
+        },
+        requestPrefix() {
+            return `/${this.declareParams.trnType}/${this.declareParams.trnName}`
+        }
+    },
+    methods: {
+        getTrnType() {
+            const type = this.root ? this.root.trnType : this.trnType
+            return type ? type : 'business'
         }
     }
 }
\ No newline at end of file

src/mixin/commonReport.js

@@ -4,7 +4,7 @@ import Utils from "../utils"
 export default {
     methods: {
         globalSearch(key){
-            return Api.post("report/globalSearch?key="+encodeURI(key));
+            return Api.post("/business/report/globalSearch?key="+encodeURI(key));
         }
     }
 }
\ No newline at end of file

src/model/Bdtcan/Pattern.js

@@ -12,7 +12,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "didgrp.rec.expdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "string", required: false, message: "输入正确的日期"}
     ],
     "didgrp.cbs.opn1.cur":[
         {type: "string", required: false, message: "必输项"},
@@ -63,10 +63,10 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "bddgrp.rec.rcvdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "string", required: false, message: "输入正确的日期"}
     ],
     "bddgrp.rec.advdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "string", required: false, message: "输入正确的日期"}
     ],
     "bddgrp.ben.pts.ref":[
         {type: "string", required: false, message: "必输项"},
@@ -74,7 +74,7 @@ export default {
     ],
 
     "bddgrp.rec.matdat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "string", required: false, message: "输入正确的日期"}
     ],
     "bddgrp.ben.pts.nam":[
         {type: "string", required: false, message: "必输项"},
@@ -164,7 +164,7 @@ export default {
     ],
 
     "mtabut.coninf.conexedat":[
-        {type: "date", required: false, message: "输入正确的日期"}
+        {type: "string", required: false, message: "输入正确的日期"}
     ],
     "mtabut.coninf.usr.extkey":[
         {type: "string", required: false, message: "必输项"},

src/model/Trnrel/Event.js

 import Api from "~/service/Api"
+import { rejrow } from "~/service/business/trnrel"
 import Utils from "~/utils/index"
 export default {
     async onSeaown() {
@@ -237,7 +238,7 @@ export default {
         console.log(this.getSelectedData())
 
         this.model.trncorco.selinr['rows'] = this.getSelectedData();
-        let rtnmsg = await Api.post("trnrel/rejrow", this.wrapper())
+        let rtnmsg = await rejrow(this.wrapper())
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
             // var cacheFileName = rtnmsg.data.cacheFileName;

src/service/Api.js

@@ -2,7 +2,7 @@ import axios from 'axios'
 import { MessageBox } from 'element-ui'
 import RequestManager from './RequestManager.js';
 
-export const BASE_HOST = "/gjjs/business/"
+export const BASE_HOST = "/gjjs"
 export const BASE_URI=BASE_HOST+"";
 
 const instance = axios.create({

src/service/business/codeTable.js

+import Api from '~/service/Api'
+
+export function getCodetable(data) {
+    return Api.post('/business/getCodetable', data)
+}

src/service/business/file.js

+import Api from "~/service/Api"
+
+export function display(inr, data) {
+    return Api.post(`/business/display/${inr}`, data)
+}
+
+export function getPdf(data) {
+    return Api.post('/business/pdf', data)
+}

src/service/business/trnrel.js

+import Api from "~/service/Api"
+
+export function rejrow(data) {
+    return Api.post('/business/trnrel/rejrow', data)
+}
\ No newline at end of file

src/service/report/index.js

+import Api from "~/service/Api"
+
+export function all(data) {
+    return Api.post("/report/task/all", data)
+}
\ No newline at end of file

src/views/Business/Bddsel/index.vue

@@ -47,7 +47,7 @@ export default {
     },
     created:async function(){
         console.log("进入bddsel交易");
-        let rtnmsg = await Api.post("bddsel/init",{params:{}})
+        let rtnmsg = await this.init({})
         if(rtnmsg.retcod == SUCCESS)
         {
            //TODO 处理数据逻辑

src/views/Business/Bdtcan/Canp.vue

@@ -10,6 +10,7 @@
       <c-col :span="6">
         <el-form-item label="参考号" prop="didgrp.rec.ownref">
           <c-input
+            disabled
             v-model="model.didgrp.rec.ownref"
             maxlength="16"
             placeholder="请输入参考号"
@@ -18,11 +19,7 @@
       </c-col>
 
       <c-col :span="1">
-        <el-form-item
-          label=""
-          label-width="15px"
-        
-        >
+        <el-form-item label="" label-width="15px">
           <!-- prop="bdtp0.didget.sdamod.seainf" -->
           <!-- <c-input  v-model="model.bdtp0.didget.sdamod.seainf"  placeholder="请输入"></c-input> -->
           <c-button size="mini" type="primary" icon="el-icon-search"></c-button>
@@ -32,6 +29,7 @@
       <c-col :span="5">
         <el-form-item label="到期日" prop="didgrp.rec.expdat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.didgrp.rec.expdat"
             style="width: 100%"
@@ -43,6 +41,7 @@
       <c-col :span="6">
         <el-form-item label="信用证余额" prop="didgrp.cbs.opn1.cur">
           <c-input
+            disabled
             v-model="model.didgrp.cbs.opn1.cur"
             maxlength="3"
             placeholder="请输入Currency"
@@ -53,6 +52,7 @@
       <c-col :span="6">
         <el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="20px">
           <c-input
+            disabled
             v-model="model.didgrp.cbs.opn1.amt"
             placeholder="请输入Balance"
           ></c-input>
@@ -68,6 +68,7 @@
       <c-col :span="6">
         <el-form-item label="单据参考号" prop="bddgrp.rec.ownref">
           <c-input
+            disabled
             v-model="model.bddgrp.rec.ownref"
             maxlength="16"
             placeholder="请输入单据参考号"
@@ -76,12 +77,8 @@
       </c-col>
 
       <c-col :span="1">
-        <el-form-item
-          label=""
-          label-width="15px"
-         
-        >
-         <!-- prop="bdtp0.recget.sdamod.seainf" -->
+        <el-form-item label="" label-width="15px">
+          <!-- prop="bdtp0.recget.sdamod.seainf" -->
           <!-- <c-input  v-model="model.bdtp0.recget.sdamod.seainf"  placeholder="请输入"></c-input> -->
           <c-button size="mini" type="primary" icon="el-icon-search"></c-button>
         </el-form-item>
@@ -90,6 +87,7 @@
       <c-col :span="12" :offset="5">
         <el-form-item label="" prop="bddgrp.rec.nam">
           <c-input
+            disabled
             v-model="model.bddgrp.rec.nam"
             maxlength="40"
             placeholder="请输入Name of Bill Contract"
@@ -101,10 +99,18 @@
       <c-col :span="6">
         <el-form-item label="单据金额" prop="bddgrp.cbs.max.cur">
           <c-select
+            disabled
             v-model="model.bddgrp.cbs.max.cur"
             style="width: 100%"
             placeholder="请选择单据金额"
           >
+            <el-option
+              v-for="item in codes.cur"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
           </c-select>
         </el-form-item>
       </c-col>
@@ -112,6 +118,7 @@
       <c-col :span="6">
         <el-form-item label="" prop="bddgrp.cbs.max.amt" label-width="20px">
           <c-input
+            disabled
             v-model="model.bddgrp.cbs.max.amt"
             placeholder="请输入单据金额"
           ></c-input>
@@ -121,6 +128,7 @@
       <c-col :span="12">
         <el-form-item label="申请人" prop="bddgrp.apl.pts.ref">
           <c-input
+            disabled
             v-model="model.bddgrp.apl.pts.ref"
             maxlength="16"
             placeholder="请输入申请人"
@@ -132,6 +140,7 @@
       <c-col :span="6">
         <el-form-item label="单据余额" prop="bddgrp.cbs.opn1.cur">
           <c-input
+            disabled
             v-model="model.bddgrp.cbs.opn1.cur"
             maxlength="3"
             placeholder="请输入单据余额"
@@ -142,6 +151,7 @@
       <c-col :span="6">
         <el-form-item label="" prop="bddgrp.cbs.opn1.amt" label-width="20px">
           <c-input
+            disabled
             v-model="model.bddgrp.cbs.opn1.amt"
             placeholder="请输入Balance"
           ></c-input>
@@ -151,6 +161,7 @@
       <c-col :span="12">
         <el-form-item label="" prop="bddgrp.apl.pts.nam" label-width="150px">
           <c-input
+            disabled
             v-model="model.bddgrp.apl.pts.nam"
             maxlength="40"
             placeholder="请输入Name of Party"
@@ -162,6 +173,7 @@
       <c-col :span="6">
         <el-form-item label="到单日期" prop="bddgrp.rec.rcvdat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.bddgrp.rec.rcvdat"
             style="width: 100%"
@@ -173,6 +185,7 @@
       <c-col :span="6">
         <el-form-item label="寄单日期" prop="bddgrp.rec.advdat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.bddgrp.rec.advdat"
             style="width: 100%"
@@ -184,6 +197,7 @@
       <c-col :span="12">
         <el-form-item label="受益人" prop="bddgrp.ben.pts.ref">
           <c-input
+            disabled
             v-model="model.bddgrp.ben.pts.ref"
             maxlength="16"
             placeholder="请输入受益人"
@@ -202,6 +216,7 @@
       <c-col :span="12">
         <el-form-item label="到期日" prop="bddgrp.rec.matdat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.bddgrp.rec.matdat"
             style="width: 100%"
@@ -213,6 +228,7 @@
       <c-col :span="12">
         <el-form-item label="" prop="bddgrp.ben.pts.nam">
           <c-input
+            disabled
             v-model="model.bddgrp.ben.pts.nam"
             maxlength="40"
             placeholder=""
@@ -224,10 +240,18 @@
       <c-col :span="12">
         <el-form-item label="单据类型" prop="bddgrp.rec.docflg">
           <c-select
+            disabled
             v-model="model.bddgrp.rec.docflg"
             style="width: 100%"
             placeholder="请选择单据类型"
           >
+            <el-option
+              v-for="item in codes.brdtyp"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
           </c-select>
         </el-form-item>
       </c-col>
@@ -235,6 +259,7 @@
       <c-col :span="12">
         <el-form-item label="交单行" prop="bddgrp.prb.pts.ref">
           <c-input
+            disabled
             v-model="model.bddgrp.prb.pts.ref"
             maxlength="16"
             placeholder="请输入交单行"
@@ -246,10 +271,18 @@
       <c-col :span="12">
         <el-form-item label="单据承付状态" prop="bddgrp.rec.docsta">
           <c-select
+            disabled
             v-model="model.bddgrp.rec.docsta"
             style="width: 100%"
             placeholder="请选择单据承付状态"
           >
+            <el-option
+              v-for="item in codes.docsta"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
           </c-select>
         </el-form-item>
       </c-col>
@@ -257,6 +290,7 @@
       <c-col :span="12">
         <el-form-item label="" prop="bddgrp.prb.pts.nam" label-width="150px">
           <c-input
+            disabled
             v-model="model.bddgrp.prb.pts.nam"
             maxlength="40"
             placeholder="请输入Name of Party"
@@ -278,7 +312,7 @@
       </c-col>
 
       <c-col :span="9" :offset="3">
-        <c-checkbox v-model="model.sndmsg">Send Message</c-checkbox>
+        <c-checkbox disabled v-model="model.sndmsg">Send Message</c-checkbox>
       </c-col>
     </el-row>
     <c-col :span="12">
@@ -288,6 +322,13 @@
           style="width: 100%"
           placeholder="请选择Booking Procedure"
         >
+          <el-option
+            v-for="item in codes.rebkpflg"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
         </c-select>
       </el-form-item>
     </c-col>
@@ -306,9 +347,7 @@ export default {
   data() {
     return {};
   },
-  methods: { ...Event ,
-  changed(e) {},
-  },
+  methods: { ...Event, changed(e) {} },
   created: function () {},
 };
 </script>

src/views/Business/Bdtcan/index.vue

 <template>
-<c-page title="买方信用证单据注销">
-  <div class="eContainer">
-    <!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
+  <c-page title="买方信用证单据注销">
+    <div class="eContainer">
+      <!-- <c-bus-button :$pntvm="this"></c-bus-button> -->
       <c-function-btn
         :handleSubmit="handleSubmit"
         :handleCheck="handleCheck"
@@ -24,61 +24,59 @@
         size="small"
         :validate-on-rule-change="false"
       >
-      <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
-        <!--PD000016 -->
-        <el-tab-pane label="取消" name="canp">
-          <c-content>
-          <m-canp :model="model" :codes="codes" />
-           </c-content>
-        </el-tab-pane>
+        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
+          <!--PD000016 -->
+          <el-tab-pane label="取消" name="canp">
+            <c-content>
+              <m-canp :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
-        <!--PD000027 -->
-        <el-tab-pane label="或有" name="engp">
-          <m-engp :model="model" :codes="codes" />
-        </el-tab-pane>
+          <!--PD000027 -->
+          <el-tab-pane label="或有" name="engp">
+            <m-engp :model="model" :codes="codes" />
+          </el-tab-pane>
 
-        <!--PD000000 -->
-        <el-tab-pane label="账务" name="setpan">
-          <c-content>
-          <m-setpan :model="model" :codes="codes" />
-          </c-content>
-        </el-tab-pane>
+          <!--PD000000 -->
+          <el-tab-pane label="账务" name="setpan">
+            <c-content>
+              <m-setpan :model="model" :codes="codes" />
+            </c-content>
+          </el-tab-pane>
 
-        <!--PD000001 -->
-        <el-tab-pane label="分录" name="glepan">
-          <m-glepan :model="model" :codes="codes" />
-        </el-tab-pane>
+          <!--PD000001 -->
+          <el-tab-pane label="分录" name="glepan">
+            <m-glepan :model="model" :codes="codes" />
+          </el-tab-pane>
 
-        <!--PD000000 -->
-        <el-tab-pane label="附言" name="coninfp">
-          <m-coninfp :model="model" :codes="codes" />
-        </el-tab-pane>
+          <!--PD000000 -->
+          <el-tab-pane label="附言" name="coninfp">
+            <m-coninfp :model="model" :codes="codes" />
+          </el-tab-pane>
 
-        <!--PD000529 -->
-        <el-tab-pane label="报文及面函" name="docpan">
-          <m-docpan :model="model" :codes="codes" />
-        </el-tab-pane>
+          <!--PD000529 -->
+          <el-tab-pane label="报文及面函" name="docpan">
+            <m-docpan :model="model" :codes="codes" />
+          </el-tab-pane>
 
-        <!--PD000546 -->
-        <el-tab-pane label="附件" name="doctre">
-          <m-doctre :model="model" :codes="codes" />
-        </el-tab-pane>
+          <!--PD000546 -->
+          <el-tab-pane label="附件" name="doctre">
+            <m-doctre :model="model" :codes="codes" />
+          </el-tab-pane>
 
-        <!--PD000001 -->
-        <el-tab-pane label="统一授信" name="limitbody">
-          <m-limitbody :model="model" :codes="codes" />
-        </el-tab-pane>
-      </c-tabs>
-    </el-form>
+          <!--PD000001 -->
+          <el-tab-pane label="统一授信" name="limitbody">
+            <m-limitbody :model="model" :codes="codes" />
+          </el-tab-pane>
+        </c-tabs>
+      </el-form>
 
-    <c-grid-ety-prompt-dialog
+      <c-grid-ety-prompt-dialog
         ref="etyDialog"
         :promptData="promptData"
         v-on:select-ety="selectEty"
       ></c-grid-ety-prompt-dialog>
-    
-    
-  </div>
+    </div>
   </c-page>
 </template>
 <script>
@@ -93,13 +91,13 @@ import Default from "~/model/Bdtcan/Default";
 import Pattern from "~/model/Bdtcan/Pattern";
 import Canp from "./Canp";
 // import Engp from "./Engp";
-import Engp from "~/views/Public/Engp"
+import Engp from "~/views/Public/Engp";
 import Setpan from "~/views/Public/Setpan";
 // import Setpan from "./Setpan"
 import Glepan from "~/views/Public/Glepan";
 import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
-import Doctre from "./Doctre";
+import Doctre from "~/views/Public/Doctre";
 import Limitbody from "~/views/Public/Limitbody";
 
 export default {
@@ -130,7 +128,33 @@ export default {
       defaultRules: Default,
       pattern: Pattern,
       rules: null,
-      codes: {...CodeTable},
+      codes: {
+        ...CodeTable,
+        docsta: [
+          { label: "已寄单索款", value: "A" },
+          { label: "已到单", value: "B" },
+          { label: "已到期付款确认", value: "C" },
+          { label: "待付款", value: "D" },
+          { label: "付款成功", value: "E" },
+          { label: "已拒付", value: "F" },
+          { label: "已退单", value: "G" },
+          { label: "Clean documents received", value: "H" },
+          { label: "Discrepant documents received", value: "I" },
+          { label: "Goods released, wait for documents", value: "J" },
+          { label: "Goods released, documents received", value: "K" },
+          { label: "Documents sent on approval basis", value: "L" },
+          { label: "Documents taken up", value: "M" },
+          { label: "Documents settled free of payment", value: "N" },
+          { label: "Discrepant document received in trust", value: "T" },
+          { label: "Other Type of Advice, wait for documents", value: "O" },
+          { label: "Documents have been refused and returned", value: "R" },
+        ],
+        rebkpflg: [
+          { label: "Contract already settled", value: "A" },
+          { label: "Reverse Booking (Document Set)", value: "N" },
+          { label: "Reverse Booking (Doc. Set, L/C)", value: "B" },
+        ],
+      },
     };
   },
   methods: {

src/views/Business/Bdtudp/index.vue

@@ -154,7 +154,7 @@ export default {
   },
   created: async function () {
     console.log("进入bdtudp交易");
-    let rtnmsg = await Api.post("bdtudp/init", { params: {} });
+    let rtnmsg = await this.init({})
     if (rtnmsg.respCode == SUCCESS) {
       //更新数据
       Utils.copyValueFromVO(this.model, rtnmsg.data);

src/views/Business/Bopsel/index.vue

@@ -24,7 +24,7 @@
   </div>
 </template>
 <script>
-import Api from "~/service/Api";
+import { getCodetable } from "~/service/business/codeTable"
 import CodeTable from "~/config/CodeTable";
 import Bopsel from "~/model/Bopsel";
 import commonProcess from "~/mixin/commonProcess";
@@ -96,7 +96,7 @@ export default {
     console.log("进入bopsel交易");
 
     // 查询码表
-    Api.post("getCodetable", { tbl: "BOPTYP", lang: "EN" }).then((res) => {
+    getCodetable({ tbl: "BOPTYP", lang: "EN" }).then((res) => {
       if (res.respCode == SUCCESS) {
         this.codes.boptyp = res.data;
       }

src/views/Business/Brtlat/index.vue

@@ -71,7 +71,7 @@ export default {
     },
     created:async function(){
         console.log("进入brtlat交易");
-        let rtnmsg = await Api.post("brtlat/init",{params:{}})
+        let rtnmsg = await this.init({})
         if(rtnmsg.respCode == SUCCESS)
         {
            //TODO 处理数据逻辑

src/views/Business/Cptadv/index.vue

@@ -156,7 +156,6 @@ export default {
   },
   created: async function () {
     console.log("进入cptadv交易");
-    // let rtnmsg = await Api.post("cptadv/init",{params:{}});
     let rtnmsg = await this.init(this.$route.query);
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑

src/views/Business/Cptati/index.vue

@@ -80,7 +80,6 @@ export default {
     methods: {},
     created: async function () {
     console.log("进入cptati交易");
-    // let rtnmsg = await Api.post("cptati/init",{params:{}});
     let rtnmsg = await this.init(this.$route.query);
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑

src/views/Business/Cptato/index.vue

@@ -85,7 +85,6 @@ export default {
      },
     created: async function () {
     console.log("进入cptato交易");
-    // let rtnmsg = await Api.post("cptato/init",{params:{}});
     let rtnmsg = await this.init(this.$route.query);
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑

src/views/Business/Cptopn/index.vue

@@ -201,7 +201,6 @@ export default {
   },
   created: async function () {
     console.log("进入cptopn交易");
-    // let rtnmsg = await Api.post("cptopn/init", { params: {} });
     let rtnmsg = await this.init(this.$route.query);
     if (rtnmsg.respCode == SUCCESS) {
       Utils.copyValueFromVO(this.model,rtnmsg.data)

src/views/Business/Diasel/index.vue

@@ -14,7 +14,7 @@
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
+import { getCodetable } from "~/service/business/codeTable"
 import CodeTable from "~/config/CodeTable"
 import Diasel from "~/model/Diasel"
 import commonProcess from "~/mixin/commonProcess"
@@ -60,12 +60,12 @@ export default {
     created:async function(){
         console.log("进入diasel交易");
         // 查询码表
-        Api.post("getCodetable", { tbl:'DIATXT',lang:'EN' }).then((res) => {
+        getCodetable({ tbl:'DIATXT',lang:'EN' }).then((res) => {
                 if (res.respCode == SUCCESS) {
                   this.codes.diatxt = res.data;
                 }
             });
-        Api.post("getCodetable", { tbl:'BUSTXT',lang:'EN' }).then((res) => {
+        getCodetable({ tbl:'BUSTXT',lang:'EN' }).then((res) => {
                 if (res.respCode == SUCCESS) {
                   this.codes.bustxt = res.data;
                 }

src/views/Business/Ditame/index.vue

@@ -2032,7 +2032,6 @@ export default {
   methods: {},
   created: async function () {
     console.log("进入ditame交易");
-    //let rtnmsg = await Api.post("ditame/init", { params: {} });
     let rtnmsg = await this.init(this.$route.query);
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑

src/views/Business/Ditdla/Accp.vue

@@ -4,6 +4,7 @@
       <c-col :span="12">
         <el-form-item label="参考号" prop="didgrp.rec.ownref">
           <c-input
+            disabled
             v-model="model.didgrp.rec.ownref"
             maxlength="16"
             placeholder="请输入Reference"
@@ -14,6 +15,7 @@
       <c-col :span="12">
         <el-form-item label="摘要" prop="didgrp.rec.nam">
           <c-input
+            disabled
             v-model="model.didgrp.rec.nam"
             maxlength="40"
             placeholder="请输入Externally Displayed Name to Identify the Contract"
@@ -25,6 +27,7 @@
       <c-col :span="6">
         <el-form-item label="信用证金额" prop="didgrp.cbs.nom1.cur">
           <c-select
+            disabled
             v-model="model.didgrp.cbs.nom1.cur"
             style="width: 100%"
             placeholder="请选择Currency"
@@ -35,6 +38,7 @@
       <c-col :span="6">
         <el-form-item label="" prop="didgrp.cbs.nom1.amt" label-width="0px">
           <c-input
+            disabled
             v-model="model.didgrp.cbs.nom1.amt"
             placeholder="请输入信用证金额"
           ></c-input>
@@ -43,6 +47,7 @@
       <c-col :span="12">
         <el-form-item label="申请人" prop="didgrp.apl.pts.ref">
           <c-input
+            disabled
             v-model="model.didgrp.apl.pts.ref"
             maxlength="16"
             placeholder="请输入申请人"
@@ -55,6 +60,7 @@
       <c-col :span="6">
         <el-form-item label="信用证余额" prop="didgrp.cbs.opn1.cur">
           <c-select
+            disabled
             v-model="model.didgrp.cbs.opn1.cur"
             style="width: 100%"
             placeholder="请选择信用证余额"
@@ -66,6 +72,7 @@
       <c-col :span="6">
         <el-form-item label="" prop="didgrp.cbs.opn1.amt" label-width="0px">
           <c-input
+            disabled
             v-model="model.didgrp.cbs.opn1.amt"
             placeholder="请输入信用证余额"
           ></c-input>
@@ -73,8 +80,9 @@
       </c-col>
 
       <c-col :span="12">
-        <el-form-item label="" prop="didgrp.apl.pts.nam" >
+        <el-form-item label="" prop="didgrp.apl.pts.nam">
           <c-input
+            disabled
             v-model="model.didgrp.apl.pts.nam"
             maxlength="40"
             placeholder="请输入Name of Party"
@@ -86,6 +94,7 @@
       <c-col :span="12">
         <el-form-item label="指定银行" prop="didgrp.avbnam">
           <c-input
+            disabled
             v-model="model.didgrp.avbnam"
             maxlength="40"
             placeholder="请输入指定银行"
@@ -95,6 +104,7 @@
       <c-col :span="12">
         <el-form-item label="受益人" prop="didgrp.ben.pts.ref">
           <c-input
+            disabled
             v-model="model.didgrp.ben.pts.ref"
             maxlength="16"
             placeholder="请输入受益人"
@@ -107,6 +117,7 @@
       <c-col :span="12">
         <el-form-item label="兑付方式" prop="didgrp.rec.avbby">
           <c-select
+            disabled
             v-model="model.didgrp.rec.avbby"
             style="width: 100%"
             placeholder="请选择Available by"
@@ -115,8 +126,9 @@
         </el-form-item>
       </c-col>
       <c-col :span="12">
-        <el-form-item label="" prop="didgrp.ben.pts.nam" >
+        <el-form-item label="" prop="didgrp.ben.pts.nam">
           <c-input
+            disabled
             v-model="model.didgrp.ben.pts.nam"
             maxlength="40"
             placeholder=""
@@ -128,6 +140,7 @@
       <c-col :span="6">
         <el-form-item label="开证日期" prop="didgrp.rec.opndat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.didgrp.rec.opndat"
             style="width: 100%"
@@ -139,6 +152,7 @@
       <c-col :span="6">
         <el-form-item label="最迟装运日期" prop="didgrp.rec.shpdat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.didgrp.rec.shpdat"
             style="width: 100%"
@@ -149,6 +163,7 @@
       <c-col :span="12">
         <el-form-item label="通知行" prop="didgrp.rec.tzref">
           <c-input
+            disabled
             v-model="model.didgrp.rec.tzref"
             maxlength="35"
             placeholder="请输入通知行编号"
@@ -170,6 +185,7 @@
       <c-col :span="6">
         <el-form-item label="到期日/到期地点" prop="didgrp.rec.expdat">
           <c-date-picker
+            disabled
             type="date"
             v-model="model.didgrp.rec.expdat"
             style="width: 100%"
@@ -181,6 +197,7 @@
       <c-col :span="6">
         <el-form-item label="" prop="didgrp.rec.expplc" label-width="0px">
           <c-input
+            disabled
             v-model="model.didgrp.rec.expplc"
             maxlength="35"
             placeholder="请输入Place of Expiry"
@@ -189,8 +206,9 @@
       </c-col>
 
       <c-col :span="12">
-        <el-form-item label="" prop="didgrp.adv.pts.nam" >
+        <el-form-item label="" prop="didgrp.adv.pts.nam">
           <c-input
+            disabled
             v-model="model.didgrp.adv.pts.nam"
             maxlength="40"
             placeholder="请输入到期日/到期地点"
@@ -202,6 +220,7 @@
       <c-col :span="12">
         <el-form-item label="信用证类型" prop="didgrp.rec.lcrtyp">
           <c-select
+            disabled
             v-model="model.didgrp.rec.lcrtyp"
             style="width: 100%"
             placeholder="请选择Form of Documentary Credit"
@@ -219,41 +238,55 @@
           ></c-input>
         </el-form-item>
       </c-col>
-      <c-col :span="12">
+      <c-col :span="8">
         <el-form-item label="第" prop="amenbr">
           <c-input
+            disabled
             v-model="model.amenbr"
             maxlength="3"
             placeholder="请输入Amendment No."
           ></c-input>
-          <label>次修改(减额)</label>
         </el-form-item>
-        <br />
+      </c-col>
+      <c-col :span="4">
+        <el-form-item label="次修改(减额)"> </el-form-item>
+      </c-col>
+    </el-row>
+    <el-row>
+      <c-col :span="6">
         <el-form-item label="修改金额" prop="amecur">
           <c-select
+            disabled
             v-model="model.amecur"
             style="width: 100%"
             placeholder="请选择Amount Amend Cur"
           >
           </c-select>
         </el-form-item>
+      </c-col>
+      <c-col :span="6">
         <el-form-item label="" prop="ameamt" label-width="0px">
           <c-input
+            disabled
             v-model="model.ameamt"
             placeholder="请输入修改金额"
           ></c-input>
         </el-form-item>
-        <br />
+      </c-col>
+      <c-col :span="6">
         <el-form-item label="修改日期" prop="amedat">
           <c-input
+            disabled
             v-model="model.amedat"
             maxlength="12"
             placeholder="请输入Amount Amend Date"
           ></c-input>
         </el-form-item>
-        <br />
+      </c-col>
+      <c-col :span="6">
         <el-form-item label="是否接受此笔减额修改" prop="ameflg">
           <c-select
+            disabled
             v-model="model.ameflg"
             style="width: 100%"
             placeholder="请选择是否接受此笔减额修改"

src/views/Business/Ditsel/index.vue

@@ -52,7 +52,7 @@ export default {
   methods: {},
   created: async function () {
     console.log("进入ditsel交易");
-    let rtnmsg = await Api.post("ditsel/init", { params: {} });
+    let rtnmsg = await this.init({})
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑
       Utils.copyValueFromVO(this.model, rtnmsg.data);

src/views/Business/Infpta/index.vue

@@ -145,7 +145,7 @@ export default {
   },
   created: async function() {
     console.log("进入infpta交易");
-    let rtnmsg = await Api.post("infpta/init", { params: {} });
+    let rtnmsg = await this.init({})
     if (rtnmsg.respCode == SUCCESS) {
       //TODO 处理数据逻辑
       this.updateModel(rtnmsg.data);

src/views/Business/Trnrel/InftrnpsDetail.vue

@@ -494,7 +494,7 @@ export default {
         },
         async show(idx,row){       
             var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
-            let rtnmsg = await Api.post(`trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
+            let rtnmsg = await Api.post(`/business/trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
             if (rtnmsg.respCode == SUCCESS) {
                 this.title = "面函"
                 let viewurl = "/#/docpan/show";

src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue

@@ -492,7 +492,7 @@ export default {
         },
         async show(idx,row){       
             var params = {selDst:"recpan.smhstm",selIds:[idx+1],selBtnId:"A"}
-            let rtnmsg = await Api.post(`trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
+            let rtnmsg = await Api.post(`/business/trnrel/executeRule/recpan.smhstm`, this.wrapper(params))
             if (rtnmsg.respCode == SUCCESS) {
                 this.title = "面函"
                 let viewurl = "/#/docpan/show";

src/views/Docpan/Show.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import Api from "~/service/Api";
+import { getPdf } from "~/service/business/file";
 
 export default {
     data() {
@@ -48,7 +48,7 @@ export default {
                 ];
             });
         if (this.model.docXML != "")
-            Api.post("pdf", { xml: this.model.docXML, doclang: window.sessionStorage.docuil }).then((res) => {
+            getPdf({ xml: this.model.docXML, doclang: window.sessionStorage.docuil }).then((res) => {
                 if (res.respCode == SUCCESS) {
                     this.pdf ="data:application/pdf;base64,"+ res.data;
                 }

src/views/Home/cells/TaskStatistics.vue

@@ -48,7 +48,7 @@
 
 <script>
 import CellHeaderVue from "./common/CellHeader.vue";
-import axios from "axios";
+import { all } from "~/service/report";
 
 export default {
   name: "TaskStatistics",
@@ -84,7 +84,7 @@ export default {
     };
   },
   created() {
-      axios.get('/gjjs/report/task/all').then(res => {
+      all().then(res => {
           console.log(res);
       })
   }

src/views/Public/Docpan.vue

@@ -464,14 +464,14 @@ export default {
             let rtnmsg
             if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
                 this.model.setmod.msgmod.doccod = row.id
-                rtnmsg = await Api.post(`${this.declareParams.trnName}/msgmod_butshw`, this.wrapper())
+                rtnmsg = await Api.post(`${this.requestPrefix}/msgmod_butshw`, this.wrapper())
             } else {
                 this.model.trnmod.trndoc.doccod = row.id
                 this.model.trnmod.trndoc.cortyp = cortyp
                 const params = {
                     index: index
                 }
-                rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpan`, this.wrapper(params))
+                rtnmsg = await Api.post(`${this.requestPrefix}/executeDocpan`, this.wrapper(params))
             }
             if (rtnmsg.respCode == SUCCESS) {
                 if (cortyp == 'SWT' || cortyp == 'FMT' || cortyp == 'CMT') {
@@ -524,7 +524,7 @@ export default {
             const params = {
                 index: index
             }
-            let rtnmsg = await Api.post(`${this.declareParams.trnName}/executeDocpanDetail`, this.wrapper(params))
+            let rtnmsg = await Api.post(`${this.requestPrefix}/executeDocpanDetail`, this.wrapper(params))
             if (rtnmsg.respCode == SUCCESS) {
                 this.title = row.pandsc
                 this.centerDialogVisible = true,