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

src/mixin/commonProcess.js

@@ -115,6 +115,9 @@ export default {
       if (name === "limitbody") {
         rulePath = "liaall.limmod.limitbody"
       }
+      if (name === "ccvpan") {
+        rulePath = "liaall.liaccv.ccvpan"
+      }
       if (!!rulePath) {
         this.executeRule(rulePath).then(res => {
           if (res.respCode == SUCCESS) {

src/model/Ditopn/Event.js

@@ -208,9 +208,11 @@ export default {
             this.$notify.error({ title: '错误', message: '服务请求失败！' });
         }
     },
-    async onLiaccvDel() {
-        let rtnmsg = await this.executeRule("liaall.liaccv.del")
-        //const that = this.root;
+    async onLiaccvDel(index,row) {
+        const idx = index+1;
+        let rule = "liaall.liaccv.del";
+        let params = {selDst:"liaall.liaccv.liaccvg",selIdx:idx};
+        let rtnmsg = await this.executeRule(rule,params)
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
             debugger;

src/model/Ditopn/Pattern.js

@@ -622,7 +622,8 @@ export default {
     ],
     "liaall.liaccv.cshpct": [
         { type: "string", required: false, message: "必输项", trigger: "blur" },
-        { max: 5, message: "长度不能超过5", trigger: "blur" }
+        { max: 8, message: "整数位不能超过5位"},
+        { pattern: /(^\d{1,5}$)|(^\d{0,5}\.\d{1,2}$)/, message:"整数位不能超过5位，小数位不能超过2位",trigger:"blur"}
     ],
     "liaall.liaccv.newresamt": [
         { required: false, message: "必输项", trigger: "blur" },
@@ -631,7 +632,8 @@ export default {
     ],
     "liaall.liaccv.relcshpct": [
         { type: "string", required: false, message: "必输项" },
-        { max: 5, message: "长度不能超过5" }
+        { max: 8, message: "整数位不能超过5位"},
+        { pattern: /(^\d{1,5}$)|(^\d{0,5}\.\d{1,2}$)/, message:"整数位不能超过5位，小数位不能超过2位",trigger:"blur"}
     ],
 
     "liaall.liaccv.pctresamt": [

src/views/Business/Ditopn/Ccvpan.vue

@@ -244,8 +244,9 @@
         <el-table-column prop="acccovamt" label="Acc Amount" width="auto">
         </el-table-column>
         <el-table-column label="OP" width="auto">
-          <template slot-scope="">
-            <a href="javascript:void(0)" @click="onLiaccvDel()">删除</a>
+          <template slot-scope="scope">
+            <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel(scope.$index,scope.row)">
+            Del</c-button>
           </template>
         </el-table-column>
       </c-table>

src/views/Public/Ccvpan.vue

@@ -137,9 +137,11 @@
         </c-col>
 
         <c-col :span="2">
-          <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel">
+          <template slot-scope="scope">
+          <c-button size="small" icon="el-icon-delete" @click="onLiaccvDel(scope.$index,scope.row)">
             Del
           </c-button>
+          </template>
         </c-col>
       </c-row>
     </c-col>

src/views/Public/Setpan.vue

@@ -448,7 +448,7 @@ export default {
         },
         // 第二个表格
         detail1(index, row) {
-            this.executeDefault("det").then(res=>{
+            this.executeDefault("setfel/det").then(res=>{
                 this.dialogVisible = true;
                 this.dialog = row;
                 this.index = index;
@@ -464,7 +464,8 @@ export default {
         // 第三个表格
         detail2(index, row) {
             const that = this;
-            that.executeRule("det").then(res=>{
+            const rule = "setmod.setfeg.setfel("+(index+1)+").det";
+            that.executeRule(rule).then(res=>{
                 that.$refs.setpanDialog.visiable = true;
                 that.$refs.setpanDialog.formData = Object.assign({}, that.model.setmod.setfeg.setfel[index]);
                 that.index = index;