From 47670068db2f8afa289eb838aa066daff9d11d68 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 1 Apr 2021 16:19:07 +0800
Subject: [PATCH] =?UTF-8?q?recorddo=20=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/record.vue   |   2 +-
 client/src/views/supervision/recorddo.vue | 222 +++++++++++-----------
 2 files changed, 111 insertions(+), 113 deletions(-)

diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue
index f66aaec..fb326af 100644
--- a/client/src/views/supervision/record.vue
+++ b/client/src/views/supervision/record.vue
@@ -260,7 +260,7 @@
         @pagination="getList"
       />
     </el-card>
-    <el-drawer title="记录" :visible.sync="drawer" :with-header="false">
+    <el-drawer title="记录" :visible.sync="drawer" :with-header="false" size="40%">
       <recorddo
         ref="recorddo"
         :data="data"
diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue
index 7dc667f..9d29086 100644
--- a/client/src/views/supervision/recorddo.vue
+++ b/client/src/views/supervision/recorddo.vue
@@ -1,100 +1,88 @@
 <template>
   <div class="app-container">
     <div class="ma">上报记录</div>
-    <div class="ma">
-      <span class="term">材料内容</span>
-      <span class="desc">{{ record.content_name }}</span>
-    </div>
-    <div class="ma" v-if="record.content_desc">
-      <span class="term">材料详情</span>
-      <span class="desc">{{ record.content_desc }}</span>
-    </div>
-    <div class="ma">
-      <span class="term">上报状态</span>
-      <span class="desc">{{ record.state }}</span>
-      <el-tag v-if="record.is_self" style="margin-left:2px">主动上报</el-tag>
-    </div>
-    <div class="ma" v-if="record.task_">
-      <span class="term">所属任务</span>
-      <span class="desc">{{ record.task_.name }}</span>
-    </div>
-    <div class="ma" v-if="record.task_">
-      <span class="term">任务过期</span>
-      <span class="desc">{{ record.task_.end_date }}</span>
-    </div>
-    <div class="ma" v-if="record.task_">
-      <span class="term">报送要求/备注</span>
-      <span class="desc" v-if = "data.action != 'update'">{{ record.note }}</span>
-      <el-input
-        v-model="record.note"
-        placeholder=""
-        type="textarea"
-        v-else
+    <el-form label-width="100px" label-position="left">
+      <el-form-item label="材料内容">
+        {{ record.content_name }}
+      </el-form-item>
+      <el-form-item label="材料详情" v-if="record.content_desc">
+        {{ record.content_desc }}
+      </el-form-item>
+      <el-form-item label="上报状态">
+        {{ record.state }}
+        <el-tag v-if="record.is_self" style="margin-left: 2px" effect="plain">主动上报</el-tag>
+      </el-form-item>
+      <el-form-item label="所属任务" v-if="record.task_">
+        {{ record.task_.name }}/{{ record.task_.end_date }}
+      </el-form-item>
+      <el-form-item label="报送要求/备注" v-if="record.task_">
+        <span v-if="data.action != 'update'">{{
+          record.note
+        }}</span>
+        <el-input v-model="record.note" placeholder="" type="textarea" v-else>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="执行组织">
+        {{ record.belong_dept_.name }}
+      </el-form-item>
+      <el-form-item label="上报人" v-if="record.up_user_">
+        {{ record.up_user_.name }}/{{ record.up_date }}
+      </el-form-item>
+      <el-form-item label="上报说明">
+        <span v-if="data.action != 'up'">{{ record.noteb }}</span>
+        <el-input v-model="record.noteb" placeholder="" type="textarea" v-else :rows="1">
+        </el-input>
+      </el-form-item>
+      <el-form-item label="是否适用">
+        <el-switch
+          v-model="record.is_yes"
+          :disabled="data.action != 'up'"
+          @change="yeschange"
+          inactive-color="red"
+        ></el-switch>
+      </el-form-item>
+      <el-form-item label="修改意见" v-if="record.opinion || data.action=='reject'">
+        <span v-if="data.action != 'reject'">{{record.opinion}}</span>
+        <el-input
+          v-model="record.opinion"
+          placeholder=""
+          type="textarea"
+          v-else
+        />
+      </el-form-item>
+      <el-form-item label="文件列表">
+                <el-upload
+                v-if="data.action == 'up' && record.is_yes"
+          ref="upload"
+          :action="upUrl"
+          :before-upload="beforeUpload"
+          :on-success="handleUpSuccess"
+          :headers="upHeaders"
+          multiple
+          accept="image/*,.ppt,.pdf,.doc,.docx,.xls,.xlsx"
+        >
+          <el-button size="small" type="primary">上传文件</el-button>
+            <span class="el-upload__tip">
+              可上传pdf,word,ppt,excel,图片文件,大小不超过50M
+            </span>
+        </el-upload>
+      </el-form-item>
+      <div
+        v-for="(item, index) in fileList"
+        v-bind:key="item.id"
+        style="margin-top: 2px"
       >
-      </el-input>
-    </div>
-    <div class="ma">
-      <span class="term">执行组织</span>
-      <span class="desc">{{ record.belong_dept_.name }}</span>
-    </div>
-    <div class="ma" v-if="record.up_user_">
-      <span class="term">上报人</span>
-      <span class="desc">{{ record.up_user_.name }}/{{ record.up_date }}</span>
-    </div>
-    <div class="ma">
-      <span class="term">上报说明</span>
-      <span class="desc" v-if = "data.action != 'up'">{{ record.noteb }}</span>
-      <el-input
-        v-model="record.noteb"
-        placeholder=""
-        type="textarea"
-        v-else
-      >
-      </el-input>
-    </div>
-    <div class="ma">
-      <span class="term">是否适用</span>
-      <el-switch
-        v-model="record.is_yes"
-        :disabled="data.action == 'view'"
-      ></el-switch>
-    </div>
-    <div class="ma" >
-      <span class="term">修改意见</span>
-      <span class="desc" v-if = "data.action != 'reject'">{{ record.opinion }}</span>
-      <el-input
-        v-model="record.opinion"
-        placeholder=""
-        type="textarea"
-        v-else
-      >
-      </el-input>
-    </div>
-    <div class="ma">
-      <span class="term">已上传文件</span>
-    </div>
-    <div v-for="(item, index) in fileList" v-bind:key="item.id" style="margin-top:2px">
-      <i class="el-icon-delete" @click="deleteFile(index)" style="color:red" v-if="data.action=='up'"></i>
-      <el-link :href="item.path" target="_blank" type="primary">{{ item.name }}</el-link>
-    </div>
-    <div class="ma" v-if="data.action == 'up'" style="margin-top: 2px">
-      <el-upload
-        ref="upload"
-        :action="upUrl"
-        :before-upload="beforeUpload"
-        :on-success="handleUpSuccess"
-        :headers="upHeaders"
-        multiple
-        accept="image/*,.ppt,.pdf,.doc,.docx,.xls,.xlsx"
-      >
-        <el-button size="small" type="primary">上传文件</el-button>
-        <template #tip>
-          <div class="el-upload__tip">
-            可上传pdf,word,ppt,excel,图片文件,大小不超过50M
-          </div>
-        </template>
-      </el-upload>
-    </div>
+        <i
+          class="el-icon-delete"
+          @click="deleteFile(index)"
+          style="color: red"
+          v-if="data.action == 'up'"
+        ></i>
+        <el-link :href="item.path" target="_blank" type="primary">{{
+          item.name
+        }}</el-link>
+      </div>
+    </el-form>
     <el-divider></el-divider>
     <div style="text-align: right">
       <el-button
@@ -116,8 +104,12 @@
 <style>
 .ma {
   margin-bottom: 10px;
+  font-size: 20px;
 }
-.term {
+.el-form-item {
+  margin-bottom: 0px;
+}
+/* .term {
   color: rgba(0, 0, 0, 0.85);
   font-weight: bold;
   font-size: 16px;
@@ -126,7 +118,7 @@
   color: rgba(0, 0, 0, 0.65);
   font-weight: bold;
   font-size: 16px;
-}
+} */
 .litem {
   margin-left: 2px;
   cursor: pointer;
@@ -140,7 +132,7 @@ import {
   upRecord,
   rejectRecord,
   confirmRecord,
-  deleteRecord
+  deleteRecord,
 } from "@/api/record";
 export default {
   name: "recorddo",
@@ -161,7 +153,7 @@ export default {
   },
   methods: {
     initRecord() {
-      this.record = Object.assign({}, this.data.record); 
+      this.record = Object.assign({}, this.data.record);
     },
     initList() {
       for (var i = 0; i < this.record.files_.length; i++) {
@@ -178,7 +170,7 @@ export default {
         name: res.data.name,
         path: res.data.path,
       });
-      this.handleRemove(file)
+      this.handleRemove(file);
     },
     handleRemove(file) {
       // 实现删除文件
@@ -195,10 +187,17 @@ export default {
       }
       return isLt2M;
     },
-    deleteFile(index){
-      this.$confirm('确定删除该文件, 是否继续?', {type:'error'}).then(() => {
-          this.fileList.splice(index, 1)
-        }).catch(e=>{})
+    deleteFile(index) {
+      this.$confirm("确定删除该文件, 是否继续?", { type: "error" })
+        .then(() => {
+          this.fileList.splice(index, 1);
+        })
+        .catch((e) => {});
+    },
+    yeschange(val) {
+      if (!val) {
+        this.fileList = [];
+      }
     },
     confirm() {
       if (this.data.action == "update") {
@@ -235,18 +234,17 @@ export default {
         this.$emit("handleDo");
       } else if (this.data.action == "delete") {
         this.$confirm("确认删除?", "警告", {
-        type: "error",
-      })
-        .then(async () => {
-          await deleteRecord(this.record.id);
-          this.$message.success("成功");
-          this.$emit("handleDo");
+          type: "error",
         })
-        .catch((err) => {
-          console.error(err);
-        });
+          .then(async () => {
+            await deleteRecord(this.record.id);
+            this.$message.success("成功");
+            this.$emit("handleDo");
+          })
+          .catch((err) => {
+            console.error(err);
+          });
       }
-
     },
   },
 };