ysc 2 rokov pred
rodič
commit
7f03638331
2 zmenil súbory, kde vykonal 159 pridanie a 140 odobranie
  1. 156 137
      src/views/enforceflow/enforceflow.vue
  2. 3 3
      src/views/task/view.vue

+ 156 - 137
src/views/enforceflow/enforceflow.vue

@@ -5,13 +5,14 @@
         <el-input v-model="formInline.name" placeholder="项目名称"></el-input>
       </el-form-item>
       <el-form-item label="所属医院:">
-        <el-select size="mini"  clearable filterable v-model="formInline.hname" placeholder="请选择医院" >
-          <el-option  v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        <el-select size="mini" clearable filterable v-model="formInline.hname" placeholder="请选择医院">
+          <el-option v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="所属系统:">
-        <el-select size="mini"  clearable filterable v-model="formInline.hsytem" placeholder="请选择系统" >
-          <el-option  v-for="(item,index) in hsytem" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+        <el-select size="mini" clearable filterable v-model="formInline.hsytem" placeholder="请选择系统">
+          <el-option v-for="(item,index) in hsytem" :key="index" :label="item.dictLabel"
+                     :value="item.dictValue"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
@@ -23,7 +24,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="searchData()">查询</el-button>
-        <el-button icon="el-icon-refresh"  @click="resetSearch()">重置</el-button>
+        <el-button icon="el-icon-refresh" @click="resetSearch()">重置</el-button>
         <el-button type="success" icon="el-icon-plus" @click="createEnforceFlow()">创建实施</el-button>
       </el-form-item>
     </el-form>
@@ -33,25 +34,26 @@
       stripe
       size="mini"
       style="width: 100%">
-      <el-table-column  type="index" label="序号" width="60" align="center">
+      <el-table-column type="index" label="序号" width="60" align="center">
       </el-table-column>
       <el-table-column label="实施项目名称" prop="name" width="150" align="center">
       </el-table-column>
       <el-table-column label="实施内容" prop="content" align="center" :show-overflow-tooltip="true"></el-table-column>
-      <el-table-column label="实施负责人" prop="enforcer" width="100" align="center">
+      <el-table-column label="实施负责人" prop="enforcer" width="90" align="center">
       </el-table-column>
       <el-table-column label="实施医院" prop="hname" width="150" align="center">
       </el-table-column>
       <el-table-column label="实施日期" prop="time" width="180" align="center">
         <template slot-scope="scope">
-          <div>{{scope.row.beginTime}}——{{scope.row.endTime}}</div>
+          <div>{{ scope.row.beginTime }}——{{ scope.row.endTime }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="hsytem" label="所属系统" width="180" align="center">
+      <el-table-column prop="hsytem" label="所属系统" align="center">
       </el-table-column>
-      <el-table-column
-        prop="createTime"
-        label="创建时间" width="140" align="center">
+      <el-table-column prop="createTime" label="创建时间" width="130" align="center">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
       </el-table-column>
       <el-table-column prop="status" label="状态" width="80" align="center">
         <template slot-scope="scope">
@@ -62,10 +64,16 @@
       </el-table-column>
       <el-table-column label="操作" prop="op" width="250" align="center">
         <template slot-scope="scope">
-          <el-button size="mini" v-if="scope.row.status===0" type="primary" @click="startEnforceFlow(scope.row)">启动实施</el-button>
-          <el-button size="mini" v-if="scope.row.status===0" type="success" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button size="mini" v-if="scope.row.status===0" type="danger" @click="deleteEnforce(scope.row)">删除</el-button>
-          <el-button size="mini" v-if="scope.row.status!==0" type="primary" @click="getEnforceDetail(scope.row)">查看实施详情</el-button>
+          <el-button size="mini" v-if="scope.row.status===0" type="primary" @click="startEnforceFlow(scope.row)">
+            启动实施
+          </el-button>
+          <el-button size="mini" v-if="scope.row.status===0" type="success" @click="handleEdit(scope.row)">编辑
+          </el-button>
+          <el-button size="mini" v-if="scope.row.status===0" type="danger" @click="deleteEnforce(scope.row)">删除
+          </el-button>
+          <el-button size="mini" v-if="scope.row.status!==0" type="primary" @click="getEnforceDetail(scope.row)">
+            查看实施详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -73,22 +81,24 @@
 
 
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="40%" @click="closeDialog" :close-on-click-modal="false">
-      <el-form label-width="120px" :model="editForm" >
-        <el-form-item label="实施项目名称:" >
+    <el-dialog :title="title" :visible.sync="editFormVisible" width="40%" @click="closeDialog"
+               :close-on-click-modal="false">
+      <el-form label-width="120px" :model="editForm" size="mini">
+        <el-form-item label="实施项目名称:">
           <el-input size="mini" v-model="editForm.name"></el-input>
         </el-form-item>
         <el-form-item label="实施负责人:">
           <el-input size="mini" v-model="editForm.enforcer"></el-input>
         </el-form-item>
         <el-form-item label="实施医院:">
-          <el-select size="mini"  clearable filterable v-model="editForm.hname" placeholder="请选择医院" >
-              <el-option  v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictValue"></el-option>
+          <el-select size="mini" clearable filterable v-model="editForm.hname" placeholder="请选择医院">
+            <el-option v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictValue"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="实施系统:">
-          <el-select size="mini"  clearable filterable v-model="editForm.hsytem" placeholder="请选择所属系统" >
-            <el-option  v-for="(item,index) in hsytem" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
+          <el-select size="mini" clearable filterable v-model="editForm.hsytem" placeholder="请选择所属系统">
+            <el-option v-for="(item,index) in hsytem" :key="index" :label="item.dictLabel"
+                       :value="item.dictValue"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="实施日期:">
@@ -108,44 +118,45 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeDialog">取消</el-button>
-        <el-button size="mini" type="primary"  class="title" @click="submitForm('editForm')">保存</el-button>
+        <el-button size="mini" type="primary" class="title" @click="submitForm('editForm')">保存</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="启动实施流程" :visible.sync="editEnforceFormVisible" width="45%" @click="closeEnforceDialog" :close-on-click-modal="false">
-      <el-form label-width="120px" :model="enforceForm" >
-        <el-descriptions  title="" :column="2"  border>
+    <el-dialog title="启动实施流程" :visible.sync="editEnforceFormVisible" width="45%" @click="closeEnforceDialog"
+               :close-on-click-modal="false">
+      <el-form label-width="120px" :model="enforceForm" size="mini">
+        <el-descriptions title="" :column="2" border>
           <el-descriptions-item>
             <template slot="label">
               项目名称
             </template>
-           {{enforceFlow.name}}
+            {{ enforceFlow.name }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-             实施人员
+              实施人员
             </template>
-            {{enforceFlow.enforcer}}
+            {{ enforceFlow.enforcer }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-             实施医院
+              实施医院
             </template>
-            {{enforceFlow.hno}}
+            {{ enforceFlow.hno }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label">
-             实施系统
+              实施系统
             </template>
-            {{enforceFlow.hsytem}}
+            {{ enforceFlow.hsytem }}
           </el-descriptions-item>
-          <el-descriptions-item >
+          <el-descriptions-item>
             <template slot="label">
-             实施时间
+              实施时间
             </template>
-           {{enforceFlow.time}}
+            {{ enforceFlow.time }}
           </el-descriptions-item>
-          <el-descriptions-item >
+          <el-descriptions-item>
             <template slot="label">
               实施状态
             </template>
@@ -155,7 +166,7 @@
             <template slot="label">
               实施内容
             </template>
-          {{enforceFlow.content}}
+            {{ enforceFlow.content }}
           </el-descriptions-item>
           <el-descriptions-item :span="2">
             <template slot="label">
@@ -173,7 +184,8 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog" :close-on-click-modal="false">
+    <el-dialog title="选择人员" :visible.sync="usersVisble" width="30%" @click="closeUserDialog"
+               :close-on-click-modal="false">
       <el-tree
         ref="dept"
         :data="userList"
@@ -186,13 +198,14 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="实施详情"  :visible.sync="enforceFlowVisble" width="85%" @click="enforceFlowDialog" :close-on-click-modal="false">
+    <el-dialog title="实施详情" :visible.sync="enforceFlowVisble" width="85%" @click="enforceFlowDialog"
+               :close-on-click-modal="false">
       <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 type="index" label="序号" width="60" align="center">
         </el-table-column>
         <el-table-column
           prop="stepTitle"
@@ -202,7 +215,7 @@
         <el-table-column
           prop="director"
           label="执行人" align="center"
-          width="180">
+          width="100">
         </el-table-column>
         <el-table-column
           prop="remark"
@@ -210,16 +223,22 @@
         </el-table-column>
         <el-table-column
           prop="createTime" align="center"
-          label="创建时间" width="180">
-        </el-table-column>
+          label="创建时间" width="130">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
         <el-table-column
           prop="completionTime" align="center"
-          label="完成时间" width="180">
+          label="完成时间" width="130">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.completionTime) }}</span>
+          </template>
         </el-table-column>
-        <el-table-column prop="files" label="文件列表"  width="350">
+        <el-table-column prop="files" label="文件列表" width="350">
           <template slot-scope="scope">
             <span>
-              <a :href="item.url"  v-for="(item,index) in scope.row.fileDatas" style="color: darkgreen">
+              <a :href="item.url" v-for="(item,index) in scope.row.fileDatas" style="color: darkgreen">
                 <div v-html="item.fileName"></div>
               </a>
             </span>
@@ -242,14 +261,14 @@ import {
   startEnforceFlow,
   getEnforceFlowsByEnforceId
 } from '@/api/meeting/enforce'
-import { getDeptUserTree } from '@/api/system/user'
+import {getDeptUserTree} from '@/api/system/user'
 
 export default {
   name: 'enforceflow',
   data() {
     return {
-      enforceFlowVisble:false,
-      usersVisble:false,
+      enforceFlowVisble: false,
+      usersVisble: false,
       tableData: [],
       pageparm: {
         current: 1,
@@ -259,49 +278,49 @@ export default {
       formInline: {
         current: 1,
         size: 10,
-        name:null,
-        hname:null,
-        hsytem:null,
-        status:null
+        name: null,
+        hname: null,
+        hsytem: null,
+        status: null
 
       },
-      editForm:{
-        id:null,
+      editForm: {
+        id: null,
         name: '',
-        hname:null,
-        hsytem:null,
-        enforcer:null,
-        content:null,
-        times:null
+        hname: null,
+        hsytem: null,
+        enforcer: null,
+        content: null,
+        times: null
       },
       editFormVisible: false,
-      title : '创建实施项目',
-      hnos:[],
+      title: '创建实施项目',
+      hnos: [],
       hsytem: [],
-      editEnforceFormVisible:false,
-      enforceForm:{
-        id:null,
-        enforceId:null,
-        director:null,
-        directorId:null,
-        remark:null,
+      editEnforceFormVisible: false,
+      enforceForm: {
+        id: null,
+        enforceId: null,
+        director: null,
+        directorId: null,
+        remark: null,
       },
-      enforceFlow:{
-        name:'',
-        enforcer:'',
-        time:null,
-        hno:null,
-        hsytem:null,
-        content:''
+      enforceFlow: {
+        name: '',
+        enforcer: '',
+        time: null,
+        hno: null,
+        hsytem: null,
+        content: ''
       },
       fileList: [],
-      userList:[],
-      userForm:{
-        show:false
+      userList: [],
+      userForm: {
+        show: false
       },
-      enforceFLows:[],
-      maxStep:0,
-      enforceTableData:[]
+      enforceFLows: [],
+      maxStep: 0,
+      enforceTableData: []
     }
   },
   // 注册组件
@@ -321,21 +340,21 @@ export default {
       this.formInline.size = parm.size
       this.getData(this.formInline)
     },
-    getData(data){
-      let searchParams=data;
-      getEnforcesByPage(searchParams).then(response=>{
+    getData(data) {
+      let searchParams = data;
+      getEnforcesByPage(searchParams).then(response => {
         this.tableData = response.data.records;
         this.pageparm.total = response.data.total;
       });
     },
-    getHosInfos(){
-      getHosInfos().then(res=>{
-        this.hnos=res.data
+    getHosInfos() {
+      getHosInfos().then(res => {
+        this.hnos = res.data
       })
     },
-    getHsystems(){
-      getHsystems().then(res=>{
-        this.hsytem=res.data
+    getHsystems() {
+      getHsystems().then(res => {
+        this.hsytem = res.data
       })
     },
     closeDialog() {
@@ -352,13 +371,13 @@ export default {
       }
       this.getData(this.formInline);
     },
-    searchData(){
+    searchData() {
       this.getData(this.formInline);
     },
-    createEnforceFlow(){
+    createEnforceFlow() {
       this.title = '创建实施项目'
       this.editFormVisible = true
-      this.editForm.id=null
+      this.editForm.id = null
     },
     submitForm() {
       let data = this.editForm;
@@ -371,8 +390,8 @@ export default {
         this.getData(this.formInline);
       });
     },
-    deleteEnforce(row){
-      let id=row.id;
+    deleteEnforce(row) {
+      let id = row.id;
       deleteEnforce(id).then(response => {
         this.$message({
           message: '操作成功!',
@@ -381,48 +400,48 @@ export default {
         this.getData(this.formInline);
       })
     },
-    getEnforceDetail(row){
-      let id=row.id;
+    getEnforceDetail(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.enforceFLows = response.data.dtos;
+        this.maxStep = response.data.maxStep
+        this.enforceTableData = response.data.dtos
 
       })
-      this.enforceFlowVisble=true
+      this.enforceFlowVisble = true
     },
-    handleEdit(row){
-      this.editForm=row
-      this.editForm.times=[row.beginTime,row.endTime]
-      this.editFormVisible=true
+    handleEdit(row) {
+      this.editForm = row
+      this.editForm.times = [row.beginTime, row.endTime]
+      this.editFormVisible = true
     },
-    startEnforceFlow(row){
+    startEnforceFlow(row) {
 
-      this.editEnforceFormVisible=true
-      this.enforceFlow.name=row.name
-      this.enforceFlow.enforcer=row.enforcer
-      this.enforceFlow.time=row.beginTime+'至'+row.endTime
-      this.enforceFlow.content=row.content
-      this.enforceFlow.hno=row.hname
-      this.enforceFlow.hsytem=row.hsytem
+      this.editEnforceFormVisible = true
+      this.enforceFlow.name = row.name
+      this.enforceFlow.enforcer = row.enforcer
+      this.enforceFlow.time = row.beginTime + '至' + row.endTime
+      this.enforceFlow.content = row.content
+      this.enforceFlow.hno = row.hname
+      this.enforceFlow.hsytem = row.hsytem
 
-      this.enforceForm.enforceId=row.id
+      this.enforceForm.enforceId = row.id
 
     },
-    closeEnforceDialog(){
-      this.editEnforceFormVisible=false
+    closeEnforceDialog() {
+      this.editEnforceFormVisible = false
     },
-    submitEnforceForm(){
-      let user=this.enforceForm.director;
-      if(user==null){
+    submitEnforceForm() {
+      let user = this.enforceForm.director;
+      if (user == null) {
         this.$message({
           message: '请选择人员!',
           type: 'warning'
         });
         return;
       }
-      let data=this.enforceForm;
-      startEnforceFlow(data).then(res =>{
+      let data = this.enforceForm;
+      startEnforceFlow(data).then(res => {
         this.$message({
           message: '操作成功!',
           type: 'success'
@@ -432,40 +451,40 @@ export default {
       this.resetSearch();
 
     },
-    closeUserDialog(){
-      this.usersVisble=false
+    closeUserDialog() {
+      this.usersVisble = false
     },
-    getDeptUserTrees(){
+    getDeptUserTrees() {
       getDeptUserTree('').then(res => {
         this.userList = res.data
       });
     },
-    openUsers(){
-      this.usersVisble=true
+    openUsers() {
+      this.usersVisble = true
     },
-    submitUserForm(){
+    submitUserForm() {
       //获取选中的节点
-      let node=this.$refs.dept.getCurrentNode();
-      if(node==undefined || node==null){
+      let node = this.$refs.dept.getCurrentNode();
+      if (node == undefined || node == null) {
         this.$message({
           message: '请选择数据!',
           type: 'warning'
         });
         return;
       }
-      if(node.type!=='u'){
+      if (node.type !== 'u') {
         this.$message({
           message: '请选择人员!',
           type: 'warning'
         });
         return;
       }
-      this.enforceForm.director=node.name
-      this.enforceForm.directorId=node.id
+      this.enforceForm.director = node.name
+      this.enforceForm.directorId = node.id
       this.closeUserDialog();
     },
-    enforceFlowDialog(){
-      this.enforceFlowVisble=false
+    enforceFlowDialog() {
+      this.enforceFlowVisble = false
     }
 
 

+ 3 - 3
src/views/task/view.vue

@@ -106,7 +106,7 @@
     </el-table>
 
     <el-dialog title="反馈任务" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
         <el-form-item label="任务名称">
           <div>{{ form.taskName }}</div>
         </el-form-item>
@@ -135,8 +135,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm" size="mini">确 定</el-button>
+        <el-button @click="cancel" size="mini">取 消</el-button>
       </div>
     </el-dialog>