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

src/components/IStreamTable.vue

@@ -327,6 +327,22 @@ export default {
         return value
       }
       return em.label
+    },
+    timeFormat(item,scope){
+      let value = scope.row[item.prop];
+      if(!value){
+        return ""
+      }
+      let idx = value.indexOf(".");
+      return value.substring(0,idx);
+    },
+    dateFormat(item,scope){
+      let value = scope.row[item.prop];
+      if(!value){
+        return ""
+      }
+      let idx = value.indexOf(" ");
+      return value.substring(0,idx);
     }
   }
 };

src/model/Ditdck/index.js

@@ -288,6 +288,7 @@ export default class Ditdck{
 								ccvamt:"",			//  保证金余额		.liaall.limmod.ccvamt
 								ecifno:"",			//  ECIFNO		.liaall.limmod.ecifno
 							},
+							liaallg:[],
 						},
 						setmod: new Pub().data.Setmod,
 						infcon:{

src/views/Business/Diasel/Diaselp.vue

@@ -460,13 +460,14 @@ export default {
       },
       stmData: {
         columns: [
-          '1 1 "提示日期" 160',
+          // '1 1 "提示日期" 160',
+          {index:1,position:1,width:90,pattern:'dateFormat',label:'提示日期'},
           '2 2 "提示原因" 100',
           '3 3 "业务编号" 150',
-          '4 4 "提示信息" 270',
+          '4 4 "提示信息" 300',
           '5 5 "待操作交易代码" 120',
           '6 6 "经办柜员" 100',
-          '7 7 "所属工作组" 0',
+          '7 7 "所属工作组" auto',
           // '8 8 "客户号" 1',
           // '9 9 "客户名称" 1',
           // '10 10 "币种" 1',

src/views/Business/Sptsel/Menu.vue

@@ -435,7 +435,8 @@ export default {
           {index:1,position:4,width:110,pattern:'code',label:'状态',code:this.codes.sptrelstatus},
           '17 5 "报文类型" 100',
           '18 6 "对方银行BIC" 110',
-          '7 7 "创建时间" 160 20 DateTime 1',
+          // '7 7 "创建时间" 160 20 DateTime 1',
+           {index:7,position:7,width:140,pattern:'timeFormat',label:'创建时间'},
           '19 8 "币种" 50',
           '20 9 "金额" 69 2 8 1 16',
 

src/views/Business/Sptsel/Sptbrk/Menu.vue

@@ -387,7 +387,8 @@ export default {
           {index:1,position:4,width:100,pattern:'code',label:'状态',code:[{label:"Pending",value:"PEN"}]},
           '17 5 "报文类型" 100',
           '18 6 "对方银行BIC" 110',
-          '7 7 "创建时间" 160 20 DateTime 1',
+          // '7 7 "创建时间" 160 20 DateTime 1',
+          {index:7,position:7,width:140,pattern:'timeFormat',label:'创建时间'},
           '19 8 "币种" 50',
           '20 9 "金额" 69 2 8 1 16',
 

src/views/Business/Trnrel/Inftrnps.vue

@@ -549,7 +549,8 @@ export default {
           '17 3 "摘要信息" 300',
           '12 4 "币种" 50',
           '13 5 "金额" 100',
-          '14 6 "创建时间" 170',
+          // '14 6 "创建时间" 170',
+          {index:14,position:6,width:140,pattern:'timeFormat',label:'创建时间'},
           '9 7 "签名要求" 70',
           '2 8 "签名状态" 70',
           '16 9 "经办柜员" 70',

src/views/Business/Trnrel/InftrnpsDetail.vue

@@ -498,7 +498,7 @@ export default {
                 let viewurl = "/#/docpan/show";
                 let XMLdata;
                 if (row.Type == 'LET') {
-                    window.sessionStorage.docXML = ''
+                    window.sessionStorage.docTXT = ''
                     window.sessionStorage.docXML = rtnmsg.data.docimm_xmldocblk;
                 }
                 else if (row.pandsc == "MT799") {

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

@@ -496,7 +496,8 @@ export default {
           '17 3 "摘要信息" 300',
           '12 4 "币种" 70',
           '13 5 "金额" 100',
-          '14 6 "创建时间" 170',
+          // '14 6 "创建时间" 170',
+          {index:14,position:6,width:140,pattern:'timeFormat',label:'创建时间'},
           '9 7 "签名要求" 80',
           '2 8 "签名状态" 80',
           '16 9 "经办柜员" 80',

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

@@ -498,7 +498,7 @@ export default {
                 let viewurl = "/#/docpan/show";
                 let XMLdata;
                 if (row.Type == 'LET') {
-                    window.sessionStorage.docXML = ''
+                    window.sessionStorage.docTXT = ''
                     window.sessionStorage.docXML = rtnmsg.data.docimm_xmldocblk;
                 }
                 else if (row.pandsc == "MT799") {

src/views/Docpan/Show.vue

@@ -2,7 +2,7 @@
     <div>
         <div style="height: 800px; overflow: auto">
             <embed
-                v-if="this.model.docXML"
+                v-if="this.model.docXML && pdf"
                 :src="pdf"
                 type="application/pdf"
                 height="100%"
@@ -31,7 +31,7 @@ export default {
     data() {
         return {
             model: { docXML: "" },
-            pdf: "data:application/pdf;base64,",
+            pdf: "",
         };
     },
     created() {
@@ -49,7 +49,7 @@ export default {
         if (this.model.docXML != "")
             Api.post("pdf", { xml: this.model.docXML }).then((res) => {
                 if (res.respCode == SUCCESS) {
-                    this.pdf += res.data;
+                    this.pdf ="data:application/pdf;base64,"+ res.data;
                 }
             });
     },

src/views/Public/Ccvpan.vue

@@ -191,32 +191,41 @@
             Add
           </c-button>
         <!-- </c-col> -->
+          
+
+        <!-- <c-col :span="2">
+          <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
+            Del
+          </c-button>
+        </c-col> -->
+      <!-- </c-row> -->
+    </c-col>
+    <!-- <c-col :span="24"><div style="height: 10px"></div></c-col> -->
+    <template>
         <el-dialog
             :visible.sync="dialogTableVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
             width="60%"
+            center
           >
-            <c-istream-table :list="stmData.data" :columns="stmData.columns">
-              <el-table-column prop="op" label="OP" width="100">
+            <c-istream-table :list="stmData.data" :columns="stmData.columns" :paginationShow="false">
+            <el-table-column prop="op" label="OP" width="80" fixed="right">
                 <template slot-scope="scope">
-                  <a href="javascript:void(0)" @click="pickDepItem(scope.$index,scope.row)"
+                <!-- <a href="javascript:void(0)" type="primary" @click="pickDepItem(scope.$index,scope.row)"
                     >选择</a
+                > -->
+                    <c-button
+                        style="margin-left: 0"
+                        size="small"
+                        type="primary"
+                        @click="pickDepItem(scope.$index,scope.row)"
                         >
+                        选择
+                    </c-button>
                 </template>
             </el-table-column>
             </c-istream-table>
           </el-dialog>
-
-        <!-- <c-col :span="2">
-          <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
-            Del
-          </c-button>
-        </c-col> -->
-      <!-- </c-row> -->
-    </c-col>
-    <!-- <c-col :span="24"><div style="height: 10px"></div></c-col> -->
-
+    </template>
     <c-col :span="23" style="margin-left: 9px;">
       <c-table
         :border="true"
@@ -322,6 +331,7 @@
 import Api from "~/service/Api";
 import CommonProcess from "~/mixin/CommonProcess";
 import CodeTable from "~/config/CodeTable";
+import Utils from "~/utils/index"
 
 export default {
   inject: ["root"],
@@ -358,7 +368,11 @@ export default {
         //const that = this.root;
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
+            if(typeof(rtnmsg.data.vals) != "undefined"){
                 this.stmData.data = rtnmsg.data.vals.rows;
+            }else{
+                this.stmData.data = [];
+            }
             this.dialogTableVisible = true;
         }
         else {

src/views/Review/Business/ReviewBdtset.vue

+<template>
+  <ReviewWrapper>
+    <Bdtset></Bdtset>
+  </ReviewWrapper>
+</template>
+
+<script>
+import Bdtset from "~/views/Business/Bdtset";
+import { ReviewWrapper } from "~/components/gj-common.min.js";
+
+export default {
+  name: "ReviewBdtset",
+  components: { ReviewWrapper, Bdtset },
+  created() {},
+  mounted() {},
+};
+</script>
+
+<style></style>

src/views/Review/Business/ReviewDitdck.vue

+<template>
+  <ReviewWrapper>
+    <Ditdck></Ditdck>
+  </ReviewWrapper>
+</template>
+
+<script>
+import Ditdck from "~/views/Business/Ditdck";
+import { ReviewWrapper } from "~/components/gj-common.min.js";
+
+export default {
+  name: "ReviewDitdck",  
+  components: { ReviewWrapper, Ditdck },
+  created() {},
+  mounted() {},
+};
+</script>
+
+<style></style>

src/views/Review/ReviewRouter.js

 import ReviewDitopn from "./Business/ReviewDitopn.vue";
+import ReviewDitdck from "./Business/ReviewDitdck.vue";
+import ReviewBdtset from "./Business/ReviewBdtset.vue";
 
 const ReviewRouter = [
   { path: "ditopn", component: ReviewDitopn, name: "ReviewDitopn", meta: { title: "复核-买方信用证开立" } },
+  { path: "ditdck", component: ReviewDitdck, name: "ReviewDitdck", meta: { title: "复核-买方信用证到单" } },
+  { path: "bdtset", component: ReviewBdtset, name: "ReviewBdtset", meta: { title: "复核-买方信用证付款" } },
 ];
 
 export default ReviewRouter;