Merge branch 'master' of ssh://ops.weface.com.cn:8022/zhangdishen/xichonght into dev

xichongSys/src/http/moudules/getlist.js

@@ -44,6 +44,13 @@ export const selectRoleinfo = (params) => {
         params
     })
 }
+export const selectRoleremark = (params) => {
+  return axios({
+      url: '/role/selectRoleremark2',
+      method: 'get',
+      params
+  })
+}
 export const progress = (params) => {
     return axios({
         url: '/examine/progressView',

xichongSys/src/utils/global.js

@@ -10,8 +10,8 @@
 //export const baseUrl ="http://faceauth.weface.com.cn:98"
 //export const baseUrl2 = 'http://faceauth.weface.com.cn:97'
 //export const baseUrl = 'http://172.16.10.33:9002'
-//export const baseUrl = 'http://172.16.10.25:9002'
-export const baseUrl ="http://172.16.10.33:9002"
+export const baseUrl = 'http://172.16.10.25:9002'
+//export const baseUrl ="http://172.16.10.33:9002"
 //export const baseUrl2 = 'http://172.16.10.25:9999'
 //export const baseUrl = 'http://172.16.10.25:9002'
 //export const baseUrl ="http://172.16.10.33:9002"

xichongSys/src/views/Myvue/application.vue

@@ -303,6 +303,9 @@ export default {
 /* .headCon{
     
 } */
+.block{
+  width: 23%
+}
 .headImg img{
     width: 100%
 }

xichongSys/src/views/Myvue/flow.vue

@@ -257,20 +257,17 @@ this.$api.getlist.selectflowState(data).then((res) => {
       //获取流程
       showadd(s,d){
         this.value=[]
+         this.titleList=[]
         this.oldvalue=[]
         console.log(d)
         if(s==1){
           this.flowTitle="新增流程"
-          this.titleList=[{
-          label:"参保登记审核流程",
-          value:"1,参保登记审核流程"
-        },{
-          label:"信息变更审核流程",
-          value:"2,信息变更审核流程"
-        },{
-          label:"待遇申请审核流程",
-          value:"3,待遇申请审核流程"
-        }]
+         for(var i =1;i<=6;i++){
+           this.titleList.push({
+             label:this.getType(i),
+             value:i+","+this.getType(i)
+           })
+         }
         }else if(s==2){
           this.titleList=[{
              label:d.flowname,
@@ -278,11 +275,10 @@ this.$api.getlist.selectflowState(data).then((res) => {
           }]
           this.title=d.type+","+d.flowname
             this.flowTitle="修改流程"
-        var par={
-           type:d.type
+       var par={
+           flowNo:d.flowNo
          }
-         
-        this.$api.getlist.selectRoleinfo(par).then((res) => {
+        this.$api.getlist.selectRoleremark(par).then((res) => {
          
           var dd=0
           
@@ -365,9 +361,9 @@ this.$api.getlist.selectflowState(data).then((res) => {
       },
        handle(s,d){
          var par={
-           type:d.type
+           flowNo:d.flowNo
          }
-        this.$api.getlist.selectRoleinfo(par).then((res) => {
+        this.$api.getlist.selectRoleremark(par).then((res) => {
           this.step=res.data
          console.log( this.step)
         

xichongSys/src/views/Myvue/infoChange.vue

@@ -399,15 +399,15 @@ export default {
   overflow: hidden;
   margin-bottom: 40px
 }
+.block{
+  width: 23%
+}
 .block{
   float: left;
   height: 100%;
   margin-right: 20px
 }
-.block img{
-  width: auto;
-  height: 300px;
-}
+
 .imtil{
   padding:0 0 20px 0
 }

xichongSys/src/views/Myvue/insuredReg.vue

@@ -316,15 +316,14 @@ export default {
   overflow: hidden;
   margin-bottom: 40px
 }
+.block{
+  width: 23%
+}
 .block{
   float: left;
   height: 100%;
   margin-right: 20px
 }
-.block img{
-  width: auto;
-  height: 300px;
-}
 .imtil{
   padding:0 0 20px 0
 }