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

src/mixin/commonProcess.js

@@ -222,7 +222,6 @@ export default {
           msg = (ms ? ms + '\r\n' : '') + msg
         }
         _.set(this.model, modelUrl[k], msg);
-        this[modelUrl[k]] = msg
       }
     },
     /**

src/model/Ditopn/Event.js

@@ -116,7 +116,7 @@ export default {
         }
     },
     async onSetmodDet() {
-        let rtnmsg = await this.executeRule("setmod_det")
+        let rtnmsg = await this.executeRule("setmod.det")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
 

src/views/Business/Ditopn/Ovwp.vue

@@ -239,6 +239,7 @@
           <c-date-picker
             type="date"
             v-model="model.didgrp.rec.opndat"
+            value-format="yyyy-MM-dd"
             style="width: 95%"
             placeholder="请选择Date"
           ></c-date-picker>

src/views/Business/Ditopn/index.vue

@@ -149,8 +149,8 @@ import Engp from "./Engp";
 import Addbcb from "./Addbcb";
 import Limitbody from "./Limitbody";
 import Coninfp from "./Coninfp";
-import Ccvpan from "./Ccvpan";
 
+import Ccvpan from "~/views/Public/Ccvpan";
 import Glepan from "~/views/Public/Glepan";
 import Setpan from "~/views/Public/Setpan";
 import Docpan from "~/views/Public/Docpan";

src/views/Business/Letopn/Adcp.vue

 <template>
   <div class="eibs-tab">
-    <c-col :span="19">
+    <c-blkTextarea :model="model" v-bind="blk"> </c-blkTextarea>
+    <!-- <c-col :span="19">
       <el-form-item label="附加条件" prop="ledgrp.blk.adlcnd">
         <c-input
           type="textarea"
@@ -22,7 +23,7 @@
       >
         ...
       </c-button>
-    </c-col>
+    </c-col> -->
 
     <!-- Special payment conditions for beneficiary  -->
     <c-col :span="24" class="letopn_adcp_cheak">
@@ -75,13 +76,24 @@ import Api from "~/service/Api";
 import CommonProcess from "~/mixin/CommonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Letopn/Event";
+import BlkTextarea from "~/views/Public/BlkTextarea";
 
 export default {
   inject: ["root"],
   props: ["model", "codes"],
+  components: { "c-blkTextarea": BlkTextarea },
   mixins: [CommonProcess],
   data() {
-    return {};
+    return {
+      blk: {
+        blkMsg: {
+          title: "附加条件",
+          dataUrl: "ledgrp.blk.adlcnd", //字段所在model路劲
+          rows: 16,
+        },
+        rulePath: "letp.adlcnd.buttxmsel",
+      },
+    };
   },
   methods: { ...Event },
   created: function () {},

src/views/Public/Ccvpan.vue

 <template>
   <div class="eibs-tab">
+    <!--                                        
+       <c-col :span="12">
+        <el-form-item label="应付保证金金额">
+            <c-input  v-model="model.liaall.liaccv.concur" maxlength="3"  placeholder="请输入应付保证金金额"></c-input>
+        </el-form-item>
+       </c-col>
+       -->
     <c-col :span="12">
       <el-form-item label="合同金额" prop="liaall.liaccv.concur">
         <c-row :gutter="20">
+          <!--                <c-col :span="8">-->
+          <!--                    <c-input type="text" :readonly="true" value="CNY"></c-input>-->
+          <!--                </c-col>-->
           <c-col :span="8">
             <c-select
               v-model="model.liaall.liaccv.concur"
@@ -28,7 +38,18 @@
         </c-row>
       </el-form-item>
     </c-col>
-
+    <!--
+       <c-col :span="12">
+        <el-form-item label="合同金额">
+            <c-input  v-model="model.liaall.liaccv.newamt"  placeholder="请输入合同金额"></c-input>
+        </el-form-item>
+       </c-col>                                             
+       <c-col :span="12">
+        <el-form-item label="保证金应收比例">
+            <c-input  v-model="model.liaall.liaccv.cshpct"  placeholder="请输入保证金应收比例"></c-input>
+        </el-form-item>
+       </c-col>
+       -->
     <c-col :span="12">
       <el-form-item label="保证金应收比例" prop="liaall.liaccv.cshpct">
         <c-row>
@@ -42,9 +63,19 @@
       </el-form-item>
     </c-col>
 
+    <!--                                             
+       <c-col :span="12">
+        <el-form-item label="Reserved Amount">
+            <c-input  v-model="model.liaall.liaccv.newresamt"  placeholder="请输入Reserved Amount"></c-input>
+        </el-form-item>
+       </c-col>
+       -->
     <c-col :span="12">
       <el-form-item label="Reserved Amount" prop="liaall.liaccv.newresamt">
         <c-row :gutter="20">
+          <!--                <c-col :span="8">-->
+          <!--                    <c-input type="text" :readonly="true" value="CNY"></c-input>-->
+          <!--                </c-col>-->
           <c-col :span="8">
             <c-select
               v-model="model.liaall.liaccv.concur"
@@ -70,12 +101,21 @@
         </c-row>
       </el-form-item>
     </c-col>
-
+    <!--                            
        <c-col :span="12">
-      <el-form-item label="保证金实收比例" prop="liaall.misamt">
+        <el-form-item label="保证金实收比例">
+            <c-input  v-model="model.liaall.liaccv.relcshpct"  placeholder="请输入保证金实收比例"></c-input>
+        </el-form-item>
+       </c-col>
+       -->
+    <c-col :span="12">
+      <el-form-item label="保证金实收比例" prop="liaall.liaccv.relcshpct">
         <c-row>
           <c-col :span="8">
-            <c-input :readonly="true" v-model="model.liaall.misamt"></c-input>
+            <c-input
+              :readonly="true"
+              v-model="model.liaall.liaccv.relcshpct"
+            ></c-input>
           </c-col>
           <c-col :span="12" style="margin-left: 20px">
             <span>%</span>
@@ -84,9 +124,28 @@
       </el-form-item>
     </c-col>
 
+    <!--                            
+       <c-col :span="12">
+	    <c-checkbox v-model="model.liaall.liaccv.gleflg">Create gle flag</c-checkbox>
+       </c-col> 
+                                   
+       <c-col :span="12">
+        <el-form-item label="reserve amount based percent">
+            <c-input  v-model="model.liaall.liaccv.pctresamt"  placeholder="请输入reserve amount based percent"></c-input>
+        </el-form-item>
+       </c-col>                 
+                  
+       <c-col :span="12">
+	    <c-checkbox v-model="model.liaall.liaccv.chgcurflg">Change currency flag</c-checkbox>
+       </c-col> 
+       -->
+
     <c-col :span="12">
       <el-form-item label="应付保证金金额" prop="liaall.liaccv.concur">
         <c-row :gutter="20">
+          <!--                <c-col :span="8">-->
+          <!--                    <c-input type="text" :readonly="true" value="CNY"></c-input>-->
+          <!--                </c-col>-->
           <c-col :span="8">
             <c-select
               v-model="model.liaall.liaccv.concur"
@@ -112,10 +171,22 @@
         </c-row>
       </el-form-item>
     </c-col>
+    <!--
+       <c-col :span="12">
+        <c-button size="small" type="primary"  @click="openMask">
+            Add
+        </c-button>
+       </c-col>
                   
+       <c-col :span="12">
+        <c-button size="small"  icon="el-icon-delete" @click="onLiaccvDel">
+            Del
+        </c-button>
+       </c-col>
+       -->
     <c-col :span="24" style="text-align: right">
       <c-row>
-        <c-col :span="2" :offset="19">
+        <c-col :span="2" :offset="20">
           <c-button size="small" type="primary" @click="onLiaccvAdd">
             Add
           </c-button>
@@ -136,13 +207,11 @@
           </el-dialog>
         </c-col>
 
-        <c-col :span="2">
-          <template slot-scope="scope">
-          <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel(scope.$index,scope.row)">
+        <!-- <c-col :span="2">
+          <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
             Del
           </c-button>
-          </template>
-        </c-col>
+        </c-col> -->
       </c-row>
     </c-col>
 
@@ -154,7 +223,7 @@
         :list="model.liaall.liaccv.liaccvg"
         style="width:80%,text-align:center"
       >
-        <el-table-column prop="ccdflg" label="CFO" width="auto">
+        <el-table-column prop="ccdflg" label="CF000048" width="auto">
         </el-table-column>
         <el-table-column prop="ownref" label="保证金编号" width="auto">
         </el-table-column>
@@ -172,9 +241,45 @@
         </el-table-column>
         <el-table-column prop="covamt" label="折算后金额" width="auto">
         </el-table-column>
+        <el-table-column prop="acccovamt" label="Acc Amount" width="auto">
+        </el-table-column>
+        <el-table-column label="OP" width="auto">
+          <template slot-scope="scope">
+            <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel(scope.$index,scope.row)" />
+          </template>
+        </el-table-column>
       </c-table>
     </c-col>
 
+    <!-- <c-col :span="12">
+      <el-form-item label="Amount Covered">
+        <c-row>
+          <c-col :span="8">
+            <c-select
+              v-model="model.liaall.liaccv.concur"
+              disabled
+              style="width: 100%"
+              placeholder="请选择Type of settlement"
+            >
+              <el-option
+                v-for="item in codes.curtxt"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </c-select>
+          </c-col>
+          <c-col :span="14">
+            <c-input
+              v-model="model.liaall.liaccv.totcovamt"
+              :readonly="true"
+            ></c-input>
+          </c-col>
+        </c-row>
+      </el-form-item>
+    </c-col> -->
+
     <c-col :span="24">
       <el-form-item label="金额总和">
         <c-col :span="8">
@@ -191,7 +296,7 @@
       <el-form-item label="Additional Information ">
         <c-input
           type="textarea"
-          rows="5"
+          :rows="5"
           v-model="model.liaall.liaccv.addinf"
           maxlength="200"
           show-word-limit
@@ -216,12 +321,12 @@ export default {
       dialogTableVisible: false,
       stmData: {
         columns: [
-          '1 1:1 "Ref." 120',
+          '1 1:1 "Ref" 120',
           '2 2:1 "User" 80',
           '3 3:1 "Applicant" 196',
           '4 4:1 "Account" 120',
           '5 5:1 "Cur" 50',
-          '6 6:1 "Amount" 80 2 0 1 18.3',
+          '6 6:1 "Amt" 80 2 0 1 18.3',
           '7 7:1 "Open date" 80 4 7',
           '8 8:1 "flg" 40',
           '9 9:1 "Remarks" 180',

src/views/Public/Setpan.vue

@@ -4,7 +4,7 @@
         <c-col :span="6" style="margin-left:9px">
             <el-form-item label="参考号" label-width="50px">
                 <c-input
-                    v-model="model.setmod.ref"
+                    v-model="model.didgrp.rec.ownref"
                     maxlength="16"
                     :readonly="true"
                     placeholder="请输入our reference"