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

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

@@ -48,6 +48,19 @@
           </font>
         </template>
       </el-table-column>
+      <el-table-column prop="checkStatus" label="审核状态">
+        <template slot-scope="scope">
+          <font v-if="scope.row.checkStatus == 0" class="colorP">
+            审核中
+          </font>
+          <font v-else-if="scope.row.checkStatus == 1" class="colorM">
+            审核通过
+          </font>
+          <font v-else-if="scope.row.checkStatus == 2" class="colorR">
+            审核未通过
+          </font>
+        </template>
+      </el-table-column>
       <el-table-column prop="sourceFile" label="预案文件">
         <template slot-scope="scope">
           <span
@@ -63,16 +76,19 @@
             :download="fileUrl(scope.row.sourceFile)"
             v-if="scope.row.sourceFile != ''"
           >
-            <i class="el-icon el-icon-download"></i>下载 -->
-          </a>
+            <i class="el-icon el-icon-download"></i>下载
+          </a> -->
         </template>
       </el-table-column>
       <!-- <el-table-column prop="createTime" label="创建时间"></el-table-column> -->
-      <el-table-column label="操作" width="200" align="center">
+      <el-table-column label="操作" width="300" align="center">
         <template slot-scope="scope">
           <el-button @click="editFun(scope.row)" size="small" v-if="qyvisble">
             <i class="el-icon-edit-outline"></i> 编辑
           </el-button>
+          <el-button type="success" @click="checkFun(scope.row)" size="small" v-if="qyvisble">
+            <i class="el-icon-key"></i> 审核
+          </el-button>
           <el-button type="primary" plain @click="editFun(scope.row)" size="small" v-if="!qyvisble">
             查看详情
           </el-button>
@@ -100,14 +116,24 @@
       @refreshTableData="getTableData"
       :key="zjKey"
     ></PlansMgEdit>
+    <PlansMgCheck
+      v-if="dialogVisible2"
+      :dialogVisible="dialogVisible2"
+      :editForm="formData"
+      :title="dialogTit"
+      @dialogFun="closeDialog"
+      @refreshTableData="getTableData"
+      :key="chKey"
+    ></PlansMgCheck>
   </div>
 </template>
 <script lang="ts">
 import { Component, Vue, Provide } from "vue-property-decorator";
 import PlansMgEdit from "./PlansMgEdit.vue";
+import PlansMgCheck from "./PlansMgCheck.vue";
 import METHOD from "@/utils/methods";
 @Component({
-  components: { PlansMgEdit }
+  components: { PlansMgEdit, PlansMgCheck }
 })
 export default class CamerasMg extends Vue {
   @Provide() enterpriseId: String = "";
@@ -118,9 +144,11 @@ export default class CamerasMg extends Vue {
   @Provide() loading: Boolean = false;
   //编辑组件
   @Provide() dialogVisible: Boolean = false;
+  @Provide() dialogVisible2: Boolean = false;
   @Provide() dialogTit: String = "新增预案";
   @Provide() formData: Object = {};
   @Provide() zjKey: any = 0;
+  @Provide() chKey: any = 0;
   @Provide() qyvisble: boolean = true;//政府端隐藏项
   getTableData() {
     let that = this,
@@ -157,6 +185,12 @@ export default class CamerasMg extends Vue {
     this.zjKey++;
     this.dialogVisible = true;
   }
+  checkFun(row: any){
+    this.dialogTit = "预案审核";
+    this.formData = Object.assign({}, row);
+    this.chKey++;
+    this.dialogVisible2 = true;
+  }
   delFun(row: any) {
     let that = this as any;
     METHOD.deleteFun(
@@ -178,6 +212,7 @@ export default class CamerasMg extends Vue {
   closeDialog() {
     //关闭窗口
     this.dialogVisible = false;
+    this.dialogVisible2 = false;
     this.formData = {};
   }
   checkFile(url: any) {

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

+<template>
+  <div class="wrapper editwrap w100">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="title"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+        <el-row :gutter="20">
+          <el-col :span="12" class="flcolum">
+            <div>
+              <div class="yatit">预案基本信息</div>
+              <el-form ref="editForm" :model="editForm" :rules="rules" label-width="100px">
+                <el-form-item label="预案标题" prop="planTitle">
+                  <el-input v-model="editForm.planTitle"></el-input>
+                </el-form-item>
+                <el-form-item label="预案分类" prop="planType">
+                  <el-input v-model="editForm.planType"></el-input>
+                </el-form-item>
+                <el-form-item label="预案等级" prop="planLevel">
+                  <el-radio-group v-model="editForm.planLevel">
+                    <el-radio label="Ⅰ">Ⅰ级</el-radio>
+                    <el-radio label="Ⅱ">Ⅱ级</el-radio>
+                    <el-radio label="Ⅲ">Ⅲ级</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="审核预案" prop="checkStatus">
+                  <el-radio-group v-model="editForm.checkStatus">
+                    <el-radio label="0">审核中</el-radio>
+                    <el-radio label="1">通过</el-radio>
+                    <el-radio label="2">未通过</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item label="预案源文件">
+                  <el-upload
+                    ref="uploaderB"
+                    class="uploader"
+                    :limit="1"
+                    :action="actionUrl"
+                    :on-success="(a,b,c) => onSuccess(a,b,c,'sourceFile')"
+                    :on-error="onError"
+                    :on-remove="handleRemove"
+                    :before-remove="(a,b,c) => beforeRemove(a,b,c,'sourceFile')"
+                    :on-exceed="onExceed"
+                    :multiple="false"
+                    list-type="picture"
+                    :file-list="fileList"
+                  >
+                    <i class="el-icon-plus"></i>
+                    <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
+                  </el-upload>
+                  <!-- <div v-if="fileList.length > 0">
+                  <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>
+            </div>
+          </el-col>
+          <el-col :span="12" class="flcolum">
+            <div>
+              <div class="yatit">预案内容</div>
+              <textarea id="editorA" v-model="editForm.planContents" height="100%"></textarea>
+            </div>
+          </el-col>
+        </el-row>
+        <span slot="footer" class="dialog-footer">
+          <el-button type="primary" size="small" @click="confirmFun('editForm')">提交</el-button>
+          <el-button @click="$emit('dialogFun')" size="small">取消</el-button>
+        </span>
+    </el-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { Component, Vue, Provide, Prop, Watch } from "vue-property-decorator";
+import { State, Getter, Mutation, Action } from "vuex-class";
+import City from "@/components/city.vue";
+import METHOD from "@/utils/methods";
+import ice from "@/utils/iceEditor-min.js";
+let uploadfile = require("@/assets/uploadfile.png");
+@Component({
+  components: { City },
+})
+export default class PlansMgEdit extends Vue {
+  //上传
+  @Provide() actionUrl: any = "";
+  @Provide() sourceFile: any = [];
+  @Provide() fileList: any = [];
+  //属性或参数中使用!:表示强制解析（告诉typescript编译器，这里一定有值），常用于vue-decorator中的@Prop
+  @Prop(Boolean) dialogVisible!: Boolean;
+  @Prop(String) title!: String;
+  @Prop(Object) editForm!:{
+    id: String;
+    enterpriseId: String;
+    sourceFile: String;
+    planContents: String;
+    planType: String;
+    planLevel: String;
+    planTitle: String;
+    fileOriginalName: String;
+  };
+  @Provide() enterpriseId: String = "";
+  @Provide() editorA: any;
+  @Provide() qyvisble: boolean = true;
+
+  @Provide() rules: any = {
+    planLevel: [{ required: true, trigger: "blur", message: "该项为必填项！" }],
+    planTitle: [{ required: true, trigger: "blur", message: "该项为必填项！" }],
+    planType: [{ required: true, trigger: "blur", message: "该项为必填项！" }],
+    checkStatus: [{ required: true, trigger: "blur", message: "该项为必填项！" }],
+  };
+  @Watch("sourceFile") change(val: any) {
+    if (val.length > 0) {
+      this.editForm.sourceFile = val[0].response.data.viewPath;
+      this.editForm.fileOriginalName = val[0].response.data.originalName;
+
+      this.fileList = [];
+      this.fileList.push({
+        name: this.editForm.fileOriginalName,
+        url: uploadfile,
+      });
+    } else {
+      this.editForm.sourceFile = "";
+      this.editForm.fileOriginalName = "";
+    }
+  }
+  //取消事件要在父级取消是所以用到 $emit
+  confirmFun(formName: string) {
+    let that = this;
+    that.editForm.planContents = that.editorA.getHTML();
+    that.editForm.enterpriseId = that.enterpriseId;
+    (that as any).$refs[formName].validate((valid: boolean) => {
+      if (that.editorA.getText() == false && that.editForm.sourceFile == "") {
+        that.$message.error("没有预案内容！");
+        return;
+      }
+      if (valid) {
+        METHOD.axiosPost(
+          that,
+          `/planInfo/addOrEditPlanInfo`,
+          that.editForm,
+          function (res: any) {
+            if (res.code == 0) {
+              (that as any).$message({
+                message: "操作成功！",
+                type: "success",
+              });
+              (that as any).$emit("dialogFun");
+              that.$emit("refreshTableData"); //刷新表格
+            }
+          }
+        );
+      } else {
+        return false;
+      }
+    });
+  }
+  /*
+  上传
+  */
+  onSuccess(res: any, file: any, fileList: any, key: string) {
+    this.$data[key] = fileList;
+  }
+  onError(err: any, file: any, fileList: any) {
+    this.$message.error("上传失败!");
+  }
+  handleRemove(file: any, fileList: any, key: string) {
+    this.$data[key] = fileList;
+  }
+  onExceed(file: any, fileList: any) {
+    this.$message.warning("只允许上传一个文件，如需更改请先删除！");
+  }
+  beforeRemove(file: any, fileList: any) {
+    let that = this,
+      param;
+    param = file.response
+      ? file.response.data.savePath.replace(/\\/g, "%")
+      : file.url.replace(/\\/g, "%").slice(9);
+    METHOD.axiosGet(this, `/file/deleteFile?savePath=${param}`, function (
+      res: any
+    ) {
+      if (res.code == 0) that.$message.success("删除成功");
+      else return false;
+    });
+  }
+  //创建编辑器
+  creatEditor() {
+    this.editorA = new ice.editor("editorA");
+    this.editorA.menu = [
+      "fontSize",
+      "foreColor",
+      "bold",
+      "italic",
+      "underline",
+      "strikeThrough",
+      "line",
+      "justifyLeft",
+      "justifyCenter",
+      "justifyRight",
+      "line",
+      "table",
+      "insertImage",
+      "insertOrderedList",
+      "insertUnorderedList",
+      "indent",
+    ];
+    this.editorA.height = "413px";
+    this.editorA.create();
+  }
+  deleteList() {
+    this.fileList = [];
+    this.editForm.sourceFile = "";
+  }
+  checkFile(url: any) {
+    window.open(METHOD.URL + url, "_blank");
+  }
+  created() {
+    let that = this;
+    that.enterpriseId = METHOD.enterpriseId;
+    // if (that.enterpriseId) {
+    //   that.qyvisble = true;
+      that.$nextTick(() => {
+        that.creatEditor();
+      })
+    // } else {
+    //   that.qyvisble = false;
+    // }
+    // if (that.editForm.id && that.enterpriseId) {
+      that.$nextTick(() => {
+        //编辑
+        if (that.editForm.planContents) {
+          that.editorA.setValue(that.editForm.planContents);
+        }
+        if (that.editForm.fileOriginalName) {
+          that.fileList.push({
+            name: that.editForm.fileOriginalName,
+            url: uploadfile,
+          });
+        }
+      });
+    // }
+    that.actionUrl = METHOD.URL + "/file/uploadFile";
+  }
+}
+</script>
+<style lang="scss">
+@import "@/utils/public.scss";
+.w100 .el-dialog {
+  width: 80%;
+  .flcolum {
+    > div {
+      border-radius: 3px;
+    }
+  }
+  .yatit {
+    background: #4273bd;
+    color: #ffffff;
+    line-height: 2;
+    height: 2em;
+    text-align: center;
+    margin-bottom: 10px;
+    border-radius: 2px;
+  }
+  .el-transfer-panel {
+    width: calc((100% - 116px) / 2);
+  }
+  .el-transfer__buttons {
+    width: 56px;
+  }
+  .el-transfer__button {
+    margin-left: 0;
+    display: block;
+  }
+}
+</style>
\ No newline at end of file