''

xichongSys/src/http/moudules/getlist.js

@@ -147,3 +147,19 @@ export const listPayInfo = (data) => {
     data
   })
 }
+//领取人员查询
+export const getGrantList = (data) => {
+  return axios({
+    url: '/grantInfo/getGrantList',
+    method: 'post',
+    data
+  })
+}
+//流程详情
+export const selectRoleflowNo = (params) => {
+    return axios({
+      url: 'role/selectRoleflowNo',
+      method: 'get',
+      params
+    })
+  }

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/authRecord.vue

@@ -244,7 +244,7 @@ import defaultImg from "../../assets/defaultPicture.jpg"
           label:"100岁以上",
         }],
         //年龄计算方式
-        agemeth:"",
+        agemeth:"1",
         agemethList:[{
           value:"1",
           label:"按年计算",

xichongSys/src/views/Myvue/flow.vue

@@ -49,6 +49,51 @@
       </template>
     </el-table-column>
   </el-table>
+  <el-dialog title="已作废流程" :visible.sync="dialogTableVisible">
+  <el-table
+    :data="detableData"
+    style="width: 100%"
+   >
+     <el-table-column
+      type="index"
+      :index="indexMethod">
+      </el-table-column>
+    <el-table-column
+      prop="flowname"
+      label="名称"
+      width="180">
+    </el-table-column>
+    <el-table-column
+      prop="createby"
+      label="创建人">
+    </el-table-column>
+     <el-table-column
+      prop="createtime"
+      label="创建时间">
+    </el-table-column>
+     
+     <el-table-column label="操作">
+      <template slot-scope="scope">
+         <el-popover
+          placement="right"
+          width="200"
+          trigger="click">
+           <div class="step" style="height: 200px;">
+            <el-steps direction="vertical" :active="7">
+              
+              <el-step v-for="index in step" :key="step[index]" :title="index.name"></el-step>
+             
+            </el-steps>
+          </div>
+        <el-button
+          size="mini"
+          slot="reference"
+          @click="dehandle(scope.$index, scope.row)">详情</el-button>
+          </el-popover>
+      </template>
+    </el-table-column>
+  </el-table>
+</el-dialog>
   <el-pagination
   	class="pone"
       :page-size='10'
@@ -133,6 +178,7 @@
   export default {
        data() {
       return {
+        dialogTableVisible:false,
         flowTitle:"",
         showiii:false,
         //标题
@@ -146,6 +192,7 @@
         input:"",
         info:'',
         tableData: [],
+        detableData:[],
          options: [],
         value: [],
         oldvalue:[],
@@ -156,8 +203,8 @@
       //作废
       delet(){
 this.$api.getlist.selectflowState().then((res) => {
-          this.tableData=res.data
-          console.log(this.tableData)
+          this.detableData=res.data
+        this.dialogTableVisible=true
         
         }).catch((res) => {
           
@@ -301,9 +348,20 @@ this.$api.getlist.selectflowState().then((res) => {
          console.log( this.step)
         
         }).catch((res) => {
-          
+    
         });
         },
+        dehandle(s,d){
+          console.log(d)
+          var par={
+           flowNo:d.flowNo
+         }
+        this.$api.getlist.selectRoleflowNo(par).then((res) => {   
+        this.step=res.data
+        }).catch((res) => {
+          
+        });
+        }
        
     },
     created(){