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/Infgcd/Infsea.vue

@@ -287,7 +287,10 @@
                     @click="closeTrn('popover_' + scope.row.IDX)"
                   />
                 </div>
-              <c-istream-table :list="trnData.data" :columns="trnData.columns">
+                <c-istream-table
+                  :list="trnData.data"
+                  :columns="trnData.columns"
+                >
                   <el-table-column prop="op" label="操作" width="0">
                     <template slot-scope="scope">
                       <c-button
@@ -307,26 +310,51 @@
                   >详情</c-button
                 >
               </el-popover>
-            <!-- <c-button
+              <c-button
                 style="margin-left: 0"
                 size="small"
                 type="primary"
                 @click="getButtons(scope.row['Reference'])"
               >
-            处理</c-button> -->
+                处理</c-button
+              >
             </template>
           </el-table-column>
         </c-istream-table>
       </c-col>
     </el-row>
 
+    <div v-if="dialogFlag" class="m-list-btns">
+      <m-busbtn
+        ref="childs"
+        :ownref="ownref"
+        trnCode="gitsel"
+        ownrefPath="gidgrp"
+        :model="gitselModel"
+        tabIndex="1"
+        @onChoose="onChoose"
+        >11</m-busbtn
+      >
+    </div>
+    <div v-else>
+      <m-busbtn
+        ref="childs"
+        :ownref="ownref"
+        trnCode="getsel"
+        ownrefPath="gcdgrp"
+        :model="getselModel"
+        tabIndex="3"
+        @onChoose="onChoose"
+        >11</m-busbtn
+      >
+    </div>
+
     <!-- <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
       <div class="m-list-btns">
         <m-busbtn ref="childs" :ownref="ownref" trnCode="gitsel" ownrefPath="gidgrp" :model="gitselModel" tabIndex=1 @onChoose="onChoose">11</m-busbtn>
       </div>
     </el-dialog> -->
 
-
     <!-- <c-col :span="12">
         <el-form-item label="Own Reference" prop="infcon.seaownref">
             <c-input  v-model="model.infcon.seaownref" maxlength="16"  placeholder="请输入Own Reference"></c-input>
@@ -491,15 +519,22 @@ import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Infgcd/Event";
 
+import GitselModel from "~/model/Gitsel";
+import GetselModel from "~/model/Getsel";
+import BusNavbar from "~/views/Public/BusNavbar";
+
 export default {
   inject: ["root"],
   props: ["model", "codes"],
   mixins: [commonProcess],
+  components: { "m-busbtn": BusNavbar },
   data() {
     return {
+      gitselModel: new GitselModel().data,
+      getselModel: new GetselModel().data,
       ownref: "",
-      initdialog: false,
       dialogTableVisible: false,
+      dialogFlag: true,
       trnData: {
         columns: [
           '0 1 "Trn ID" 100',
@@ -523,8 +558,8 @@ export default {
           '3 7 "Opened" 150',
           '4 8 "Closed" 150',
           '9 9 "Cur" 150',
-          '11 10 "Cur" 150',
-          '10 11 "Orig.Amount" 150',
+          '10 10 "Orig.Amount" 150',
+          '11 11 "Cur" 150',
           '12 12 "Open Amount" 150',
         ],
         data: [],
@@ -533,18 +568,22 @@ export default {
   },
   methods: {
     ...Event,
-    // async getButtons(ownref) {
-    //   this.initdialog = true;
-    //   this.ownref = ownref;
-    //   console.log("ownref:" + ownref);
-    //   setTimeout(() => {
-    //     this.$refs.childs.$emit("childmethods")
-    //   }, 10)
-    // },
+    async getButtons(ownref) {
+      this.ownref = ownref;
+      this.$refs.childs.initdialog = true;
+      this.dialogFlag = ownref.startsWith("LG");
+      console.log("dialogFlag:" + this.dialogFlag);
+      console.log("ownref:" + ownref);
+    },
     async onChoose(code) {
       //跳转交易
       this.$router.history.push("/business/" + code);
-      this.initdialog = false;
+      this.$refs.childs.initdialog = false;
+    },
+    async getDitSelInfo(code) {
+      //跳转交易
+      this.$router.history.push("/business/" + code);
+      this.$refs.childs.initdialog = false;
     },
 
     async getTrnInfo(idx, row) {
@@ -562,14 +601,17 @@ export default {
     closeTrn(refId) {
       this.$refs[refId].doClose();
     },
-    handleReset: function () {
-      this.model = {
-        instNo: "",
-        instName: "",
-      };
-    },
+    // handleReset: function () {
+    //   this.model = {
+    //     instNo: "",
+    //     instName: "",
+    //   };
+    // },
   },
   created: function () {},
+  watch: {
+    "model.gidgrp.rec.ownref": function () {},
+  },
 };
 </script>
 <style>

src/views/Layout/SideMenu.vue

@@ -144,6 +144,7 @@ export default {
         //进口保函
         { inifrm: "13", ininam: "进口保函", pntmiu: "" },
         { inifrm: "infgid", ininam: "进口保函入口交易", pntmiu: "13" },
+        { inifrm: "infgcd", ininam: "保函赔付查询", pntmiu: "13" },
         // { inifrm: "gitsel", ininam: "进口保函查询", pntmiu: "13" },
         // { inifrm: "gitset", ininam: "进口保函赔付", pntmiu: "13" },
         // { inifrm: "gitcrq", ininam: "进口保函索赔登记", pntmiu: "13" },