gitame,gitcrj,gitcrq修改

src/business/gitame/model/index.js

@@ -7,12 +7,12 @@ export default class Gitame {
         amebutc: {
           chkast: '',
         },
-        swiadd:{
-          amedat:'',
-          amenbr:'',
-          ameamt:'',
-          newamt:'',
-          newcur:'',
+        swiadd: {
+          amedat: '',
+          amenbr: '',
+          ameamt: '',
+          newamt: '',
+          newcur: '',
         },
         ametxtflgc: '',
         ametxt: '',
@@ -30,14 +30,14 @@ export default class Gitame {
         prtflg: '',
         plateflg: '',
         amebut: {
-            chkast: ''
+          chkast: '',
         },
         oldmacamt: '',
-        cre767flg: ''
+        cre767flg: '',
       },
       addbcb: {
         gitamermk: '',
-        gitamecho: ''
+        gitamecho: '',
       },
       gidgrp: {
         blk: {
@@ -70,7 +70,7 @@ export default class Gitame {
           addamtcovc: '',
           deltoadrc: '',
           apprultxt: '',
-            orcplcc: ''
+          orcplcc: '',
         },
         ctr: {
           pts: new Pts().data,
@@ -79,7 +79,7 @@ export default class Gitame {
           wahnum: '',
           remark: '',
           bustyp: '',
-            segtyp: ''
+          segtyp: '',
         },
         con: {
           pts: new Pts().data,
@@ -99,7 +99,7 @@ export default class Gitame {
         gidcxm: {
           benefi: '',
           cxmflg: '',
-            warran: ''
+          warran: '',
         },
         rec: {
           acc: '',
@@ -172,7 +172,7 @@ export default class Gitame {
           jurlawc: '',
           gartyp: '',
           orccurc: '',
-            vrfdat: ''
+          vrfdat: '',
         },
         adv: {
           pts: new Pts().data,
@@ -180,36 +180,36 @@ export default class Gitame {
         cbs: {
           opn1: {
             cur: '',
-                amt: ''
+            amt: '',
           },
           mac2: {
             cur: '',
-                amt: ''
+            amt: '',
           },
           opn2: {
             cur: '',
-                amt: ''
+            amt: '',
           },
           opc2: {
             cur: '',
-                amt: ''
+            amt: '',
           },
           max: {
             cur: '',
-                amt: ''
+            amt: '',
           },
           max2: {
             cur: '',
-                amt: ''
+            amt: '',
           },
           mac: {
             cur: '',
-                amt: ''
-            }
+            amt: '',
+          },
         },
         apl: {
           pts: new Pts().data,
-        }
+        },
       },
       trnmod: {
         swiadd: {
@@ -248,8 +248,8 @@ export default class Gitame {
           newamtc: '',
           addamtflgc: '',
           ameblk: '',
-            reqcan: ''
-        }
+          reqcan: '',
+        },
       },
       oldgidgrp: {
         blk: {
@@ -258,20 +258,20 @@ export default class Gitame {
           gidtxt: '',
           dtaappexpdat: '',
           exptxt: '',
-            liatxtc: ''
+          liatxtc: '',
         },
         rec: {
           expdat: '',
           liadat: '',
           liatypc: '',
-            exptyp: ''
+          exptyp: '',
         },
         cbs: {
           max: {
             cur: '',
-                amt: ''
-            }
-        }
+            amt: '',
+          },
+        },
       },
       gitp: {
         chkpreper: '',
@@ -283,39 +283,39 @@ export default class Gitame {
         prepercmodflg: '',
         covgodsrvmodflg: '',
         covgodc: {
-            chkast: ''
+          chkast: '',
         },
         gidtxt: '',
         liatxtcmodflg: '',
         usr: {
-            extkey: ''
+          extkey: '',
         },
         chkgidtxtc: '',
         prepermodflg: '',
         aacp: {
           aacmod: {
-                addamtflg: ''
-            }
+            addamtflg: '',
+          },
         },
         chargic: {
-            chkast: ''
+          chkast: '',
         },
         gidtxtmodflg: '',
         gtx: {
-            gidtxt: ''
+          gidtxt: '',
         },
         covgodsrvcmodflg: '',
         chargi: {
-            chkast: ''
+          chkast: '',
         },
         covgod: {
-            chkast: ''
+          chkast: '',
         },
         chkgidtxt: '',
         dzbhflg: '',
         chkpreperc: '',
         oldgtxgidtxt: '',
-        inc760: ''
+        inc760: '',
       },
       setmod: new Pub().data.Setmod,
       mtabut: new Pub().data.Mtabut,

src/business/gitame/views/Aacp.vue

@@ -43,7 +43,6 @@
 import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
 import event from '../event'
-
 export default {
   inject: ["root"],
   props: ["model", "codes"],

src/business/gitame/views/Addbcb.vue

@@ -19,7 +19,6 @@ import event from '../event'
 import Coninfp from "~/views/Public/Coninfp";
 import Addbcb1 from "./Addbcb1";
 
-
 export default {
   components: {
     "m-coninfp": Coninfp,
@@ -32,7 +31,6 @@ export default {
     return {
       activeNames: ["addbcb1"],
     };
-
   },
   methods: {
   },

src/business/gitame/views/Addbcb1.vue

 <template>
   <div class="eibs-tab">
     <!-- S0000003 : 货物税号 DE!-->
-
     <c-row>
       <c-col :span="24">
         <c-col :span="12">

src/business/gitcan/views/index.vue

@@ -101,7 +101,6 @@ import Engp from "~/components/business/engp/views";
 import Doctre from "~/views/Public/Doctre";
 import Ccvpan from "~/components/business/ccvpan/views";
 import Docpan from "~/components/business/docpan/views";
-import Setpan from "~/components/business/setmod/views";
 import Setmod from "~/components/business/setmod/views";
 import Glentry from "~/components/business/glentry/views";
 import Coninfp from "~/views/Public/Coninfp";

src/business/gitcrj/views/Gitbin.vue

@@ -4,7 +4,8 @@
       <el-form-item label="银行指令" prop="instxt">
         <c-input type="textarea" v-model="model.instxt" maxlength="65" 
         :rows="8"
-            show-word-limit placeholder="请输入银行指令" ></c-input>
+        show-word-limit placeholder="请输入银行指令" >
+        </c-input>
       </el-form-item>
     </c-col>
   </div>

src/business/gitcrj/views/Ovwp.vue

@@ -8,7 +8,6 @@
         <el-collapse-item title="银行指令" name="gitbin">
           <m-gitbin :model="model" :codes="codes" />
         </el-collapse-item>
-
       </el-collapse>
     </div>
   </template>

src/business/gitopn/views/index.vue

@@ -41,7 +41,7 @@
             </el-tab-pane>
 
             <!--PD000027 -->
-            <el-tab-pane label="费用/账务" name="setpan">
+            <el-tab-pane label="费用/账务" name="setmod">
               <c-content>
                 <m-setmod
                   :model="model"

src/business/gitset/views/index.vue

@@ -51,27 +51,28 @@
         </el-tab-pane>
 
     <!--PD000027 -->
-        <el-tab-pane label="费用/账务" name="engp,setpan,glepan">
+    <el-tab-pane label="表外记账" name="engp">
           <c-content>
-              <div class="eibs-tab">
-                <el-collapse v-model="activeNames">
-                  <el-collapse-item title="表外记账" name="engp">
               <!-- 表外记账 -->
               <m-engp :model="model" :codes="codes" />
-                  </el-collapse-item>
-                  <el-collapse-item title="结算" name="setpan">
-                    <!-- 结算 -->
+          </c-content>
+        </el-tab-pane>
+
+        <!--PD000027 -->
+        <el-tab-pane label="费用/账务" name="setpan">
+          <c-content>
             <m-setpan :model="model" :codes="codes" />
-                  </el-collapse-item>
-                  <el-collapse-item title="会计分录" name="glepan">
-                    <!-- 会计分录 -->
-                    <m-glepan :model="model" :codes="codes" />
-                  </el-collapse-item>
-                </el-collapse>
-              </div>
           </c-content>
         </el-tab-pane>
         
+        <!--PD000027 -->
+        <el-tab-pane label="会计分录" name="glepan">
+          <c-content>
+              <m-glentry :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
+       
+
         <!--PD000000 -->
         <el-tab-pane label="备查/附言" name="coninfp">
             <c-content>
@@ -108,50 +109,34 @@
 
       </c-tabs>
     </el-form>
+     <!-- 选择数据的表格弹框 -->
      <c-grid-ety-prompt-dialog
         ref="etyDialog"
         :promptData="promptData"
-      v-on:select-ety="selectEty"
+        @select-ety="selectGridEtyPromptData"
       >
       </c-grid-ety-prompt-dialog>
-    <c-grid-ety-prompt-dialog
-      ref="doxpDialog"
-      :isPty="false"
-      :promptData="promptData"
-      @select-ety="selectMsg"
-    >
-    </c-grid-ety-prompt-dialog>
-
-    <c-function-btn
-      :handleSubmit="handleSubmit"
-      :handleCheck="handleCheck"
-      :handleStash="handleStash">
-    </c-function-btn>
 
     </c-page>
   </div>
 </template>
 <script>
-import Api from "~/service/Api";
 import CodeTable from "~/config/CodeTable";
-import Gitset from "~/model/Gitset";
-import commonProcess from "~/mixin/commonProcess";
-import commonFuncs from "~/mixin/commonFuncs";
-import Check from "~/model/Gitset/Check";
-import Default from "~/model/Gitset/Default";
-import Pattern from "~/model/Gitset/Pattern";
-
+import Gitset from "../model";
+import operationFunc from "~/mixin/operationFunc";
 import Limitbody from "~/views/Public/Limitbody";
-import Engp from "~/views/Public/Engp";
+import Engp from "~/components/business/engp/views";
 import Doctre from "~/views/Public/Doctre";
-import Docpan from "~/views/Public/Docpan";
+import Ccvpan from "~/components/business/ccvpan/views";
+import Docpan from "~/components/business/docpan/views";
 import Setpan from "~/components/business/setmod/views";
+import Glentry from "~/components/business/glentry/views";
+import Setmod from "~/components/business/setmod/views";
 import Coninfp from "~/views/Public/Coninfp";
-import Glepan from "~/views/Public/Glepan";
-import Ccvpan from "~/views/Public/Ccvpan";
 import Ovwp from "./Ovwp";
 import Cnyp from "./Cnyp";
 import Shisuan from "./Shisuan";
+import event from '../event';
 
 export default {
   name: "Gitset",
@@ -167,94 +152,72 @@ export default {
     "m-cnyp": Cnyp,
     "m-shisuan": Shisuan,
     "m-limitbody": Limitbody,
+    "m-setmod":Setmod,
+    "m-glentry":Glentry
   },
   provide() {
     return {
       root: this,
     };
   },
-  mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
+  mixins: [event, operationFunc], // 里面包含了Default、Check等的公共处理
   data() {
     return {
       tabVal: "ovwp",
       trnName: "gitset",
       model: new Gitset().data,
-      checkRules: Check,
-      defaultRules: Default,
-      pattern: Pattern,
       rules: null,
       codes: { ...CodeTable },
-      activeNames: ["engp","coninfp"],
-      activeNames1: ["limitbody"],
-    };
+      activeNames: ["engp"],
+      promptData: {
+        title: 'Select a Party',
+        columns: [
+          {
+            prop: 'ptyInr',
+            label: 'Party Number'
           },
-   watch:{
-         "model.setmod.doccur":{
-              immediate:true,
-              handler(){
-                let cur = this.model.setmod.doccur;
-                let amt = this.model.setmod.docamt;
-                let doc = this.model.gcdgrp.rec.docprbrol
-                this.det202cvName= "Payment 202 "+doc+" "+cur+" "+ amt;
-                this.det756Name  = "Payment 756 "+doc+" "+cur+" "+ amt;
-              }
+          {
+            prop: 'inr',
+            label: 'Address Number'
           },
-          "model.mtabut.clsflg":{
-                  immediate:true,
-                  handler(){
-                    let cur = this.model.setmod.doccur;
-                    let amt = this.model.setmod.docamt;
-                    let doc = this.model.gcdgrp.rec.docprbrol
-                    this.det202cvName= "Payment 202 "+doc+" "+cur+" "+ amt;
-                    this.det756Name  = "Payment 756 "+doc+" "+cur+" "+ amt;
-              }
+          {
+            prop: 'branch',
+            label: 'Branch Code'
           },
+          {
+            prop: 'bchName',
+            label: 'Branch Name'
           },
-  methods: {
-   myTabClick(tab) {
-      this.tabClick(tab);
-      const name = tab.name;
-      let rulePath;
-      if(name === 'basp'){
-        rulePath = "bopmod.dbcp.basp"
-      }
-      if(name === 'basp1'){
-        rulePath = "bopmod.dbfp.basp"
-      }
-      if(name === 'outp'){
-        rulePath = "cnybop.outp"
-      }
-      if (name === "cips") {
-        rulePath = "trnmod.cipmod.cips"
-      }
-      // if(name === 'det756'){
-      //   rulePath = "setmod.setglg.setgll(2).sespay.det756"
-      // }
-      // if (name === "det202cv") {
-      //   rulePath = "setmod.setglg.setgll(2).sespay.det202cv"
-      // }
-      if (!!rulePath) {
-        this.executeRule(rulePath).then((res) => {
-          if (res.respCode == SUCCESS) {
-            this.updateModel(res.data);
-          }
-        });
-      }
+          {
+            prop: 'adrName',
+            label: 'Address Name'
+          },
+          {
+            prop: 'adr1',
+            label: 'Address1'
+          },
+          {
+            prop: 'locCty',
+            label: 'City'
           },
+          {
+            prop: 'locZip',
+            label: 'Zip'
           },
-  created: async function () {
-    console.log("进入gitset交易");
-    let rtnmsg = await this.init({});
-    if (rtnmsg.respCode == SUCCESS) {
-      //TODO 处理数据逻辑
-      this.updateModel(rtnmsg.data);
-      this.model.mtabut.clsflg="X";
-      if (this.isInDisplay) {
-        this.restoreDisplay();
+          {
+            prop: 'bicCode',
+            label: 'BIC'
           }
-    } else {
-      this.$notify.error({ title: "错误", message: "服务请求失败！" });
+        ],
+        data: []
       }
+    };
+  },
+  methods: {
+   
+  },
+  mounted () {
+    this.init()
   },
 };
 </script>

src/views/Business/Brtcan/Ovwp.vue

 <template>
 <div class="eibs-tab">
-    <el-collapse v-model="activeNames" @change="handleChange">
+    <el-collapse v-model="activeNames">
         <el-collapse-item title="取消信息" name="canp">
              <m-canp :model="model" :codes="codes" />
         </el-collapse-item>
@@ -30,10 +30,7 @@ export default {
 
     },
     methods: {
-    ...Event,
-    handleChange(val) {
-      console.log(val);
-    },
+   
   },
     created: function () {},
 };