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

src/views/Business/Infdid/Fepinfp.vue

@@ -184,12 +184,12 @@ export default {
                         "3 1 \"Fee Code\" 0 ",
                         "4 2 \"Fee Text\" 0 ",
                         "11 3 \"Disposition\" 0 ",
-                        "1 4 \"Role\" 0 ",
+                        "12 4 \"Role\" 0 ",
                         "5 5 \"Cur\" 0 ",
                         "6 6 \"Amount\" 0 ",
-                        "1 7 \"Transaction/INR\" 0 ",
+                        "9 7 \"Transaction/INR\" 0 ",
                         "7 8 \"Entry Date\" 0 ",
-                        "1 9 \"Status\" 0 ",
+                        "10 9 \"Status\" 0 ",
                     ],
                     fepstmData: [
 
@@ -248,7 +248,8 @@ export default {
         }
     },
     created:function(){
-
+        this.getInfconFcpfeecod();
+        this.getInfconFepfeecod();
     }
 }
 </script>

src/views/Business/Infdid/Infsea.vue

@@ -647,11 +647,11 @@ export default {
             let rtnmsgNew = await this.executeRule("infbut.dsp", params); 
             if(rtnmsgNew.respCode = SUCCESS){
               Utils.copyValueFromVO(this.model, rtnmsgNew.data);
-              // params = {selDst:"infcon.objinr",selIds:[idx+1]}
-              // let rtnmsgObjinr = await this.executeDefault("infcon.objinr", params); 
-              // if(rtnmsgObjinr.respCode = SUCCESS){
-              //   Utils.copyValueFromVO(this.model, rtnmsgObjinr.data);
-              // }
+              params = {selDst:"infcon.objinr",selIds:[idx+1]}
+              let rtnmsgObjinr = await this.executeDefault("infcon.objinr", params); 
+              if(rtnmsgObjinr.respCode = SUCCESS){
+                Utils.copyValueFromVO(this.model, rtnmsgObjinr.data);
+              }
             }
           }
           //触发父组件中updateShowPanel 事件，修改index中showPanel ，控制 index中组件的显示和隐藏

src/views/Business/Infdid/index.vue

@@ -192,7 +192,7 @@ export default {
           if (!!rulePath) {
           this.executeRule(rulePath).then(res => {
                if (res.respCode == SUCCESS) {
-               this.updateModel(res.data)
+                 this.updateModel(res.data);
                }
           })
           }