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

src/model/Ditopn/Default.js

@@ -268,7 +268,7 @@ function defaultDidgrpRecExpplc() {
 }
 function defaultDidgrpAdvPtsBankno(rule, value, callback) {
     const that = this;
-    that.executeRule("didgrp.adv.pts.bankno").then(res => {
+    that.executeRule("didgrp.adv.pts.bankno,didgrp.rec.avbwth").then(res => {
         //TODO
         callback()
     })

src/views/Business/Ditopn/Setpan.vue

@@ -179,7 +179,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="收款人摘要"
-                        ><el-input v-model="dialog.txtpay" />
+                        ><c-input v-model="dialog.txtpay" />
                     </el-form-item>
                     <el-form-item label="付款人">
                         <el-select v-model="dialog.ptydbt">
@@ -191,31 +191,32 @@
                             /> </el-select
                     ></el-form-item>
                     <el-form-item label="付款人摘要"
-                        ><el-input v-model="dialog.txtdbp" />
+                        ><c-input v-model="dialog.txtdbp" />
                     </el-form-item>
                     <el-form-item label="费用"
-                        ><el-select v-model="dialog.cur">
+                        ><c-select v-model="dialog.cur">
                             <el-option
                                 v-for="item in codes.cur"
                                 :key="item.value"
                                 :labelF="item.label"
                                 :value="item.value"
                             />
-                        </el-select>
-                        <el-input v-model="dialog.amt" style="width: 200px"
+                        </c-select>
+                        <c-input v-model="dialog.amt" style="width: 200px"
                     /></el-form-item>
 
                     <el-form-item label-width="10em">
-                        <el-checkbox v-model="dialog.forflg"
-                            >CG00005</el-checkbox
+                        <c-checkbox v-model="dialog.forflg"
+                            >CG00005</c-checkbox
                         >
                     </el-form-item>
                 </el-form>
                 <span slot="footer" class="dialog-footer">
-                    <el-button @click="dialogVisible = false">取 消</el-button>
                     <el-button type="primary" @click="saveDialog"
                         >确 定</el-button
                     >
+                    <el-button @click="dialogVisible = false">取 消</el-button>
+                    
                 </span>
             </el-dialog>
         </el-col>