bug修改

src/views/enforceflow/enforceflow.vue

@@ -68,7 +68,7 @@
       </el-table-column>
       <el-table-column prop="status1" label="当前实施状态" width="120" align="center">
         <template slot-scope="scope">
-          <span style="color: green">{{scope.row.act.taskName}}</span>
+          <span style="color: green">{{ scope.row.act.taskName }}</span>
           <span style="color: green" v-if="scope.row.status===2">运行维护</span>
           <span style="color: green" v-if="scope.row.status===0">待启动</span>
         </template>
@@ -89,8 +89,12 @@
           </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 && scope.row.act.id!==undefined"  type="primary" @click="enforceFlowDealWin(scope.row)">流程处理</el-button>
-          <el-button size="mini" type="success" v-if="scope.row.status!==0" @click="openEnforceManageDialog(scope.row)">查看详情</el-button>
+          <el-button size="mini" v-if="scope.row.status!==0 && scope.row.act.id!==undefined" type="primary"
+                     @click="enforceFlowDealWin(scope.row)">流程处理
+          </el-button>
+          <el-button size="mini" type="success" v-if="scope.row.status!==0" @click="openEnforceManageDialog(scope.row)">
+            查看详情
+          </el-button>
           <el-button size="mini" v-show="false" v-if="scope.row.status!==0" type="primary"
                      @click="getEnforceDetail(scope.row)">
             查看实施详情
@@ -106,30 +110,30 @@
     <!-- 编辑界面 -->
     <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-form label-width="120px" ref="editForm" :model="editForm" :rules="rules" size="mini">
+        <el-form-item label="实施项目名称:" prop="name">
           <el-input size="mini" v-model="editForm.name"></el-input>
         </el-form-item>
-        <el-form-item label="实施负责人:" prop="recorder">
+        <el-form-item label="实施负责人:" prop="enforcer">
           <el-input size="mini" v-model="editForm.enforcer" :readonly="true"
                     @keyup.enter.native="openUsers1()">
             <el-button @click="openUsers1()" icon="el-icon-search" slot="append"></el-button>
           </el-input>
         </el-form-item>
 
-        <el-form-item label="实施医院:">
+        <el-form-item label="实施医院:" prop="hname">
           <el-select size="mini" clearable filterable v-model="editForm.hname" placeholder="请选择医院">
             <el-option v-for="(item,index) in hnos" :label="item.dictLabel" :value="item.dictLabel"
                        :key="index"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="实施系统:">
+        <el-form-item label="实施系统:" prop="hsytem">
           <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.dictLabel"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="实施日期:">
+        <el-form-item label="实施日期:" prop="times">
           <el-date-picker
             v-model="editForm.times"
             type="daterange"
@@ -140,7 +144,7 @@
             end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="实施内容:">
+        <el-form-item label="实施内容:" prop="content">
           <el-input size="mini" type="textarea" :rows="6" v-model="editForm.content"></el-input>
         </el-form-item>
       </el-form>
@@ -150,7 +154,8 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="选择人员" :visible.sync="users1Visble" width="30%" @click="closeUser1Dialog" :close-on-click-modal="false">
+    <el-dialog title="选择人员" :visible.sync="users1Visble" width="30%" @click="closeUser1Dialog"
+               :close-on-click-modal="false">
       <el-input placeholder="输入关键字进行过滤" v-model="filterText">
       </el-input>
       <el-tree
@@ -240,7 +245,8 @@
       </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"
@@ -597,7 +603,7 @@
             <template slot="label">
               其他说明
             </template>
-            <div id="editorElem1" style="text-align:left" >
+            <div id="editorElem1" style="text-align:left">
             </div>
           </el-descriptions-item>
         </el-descriptions>
@@ -683,6 +689,26 @@ export default {
         content: null,
         times: null
       },
+      rules: {
+        name: [
+          {required: true, message: "实施项目名称不能为空", trigger: "blur"}
+        ],
+        enforcer: [
+          {required: true, message: "实施负责人不能为空", trigger: "change"}
+        ],
+        hname: [
+          {required: true, message: "实施医院不能为空", trigger: "change"}
+        ],
+        hsytem: [
+          {required: true, message: "实施系统不能为空", trigger: "change"}
+        ],
+        times: [
+          {required: true, message: "实施日期不能为空", trigger: "change"}
+        ],
+        content: [
+          {required: true, message: "实施内容不能为空", trigger: "change"}
+        ],
+      },
       editFormVisible: false,
       title: '创建实施项目',
       hnos: [],
@@ -697,7 +723,7 @@ export default {
         taskId: null,
         currentStep: null,
         filess: [],
-        content:null
+        content: null
       },
       enforceFlow: {
         name: '',
@@ -745,8 +771,8 @@ export default {
         elBadge11: true,
         elBadge12: true,
       },
-      editEnforceFormVisible1:false,
-      enforceFlowData:[]
+      editEnforceFormVisible1: false,
+      enforceFlowData: []
     }
   },
   // 注册组件
@@ -785,6 +811,16 @@ export default {
       })
     },
     closeDialog() {
+      this.editForm={
+        id: null,
+        name: '',
+        hname: null,
+        hsytem: null,
+        enforcer: null,
+        content: null,
+        times: null
+      }
+      this.resetForm('editForm')
       this.editFormVisible = false
     },
     resetSearch() {
@@ -807,15 +843,19 @@ export default {
       this.editForm.id = null
     },
     submitForm() {
-      let data = this.editForm;
-      addEnforce(data).then(response => {
-        this.$message({
-          message: '操作成功!',
-          type: 'success'
-        });
-        this.closeDialog();
-        this.getData(this.formInline);
-      });
+      this.$refs.editForm.validate(valid => {
+        if (valid) {
+          let data = this.editForm;
+          addEnforce(data).then(response => {
+            this.$message({
+              message: '操作成功!',
+              type: 'success'
+            });
+            this.closeDialog();
+            this.getData(this.formInline);
+          });
+        }
+      })
     },
     deleteEnforce(row) {
       let id = row.id;
@@ -851,30 +891,30 @@ export default {
       this.enforceFlow.hno = row.hname
       this.enforceFlow.hsytem = row.hsytem
       this.enforceForm.enforceId = row.id
-      let userId=this.$store.getters.userId
-      let userName=this.$store.getters.name
-      this.enforceForm.director=userName
-      this.enforceForm.directorId=userId
+      let userId = this.$store.getters.userId
+      let userName = this.$store.getters.name
+      this.enforceForm.director = userName
+      this.enforceForm.directorId = userId
 
     },
     closeEnforceDialog() {
       this.editEnforceFormVisible = false
     },
-    saveUpdate(){
+    saveUpdate() {
       let data = this.enforceForm;
-      if(data===undefined || data==null){
+      if (data === undefined || data == null) {
         this.$message.error("该流程暂未执行，不能修改信息!")
         return
       }
-      let id=data.id
-      if(id===undefined || id==null){
+      let id = data.id
+      if (id === undefined || id == null) {
         this.$message.error("该流程暂未执行，不能修改信息!")
         return
-      }else {
+      } else {
         updateEnforceFlow(data).then(res => {
           if (res.success === false) {
             this.$message.error(res.data)
-          }else {
+          } else {
             this.$message.success("操作成功!")
           }
         });
@@ -916,7 +956,7 @@ export default {
           message: '操作成功!',
           type: 'success'
         });
-        this.editEnforceFormVisible1=false
+        this.editEnforceFormVisible1 = false
         this.resetSearch();
       });
 
@@ -989,10 +1029,10 @@ export default {
 
       this.enforceFlowId = row.id
       this.enforceFlowTitle = row.name + "实施流程明细"
-      let step=row.act.step
-      if(step===undefined){
-        step=12
-        this.maxStep=12
+      let step = row.act.step
+      if (step === undefined) {
+        step = 12
+        this.maxStep = 12
       }
       this.enforceDetail = row
       this.on_click(step)
@@ -1017,7 +1057,7 @@ export default {
         this.editEnforceRecord.remark = editorEnforce.txt.html()
       };
     },
-    createeditorElem1Editor(){
+    createeditorElem1Editor() {
       editorElem1 = new E('#editorElem1');
       editorElem1.config.height = 300
       editorElem1.create()
@@ -1060,7 +1100,7 @@ export default {
     on_click(e) {
       let dot = e;
       //判断一下当前最大流程
-      let maxStep=this.maxStep;
+      let maxStep = this.maxStep;
       switch (dot) {
         case 1:
           this.elBadgeForm.elBadge1 = false;
@@ -1112,7 +1152,7 @@ export default {
           break;
       }
 
-      if ( e != null ) {
+      if (e != null) {
         if (e !== 12 && e !== 11) {
           let id = this.enforceFlowId
           getEnforceFlowsByEnforceIdAndStep(id, e).then(res => {
@@ -1120,7 +1160,7 @@ export default {
             this.enforceFlow = data.enforceFlow
             if (data.dtos.length > 0) {
               this.enforceFlow.fileDatas = data.dtos[0].fileDatas
-              this.uploadFileList=[]
+              this.uploadFileList = []
               for (let i = 0; i < data.dtos[0].fileDatas.length; i++) {
                 let file = data.dtos[0].fileDatas[i];
                 this.uploadFileList.push({
@@ -1135,8 +1175,8 @@ export default {
             let dtos = data.dtos
             if (dtos.length > 0) {
               this.enforceForm = dtos[0]
-            }else{
-              this.enforceForm={
+            } else {
+              this.enforceForm = {
                 id: null,
                 enforceId: null,
                 director: null,
@@ -1145,7 +1185,7 @@ export default {
                 taskId: null,
                 currentStep: null,
                 filess: [],
-                content:null
+                content: null
               }
             }
             this.$nextTick(() => {
@@ -1213,8 +1253,8 @@ export default {
     },
     addEnforceRecordClick() {
       this.addEnforceRecordWin = true
-      this.editEnforceRecord.id=null
-      this.editEnforceRecord.remark=''
+      this.editEnforceRecord.id = null
+      this.editEnforceRecord.remark = ''
       this.$nextTick(() => {
         if (editorEnforce == null) {
           this.createEnforceEditor()
@@ -1287,17 +1327,18 @@ export default {
     filterNode(value, data) {
       if (!value) {
         return true
-      };
+      }
+      ;
       return data.name.indexOf(value) !== -1;
     },
-    closeEnforceDialog1(){
-      this.editEnforceFormVisible1=false
+    closeEnforceDialog1() {
+      this.editEnforceFormVisible1 = false
     },
     getTaskList() {
       getPersonalTaskList().then(res => {
       })
     },
-    enforceFlowDealWin(row){
+    enforceFlowDealWin(row) {
       this.enforceFlow.name = row.name
       this.enforceFlow.enforcer = row.enforcer
       this.enforceFlow.hno = row.hname
@@ -1309,24 +1350,24 @@ export default {
       this.enforceForm.taskId = row.act.taskId
       this.enforceForm.currentStep = row.act.step
       this.enforceForm.enforceId = row.id
-      let userId=this.$store.getters.userId
-      let userName=this.$store.getters.name
-      this.enforceForm.director=userName
-      this.enforceForm.directorId=userId
-      this.enforceForm.remark=''
-      this.enforceForm.filess=[]
-      this.enforceForm.content=''
-      this.uploadFileList=[]
+      let userId = this.$store.getters.userId
+      let userName = this.$store.getters.name
+      this.enforceForm.director = userName
+      this.enforceForm.directorId = userId
+      this.enforceForm.remark = ''
+      this.enforceForm.filess = []
+      this.enforceForm.content = ''
+      this.uploadFileList = []
 
-      this.$nextTick(()=>{
-        if (editorElem1==null){
+      this.$nextTick(() => {
+        if (editorElem1 == null) {
           this.createeditorElem1Editor()
-        }else {
+        } else {
           editorElem1.destroy();//这里做了一次判断，判断编辑器是否被创建，如果创建了就先销毁。
           this.createeditorElem1Editor()
         }
       });
-      this.editEnforceFormVisible1=true
+      this.editEnforceFormVisible1 = true
     }
   }