Merge branch 'master' of http://111.61.77.35:9999/lizhichao/whp-xl

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMg.vue

@@ -84,15 +84,15 @@
         </template>
       </el-table-column>
       <!-- <el-table-column prop="createTime" label="创建时间"></el-table-column> -->
-      <el-table-column label="操作" width="220" align="center">
+      <el-table-column label="操作" width="260" align="center">
         <template slot-scope="scope">
+          <el-button type="primary" plain @click="detailFun(scope.row)" size="small" v-if="scope.row.checkStatus == 1">
+            <i class="el-icon-view"></i> 详情
+          </el-button>
           <el-button @click="editFun(scope.row)" size="small" v-if="scope.row.checkStatus != 1">
             <i class="el-icon-edit-outline"></i> 编辑
           </el-button>
-          <el-button type="primary" plain @click="editFun(scope.row)" size="small" v-if="!qyvisble">
-            查看详情
-          </el-button>
-          <el-button type="danger" @click="delFun(scope.row)" size="small" v-if="qyvisble">
+          <el-button type="danger" @click="delFun(scope.row)" size="small" v-if="scope.row.checkStatus != 1">
             <i class="el-icon-delete"></i> 删除
           </el-button>
         </template>
@@ -165,6 +165,7 @@ export default class CamerasMg extends Vue {
     this.getTableData();
   }
   addFun() {
+    this.dialogTit = "新增预案";
     this.zjKey++;
     this.dialogVisible = true;
   }
@@ -174,6 +175,12 @@ export default class CamerasMg extends Vue {
     this.zjKey++;
     this.dialogVisible = true;
   }
+  detailFun(row: any){
+    this.dialogTit = "详情";
+    this.formData = Object.assign({}, row);
+    this.zjKey++;
+    this.dialogVisible = true;
+  }
   delFun(row: any) {
     let that = this as any;
     METHOD.deleteFun(

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMgCheck.vue

@@ -23,16 +23,17 @@
                 <el-form-item label="预案等级:">
                   <font>{{editForm.planLevel + '级'}}</font>
                 </el-form-item>
-                <el-form-item label="预案源文件">
+                <el-form-item label="预案源文件:">
                   <span
                           class="dbtn sd qiCr"
                           @click="checkFile(editForm.sourceFile)"
-                          v-if="editForm.sourceFile != ''"
+                          v-if="editForm.sourceFile != '' && editForm.fileOriginalName != ''"
                   >
                     <i class="el-icon el-icon-view"></i>
                     {{editForm.fileOriginalName}}
                   </span>
                 </el-form-item>
+                <div v-if="title != '详情'">
                   <el-form-item label="审核预案" prop="checkStatus">
                     <el-radio-group v-model="editForm.checkStatus">
                       <el-radio label="0">待审核</el-radio>
@@ -43,6 +44,18 @@
                   <el-form-item label="审核意见">
                     <el-input type="textarea" v-model="editForm.remarks"></el-input>
                   </el-form-item>
+                </div>
+                <div v-else>
+                  <el-form-item label="审核状态:">
+                    <!--<font>{{editForm.checkStatus == 0 ? '已上报' : '未上报'}}</font>-->
+                    <span v-if="editForm.checkStatus == 0">待审核</span>
+                    <span v-if="editForm.checkStatus == 1">审核通过</span>
+                    <span v-if="editForm.checkStatus == 2">审核未通过</span>
+                  </el-form-item>
+                  <el-form-item label="审核意见:">
+                    <font>{{editForm.remarks}}</font>
+                  </el-form-item>
+                </div>
               </el-form>
             </div>
           </el-col>
@@ -55,7 +68,7 @@
           </el-col>
         </el-row>
         <span slot="footer" class="dialog-footer">
-          <el-button type="primary" size="small" @click="confirmFun('editForm')">提交</el-button>
+          <el-button type="primary" size="small" @click="confirmFun('editForm')" v-if="title != '详情'">提交</el-button>
           <el-button @click="$emit('dialogFun')" size="small">取消</el-button>
         </span>
     </el-dialog>

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMgEdit.vue

@@ -6,7 +6,7 @@
       :show-close="false"
       :close-on-click-modal="false"
     >
-      <div v-if="qyvisble">
+      <div v-if="title != '详情'">
         <el-row :gutter="20">
           <el-col :span="12" class="flcolum">
             <div>
@@ -53,7 +53,7 @@
                   <a v-for="(i,ind) in fileList" :key="ind" :href="i.url" target="_blank">{{i.name}}</a>&nbsp;&nbsp;&nbsp;<i class="btn el-icon-delete" @click="deleteList"></i>
                   </div>-->
                 </el-form-item>
-                <el-form-item label="审核意见">
+                <el-form-item label="审核意见" v-if="editForm.remarks != '' && editForm.remarks != null">
                   <font>{{editForm.remarks}}</font>
                 </el-form-item>
               </el-form>
@@ -96,12 +96,21 @@
                   <span
                     class="dbtn sd qiCr"
                     @click="checkFile(editForm.sourceFile)"
-                    v-if="editForm.sourceFile != ''"
+                    v-if="editForm.sourceFile != '' && editForm.fileOriginalName != ''"
                   >
                     <i class="el-icon el-icon-view"></i>
                     {{editForm.fileOriginalName}}
                   </span>
                 </el-form-item>
+                <el-form-item label="审核状态:" v-if="editForm.isReported == 0">
+                  <!--<font>{{editForm.checkStatus == 0 ? '已上报' : '未上报'}}</font>-->
+                  <span v-if="editForm.checkStatus == 0">待审核</span>
+                  <span v-if="editForm.checkStatus == 1">审核通过</span>
+                  <span v-if="editForm.checkStatus == 2">审核未通过</span>
+                </el-form-item>
+                <el-form-item label="审核意见:" v-if="editForm.remarks != '' && editForm.remarks != null">
+                  <font>{{editForm.remarks}}</font>
+                </el-form-item>
               </el-form>
             </div>
           </el-col>
@@ -271,6 +280,7 @@ export default class PlansMgEdit extends Vue {
     that.enterpriseId = METHOD.enterpriseId;
     // if (that.enterpriseId) {
     //   that.qyvisble = true;
+    if(this.title != '详情') {
       that.$nextTick(() => {
         that.creatEditor();
       })
@@ -290,6 +300,7 @@ export default class PlansMgEdit extends Vue {
           });
         }
       });
+    }
     // }
     that.actionUrl = METHOD.URL + "/file/uploadFile";
   }

dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMgGovernment.vue

@@ -67,9 +67,12 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="220" align="center">
+      <el-table-column label="操作" width="300" align="center">
         <template slot-scope="scope">
-          <el-button type="success" @click="checkFun(scope.row)" size="small" :disabled="scope.row.checkStatus != 0?true:false">
+          <el-button type="primary" plain @click="detailFun(scope.row)" size="small">
+            <i class="el-icon-view"></i> 详情
+          </el-button>
+          <el-button type="success" @click="checkFun(scope.row)" size="small" v-if="scope.row.checkStatus == 0">
             <i class="el-icon-key"></i> 审核
           </el-button>
           <el-button type="danger" @click="delFun(scope.row)" size="small">
@@ -142,6 +145,12 @@ export default class CamerasMg extends Vue {
     this.searchData = {};
     this.getTableData();
   }
+  detailFun(row: any){
+    this.dialogTit = "详情";
+    this.formData = Object.assign({}, row);
+    this.zjKey++;
+    this.dialogVisible = true;
+  }
   checkFun(row: any){
     this.dialogTit = "预案审核";
     this.formData = Object.assign({}, row);