humingbo пре 2 година
родитељ
комит
373819f634
2 измењених фајлова са 53 додато и 9 уклоњено
  1. 15 1
      src/api/file/file.js
  2. 38 8
      src/views/enforceflow/enforceflow.vue

+ 15 - 1
src/api/file/file.js

@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+let domain = 'http://localhost:10050';
+
 /**
  * 上传文件
  * @param data
@@ -12,7 +14,19 @@ export function uploadFile(data){
     data:data
   })
 }
-let domain = 'http://localhost:10050';
+
 export function uploadFileUrl(){
   return  domain+'/api/oa/file/uploadFile';
 }
+
+/**
+ * 删除文件
+ * @param id
+ * @returns {*}
+ */
+export function deleteFile(id){
+  return request({
+    url: '/api/oa/file/delete?id='+id,
+    method: 'get'
+  })
+}

+ 38 - 8
src/views/enforceflow/enforceflow.vue

@@ -10,7 +10,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属系统:">
-        <el-select size="small"  clearable filterable v-model="formInline.hsytem" placeholder="请选择医院" >
+        <el-select size="small"  clearable filterable v-model="formInline.hsytem" placeholder="请选择系统" >
           <el-option  v-for="(item,index) in hsytem" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
@@ -187,10 +187,38 @@
     </el-dialog>
 
     <el-dialog title="实施详情"  :visible.sync="enforceFlowVisble" width="85%" @click="enforceFlowDialog">
-      <el-steps :active="maxStep" finish-status="success">
-        <el-step :title="item.stepTitle"  v-for="(item,index) in enforceFLows" :description="item.remark">
-        </el-step>
-      </el-steps>
+      <el-table
+        border
+        :data="enforceTableData"
+        stripe
+        style="width: 100%;margin-bottom: 25px" size="mini">
+        <el-table-column  type="index" label="序号" width="60" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="stepTitle"
+          label="步骤名称"
+          width="180" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="director"
+          label="执行人" align="center"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          prop="remark"
+          label="备注">
+        </el-table-column>
+        <el-table-column
+          prop="createTime" align="center"
+          label="创建时间" width="180">
+        </el-table-column>
+        <el-table-column
+          prop="completionTime" align="center"
+          label="完成时间" width="180">
+        </el-table-column>
+        <el-table-column prop="files" label="文件"  width="230">
+        </el-table-column>
+      </el-table>
     </el-dialog>
 
   </div>
@@ -265,8 +293,8 @@ export default {
         show:false
       },
       enforceFLows:[],
-      maxStep:0
-
+      maxStep:0,
+      enforceTableData:[]
     }
   },
   // 注册组件
@@ -347,11 +375,11 @@ export default {
       })
     },
     getEnforceDetail(row){
-      alert(JSON.stringify(row))
       let id=row.id;
       getEnforceFlowsByEnforceId(id).then(response => {
          this.enforceFLows=response.data.dtos;
          this.maxStep = response.data.maxStep
+         this.enforceTableData=response.data.dtos
 
       })
       this.enforceFlowVisble=true
@@ -394,6 +422,7 @@ export default {
         });
       })
       this.closeEnforceDialog();
+      this.resetSearch();
 
     },
     closeUserDialog(){
@@ -432,6 +461,7 @@ export default {
       this.enforceFlowVisble=false
     }
 
+
   }
 }
 </script>