Merge branch 'master' into 'dev'

# Conflicts:
#   xichongSys/src/utils/global.js

xichongSys/src/router/index.js

@@ -10,12 +10,12 @@ import api from '@/http/api'
 import store from '@/store'
 import { getIFramePath, getIFrameUrl } from '@/utils/iframe'
 import Table from '@/views/Myvue/table'
-import Cbdj from '@/views/Myvue/Cbdj'
+import Cbdj from '@/views/Myvue/insuredReg'
 import Flow from '@/views/Myvue/flow'
-import shrecord from '@/views/Myvue/shrecord'
+import shrecord from '@/views/Myvue/examRecord'
 import drcbdj from "@/views/Myvue/drcbdj"
-import xxbg from "@/views/Myvue/xxbg"
-import Record from "@/views/Myvue/rzrecord"
+import xxbg from "@/views/Myvue/infoChange"
+import Record from "@/views/Myvue/authRecord"
 import Newsupdata from "@/views/Myvue/newsupdata"
 import drxxbg from "@/views/Myvue/drxxbg";
 import drdysq from "@/views/Myvue/drdysq";
@@ -78,7 +78,7 @@ const router = new Router({
           component: drxxbg
         },
         {
-          path:"/modifyidcard",
+          path:"/modifybankcard",
           name:"银行卡变更",
           component: dryhkbg
         },

xichongSys/src/views/Myvue/drdcbg.vue

@@ -66,26 +66,26 @@
     methods: {
       toPdf(s, d) {
         console.log(d)
-        // axios.get(baseUrl + '/exportPdf/insuredRegistration?id=' + d.eventId, {
-        //   headers: {
-        //     "token": Cookies.get("token")
-        //   },
-        //   responseType: 'blob'      //告诉服务器我们需要的响应格式
-        // })
-        //   .then(res => {
-        //     let a = document.createElement("a");
-        //     let blob = new Blob([res.data], {
-        //       type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
-        //     });
-        //     a.href = URL.createObjectURL(blob);  //生成一个url
-        //     a.download = "西充县城乡居民社会养老保险参保登记表.pdf";
-        //     a.click();
-        //     // let objectUrl = URL.createObjectURL(blob);  //生成一个url
-        //     // window.location.href = objectUrl;   //浏览器打开这个url
-        //   })
-        //   .catch(err => {
-        //     console.log(err);
-        //   });
+        axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
+          headers: {
+            "token": Cookies.get("token")
+          },
+          responseType: 'blob'      //告诉服务器我们需要的响应格式
+        })
+          .then(res => {
+            let a = document.createElement("a");
+            let blob = new Blob([res.data], {
+              type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
+            });
+            a.href = URL.createObjectURL(blob);  //生成一个url
+            a.download = "西充县城乡居民社会养老保险信息变更登记表.pdf";
+            a.click();
+            // let objectUrl = URL.createObjectURL(blob);  //生成一个url
+            // window.location.href = objectUrl;   //浏览器打开这个url
+          })
+          .catch(err => {
+            console.log(err);
+          });
       },
       current_change(s) {
         var data = {

xichongSys/src/views/Myvue/drxxbg.vue

@@ -87,26 +87,26 @@
     methods: {
       toPdf(s, d) {
         console.log(d)
-        // axios.get(baseUrl + '/exportPdf/insuredRegistration?id=' + d.eventId, {
-        //   headers: {
-        //     "token": Cookies.get("token")
-        //   },
-        //   responseType: 'blob'      //告诉服务器我们需要的响应格式
-        // })
-        //   .then(res => {
-        //     let a = document.createElement("a");
-        //     let blob = new Blob([res.data], {
-        //       type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
-        //     });
-        //     a.href = URL.createObjectURL(blob);  //生成一个url
-        //     a.download = "西充县城乡居民社会养老保险参保登记表.pdf";
-        //     a.click();
-        //     // let objectUrl = URL.createObjectURL(blob);  //生成一个url
-        //     // window.location.href = objectUrl;   //浏览器打开这个url
-        //   })
-        //   .catch(err => {
-        //     console.log(err);
-        //   });
+        axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
+          headers: {
+            "token": Cookies.get("token")
+          },
+          responseType: 'blob'      //告诉服务器我们需要的响应格式
+        })
+          .then(res => {
+            let a = document.createElement("a");
+            let blob = new Blob([res.data], {
+              type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
+            });
+            a.href = URL.createObjectURL(blob);  //生成一个url
+            a.download = "西充县城乡居民社会养老保险信息变更登记表.pdf";
+            a.click();
+            // let objectUrl = URL.createObjectURL(blob);  //生成一个url
+            // window.location.href = objectUrl;   //浏览器打开这个url
+          })
+          .catch(err => {
+            console.log(err);
+          });
       },
       current_change(s) {
         var data = {

xichongSys/src/views/Myvue/dryhkbg.vue

@@ -66,26 +66,26 @@
     methods: {
       toPdf(s, d) {
         console.log(d)
-        // axios.get(baseUrl + '/exportPdf/insuredRegistration?id=' + d.eventId, {
-        //   headers: {
-        //     "token": Cookies.get("token")
-        //   },
-        //   responseType: 'blob'      //告诉服务器我们需要的响应格式
-        // })
-        //   .then(res => {
-        //     let a = document.createElement("a");
-        //     let blob = new Blob([res.data], {
-        //       type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
-        //     });
-        //     a.href = URL.createObjectURL(blob);  //生成一个url
-        //     a.download = "西充县城乡居民社会养老保险参保登记表.pdf";
-        //     a.click();
-        //     // let objectUrl = URL.createObjectURL(blob);  //生成一个url
-        //     // window.location.href = objectUrl;   //浏览器打开这个url
-        //   })
-        //   .catch(err => {
-        //     console.log(err);
-        //   });
+        axios.get(baseUrl + '/exportPdf/informationChange?id=' + d.eventId, {
+          headers: {
+            "token": Cookies.get("token")
+          },
+          responseType: 'blob'      //告诉服务器我们需要的响应格式
+        })
+          .then(res => {
+            let a = document.createElement("a");
+            let blob = new Blob([res.data], {
+              type: 'application/vnd.ms-excel'      //将会被放入到blob中的数组内容的MIME类型
+            });
+            a.href = URL.createObjectURL(blob);  //生成一个url
+            a.download = "西充县城乡居民社会养老保险信息变更登记表.pdf";
+            a.click();
+            // let objectUrl = URL.createObjectURL(blob);  //生成一个url
+            // window.location.href = objectUrl;   //浏览器打开这个url
+          })
+          .catch(err => {
+            console.log(err);
+          });
       },
       current_change(s) {
         var data = {

xichongSys/src/views/Myvue/flow.vue

@@ -2,7 +2,7 @@
 <div>
   <div class="op">
  
-<el-button type="primary" @click="showadd" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
+<el-button type="primary" @click="showadd(1)" size="mini" style="background:#148A9B;margin-left:10px" icon="el-icon-circle-plus-outline">新增</el-button>
  
 </div>
   <el-table
@@ -45,7 +45,7 @@
           slot="reference"
           @click="handle(scope.$index, scope.row)">详情</el-button>
           </el-popover>
-       <el-button type="primary" size="mini" style="background:#148A9B" icon="el-icon-edit-outline">修改</el-button>
+       <el-button type="primary" size="mini" style="background:#148A9B" @click="showadd(2,scope.row)" icon="el-icon-edit-outline">修改</el-button>
       </template>
     </el-table-column>
   </el-table>
@@ -60,7 +60,7 @@
     </el-pagination>
    
    <el-dialog
-  title="新增流程"
+  :title="flowTitle"
   :visible.sync="dialogVisible"
   width="60%"
  
@@ -93,7 +93,7 @@
   <div class="iii" v-show="showiii"></div>
   <span slot="footer" class="dialog-footer">
     <el-button @click="del">取 消</el-button>
-    <el-button type="primary" @click="addflow">确 定</el-button>
+    <el-button type="primary" @click="addflow(1)">确 定</el-button>
   </span>
 </el-dialog>
   </div>
@@ -133,19 +133,11 @@
   export default {
        data() {
       return {
+        flowTitle:"",
         showiii:false,
         //标题
         title:"",
-        titleList:[{
-          label:"参保登记审核流程",
-          value:"1,参保登记审核流程"
-        },{
-          label:"信息变更审核流程",
-          value:"2,信息变更审核流程"
-        },{
-          label:"待遇申请审核流程",
-          value:"3,待遇申请审核流程"
-        }],
+        titleList:[],
         flowname:"",
         dialogVisible: false,
         step:'',
@@ -155,21 +147,76 @@
         info:'',
         tableData: [],
          options: [],
-        value: []
+        value: [],
+        oldvalue:[],
+        flaa:""
       }
     },
     methods:{
+      //加载流程列表
+      loadFlow(){
+          this.$api.getlist.selectflowlist().then((res) => {
+          this.tableData=res.data
+          console.log(this.tableData)
+        
+        }).catch((res) => {
+          
+        });
+      },
       current_change(s){
 
       },
       toshow(s){
         this.showiii=s
+        
       },
       del(){
         this.dialogVisible = false
       },
       //获取流程
-      showadd(){
+      showadd(s,d){
+        this.value=[]
+        this.oldvalue=[]
+        console.log(d)
+        if(s==1){
+          this.flowTitle="新增流程"
+          this.titleList=[{
+          label:"参保登记审核流程",
+          value:"1,参保登记审核流程"
+        },{
+          label:"信息变更审核流程",
+          value:"2,信息变更审核流程"
+        },{
+          label:"待遇申请审核流程",
+          value:"3,待遇申请审核流程"
+        }]
+        }else if(s==2){
+          this.titleList=[{
+             label:d.flowname,
+             value:d.type+","+d.flowname
+          }]
+          this.title=d.type+","+d.flowname
+            this.flowTitle="修改流程"
+        var par={
+           type:d.type
+         }
+         
+        this.$api.getlist.selectRoleinfo(par).then((res) => {
+         
+          var dd=0
+          
+         for(dd in res.data){
+            this.oldvalue.push(res.data[dd].id)
+           this.value.push(res.data[dd].id)
+         
+         }
+        
+        }).catch((res) => {
+          
+        });
+          
+        }
+        this.flaa=s
         this.options=[]
         this.dialogVisible = true
           this.$api.getlist.selectRoleName().then((res) => {
@@ -177,7 +224,7 @@
          for(var i in res.data){
            this.options.push({
              label:res.data[i].name,
-             value:res.data[i].name
+             value:res.data[i].id
            })
          }
          }else{
@@ -188,9 +235,14 @@
           
         });
       },
-      //新增流程
-       addflow() {
+      //新增更新流程
+      addflow(){
+        
+        this.addflows(this.flaa)
+      },
+       addflows(s) {
       console.log(this.value)
+        if(s==1){
         for(var d in this.tableData){
           
           
@@ -198,19 +250,32 @@
             this.$message.error('流程已存在,请选择其它流程!');
             return
           }
+        
+        }
+        }else{
+         
+          if(this.oldvalue.toString()==this.value.toString()){
+            this.$message.error('流程不能与原流程相同!');
+            return
+          }
+        }
           var par={
             type:this.title.split(",")[0],
             flowName:this.title.split(",")[1],
-            roleIds:"",
-            state:1
+            roleIds:this.value.join(","),
+            state:s
           }
           this.$api.getlist.insertFolwCourse(par).then((res) => {
-          
+          if(res.code==200){
+              this.loadFlow()
+             this.$message.success('操作成功');
+          }else{
+            this.$message.error(res.message);
+          }
         
         }).catch((res) => {
-          
+          this.$message.error('操作失败');
         });
-        }
         this.dialogVisible = false
        
       },
@@ -232,13 +297,8 @@
        
     },
     created(){
-       
-          this.$api.getlist.selectflowlist().then((res) => {
-          this.tableData=res.data
+       this.loadFlow()
         
-        }).catch((res) => {
-          
-        });
     }
   }