Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/components/FunctionBtn.vue

@@ -88,10 +88,10 @@ export default {
 
     // },
     start: async function() {
-      this.handleSubmit && (await this.handleSubmit());
+      this.handleSubmit && (await this.handleSubmit('bopbut.sav'));
     },
     check: async function() {
-      this.handleCheck && (await this.handleCheck());
+      this.handleCheck && (await this.handleCheck('bopbut.chk'));
     },
     save: async function() {
       this.handleStash && (await this.handleStash());

src/mixin/commonFuncs.js

@@ -3,8 +3,14 @@ import Utils from "~/utils";
 export default {
   methods: {
 		// 表单提交
-    async handleSubmit() {
-      let result = await this.save();
+    async handleSubmit(rulePath) {
+      let result;
+      if(rulePath==""){
+        result = await this.save();
+      }else{
+        result = await this.executeRule(rulePath);
+      }
+      // let result = await this.save();
       if (result.respCode == SUCCESS && Object.keys(result.fieldErrors).length == 0) {
         this.$notify({
           title: "成功",
@@ -111,8 +117,14 @@ export default {
       }
     },
 		// 表单校验
-    async handleCheck() {
-      let result = await this.checkAll();
+    async handleCheck(rulePath) {
+      let result;
+      if(rulePath==""){
+        result = await this.checkAll();
+      }else{
+        result = await this.executeRule(rulePath);
+      }
+      //  let result = await this.checkAll();
       if (result.respCode == SUCCESS) {
         const fieldErrors = result.fieldErrors;
         this.updateModel(result.data);

src/views/Business/Dbcadd/Basp.vue

@@ -19,7 +19,6 @@
             style="width: 100%"
             placeholder="请选择操作类型"
             :code="codes.actiontype"
-            disabled
           >
           </c-select>
         </el-form-item>
@@ -214,7 +213,6 @@
               v-model="model.recgrp.bas.custcod" 
               maxlength="18"
               placeholder="请输入组织机构代码"
-              disabled
           ></c-input>
           <template slot="footer">
             <c-checkbox

src/views/Business/Dbcadd/index.vue

@@ -35,6 +35,7 @@
         :handleCheck="handleCheck"
         :handleStash="handleStash"
       >
+      <!-- ('bopbut.chk') -->
       </c-function-btn>
     </c-page>
   </div>

src/views/Statics/StaticsRouter.js

@@ -20,6 +20,12 @@ import Dbacty from "./Dbacty";
 import Dbecty from "./Dbecty";
 import Dbdcty from "./Dbdcty";
 
+import Inffec from "./Inffec";
+import Dbifec from "./Dbifec";
+import Dbafec from "./Dbafec";
+import Dbefec from "./Dbefec";
+import Dbdfec from "./Dbdfec";
+
 const StaticsRouter = [
     { path: 'infpty', component: Infpty, name: 'StaticsInfpty', meta: { title: '客户查询' } },
     { path: 'dbapty', component: Dbapty, name: 'StaticsDbapty', meta: { title: '客户新增' } },
@@ -43,6 +49,12 @@ const StaticsRouter = [
     { path: 'dbicty/:inr', component: Dbicty, name: 'StaticsDbicty', meta: { title: (tag) => { return '国家代码详情: ' + tag.params.inr } } },
     { path: 'dbecty/:inr', component: Dbecty, name: 'StaticsDbecty', meta: { title: (tag) => { return '国家代码修改: ' + tag.params.inr } } },
     { path: 'dbdcty/:inr', component: Dbdcty, name: 'StaticsDbdcty', meta: { title: (tag) => { return '国家代码删除: ' + tag.params.inr } } },
+
+    { path: 'inffec', component: Inffec, name: 'StaticsInffec', meta: { title: '费率查询' } },
+    { path: 'dbafec', component: Dbafec, name: 'StaticsDbafec', meta: { title: '费率新增' } },
+    { path: 'dbifec/:inr', component: Dbifec, name: 'StaticsDbifec', meta: { title: (tag) => { return '费率详情: ' + tag.params.inr } } },
+    { path: 'dbefec/:inr', component: Dbefec, name: 'StaticsDbefec', meta: { title: (tag) => { return '费率修改: ' + tag.params.inr } } },
+    { path: 'dbdfec/:inr', component: Dbdfec, name: 'StaticsDbdfec', meta: { title: (tag) => { return '费率删除: ' + tag.params.inr } } },
 ] 
 
 export default StaticsRouter