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

src/views/Business/Diasel/Diaselp.vue

@@ -461,7 +461,7 @@ export default {
           '4 4 "提示信息" 270',
           '5 5 "待操作交易代码" 120',
           '6 6 "经办柜员" 100',
-          '7 7 "所属工作组" 200',
+          '7 7 "所属工作组" 0',
           // '8 8 "客户号" 1',
           // '9 9 "客户名称" 1',
           // '10 10 "币种" 1',

src/views/Business/Ditame/index.vue

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

src/views/Business/Ditdck/Litdckp.vue

@@ -148,7 +148,7 @@
       </c-col>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <el-form-item label="开证日期" prop="didgrp.rec.opndat">
           <c-date-picker
             type="date"
@@ -161,20 +161,20 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <!-- <span v-text="model.bdtp.zchday" data-path=".bdtp.zchday"> </span> -->
         <el-form-item label="最迟装运日期" prop="didgrp.rec.shpdat">
           <c-date-picker
             type="date"
             v-model="model.didgrp.rec.shpdat"
             disabled
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择最迟货物装运/服务提供日期"
           ></c-date-picker>
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
           <el-form-item label="到期日" prop="didgrp.rec.expdat">
             <c-date-picker
               type="date"
@@ -408,74 +408,74 @@
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <el-form-item label="到单日期" prop="bddgrp.rec.rcvdat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.rcvdat"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择到单日期"
           >
           </c-date-picker>
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <el-form-item label="交单日期" prop="bddgrp.rec.predat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.predat"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择交单日期"
           >
           </c-date-picker>
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <el-form-item label="通知日期" prop="bddgrp.rec.orddat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.orddat"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择通知日期"
           >
           </c-date-picker>
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
           <!-- label-width="110px" -->
         <el-form-item label="货物装运/服务提供日期" prop="bddgrp.rec.shpdat" >
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.shpdat"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择货物装运/服务提供日期"
           >
           </c-date-picker>
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <el-form-item label="远期起算日" prop="bddgrp.rec.stadat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.stadat"
             disabled
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择起算日"
           >
           </c-date-picker>
         </el-form-item>
       </c-col>
 
-      <c-col :span="24">
+      <c-col :span="13">
         <el-form-item label="运期到期日" prop="bddgrp.rec.matdat">
           <c-date-picker
             type="date"
             v-model="model.bddgrp.rec.matdat"
-            style="width: 100%"
+            style="width: 95%"
             placeholder="请选择到期日"
           >
           </c-date-picker>

src/views/Business/Trnrel/Inftrnps.vue

@@ -576,9 +576,9 @@ export default {
       this.relflgCodes = [
         { label: "ALL", value: "0" },   //待复核列表业务状态All
         { label: "Correct", value: "C" },
-        { label: "Closed", value: "M" },
-        { label: "Entered", value: "E" },
-        { label: "External", value: "X" },
+        // { label: "Closed", value: "M" },
+        // { label: "Entered", value: "E" },
+        // { label: "External", value: "X" },
         { label: "Picked up", value: "P" },
         { label: "Rejected", value: "N" },
         { label: "Waiting", value: "W" },