From 1c6ed2bfb95676d78a2a020cbd4cb99731ad349d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 30 Mar 2021 10:00:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BF=E6=A2=AD=E6=A1=86=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/supervision/record.vue   | 30 +++++++++++++++--------
 client/src/views/supervision/recorddo.vue | 11 ++++++---
 client/src/views/supervision/taskdo.vue   | 11 ++++++---
 client/src/views/supervision/taskinit.vue | 17 +++++++++++--
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/client/src/views/supervision/record.vue b/client/src/views/supervision/record.vue
index 945ce2f..df0df6f 100644
--- a/client/src/views/supervision/record.vue
+++ b/client/src/views/supervision/record.vue
@@ -81,13 +81,12 @@
         >
       </div>
       <div style="margin-top: 10px">
-        <el-button type="primary" @click="centerDialogVisible = true" plain
-          >主动上报</el-button
+        <el-button type="primary" @click="centerDialogVisible = true" >主动上报</el-button
         >
         <el-dialog
-          title="提示"
+          title="主动报送"
           :visible.sync="centerDialogVisible"
-          width="50%"
+          width="70%"
           center
         >
           <el-transfer
@@ -96,9 +95,9 @@
             :titles="['材料清单', '选择的清单']"
             :props="{ key: 'id', label: 'name' }"
           />
-          <span slot="footer" class="dialog-footer">
+          <div slot="footer" style="text-align:right">
             <el-button type="primary" @click="contentup()">确认</el-button>
-          </span>
+          </div>
         </el-dialog>
       </div>
     </el-card>
@@ -132,18 +131,17 @@
         <el-table-column label="材料名称">
           <template slot-scope="scope">{{ scope.row.content_.name }}</template>
         </el-table-column>
+        <el-table-column label="报送要求">
+          <template slot-scope="scope">{{ scope.row.note }}</template>
+        </el-table-column>
         <el-table-column label="上报情况">
           <template slot-scope="scope" v-if="scope.row.up_user_"
                       >{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
                     >
         </el-table-column>
-        <el-table-column label="上报备注">
-          <template slot-scope="scope">{{ scope.row.note }}</template>
-        </el-table-column>
         <el-table-column label="上报说明">
           <template slot-scope="scope">{{ scope.row.noteb }}</template>
         </el-table-column>
-
         <el-table-column label="上报单位">
           <template slot-scope="scope">{{
             scope.row.belong_dept_.name
@@ -264,6 +262,18 @@
     </el-drawer>
   </div>
 </template>
+<style lang="scss">
+.el-transfer-panel {
+  width: 470px;
+}
+.el-transfer__buttons {
+  padding: 0 2px;
+  .el-button {
+    display: block;
+  }
+}
+
+</style>
 <script>
 import { getOrgList } from "@/api/org";
 import { getRecordList,createself } from "@/api/record";
diff --git a/client/src/views/supervision/recorddo.vue b/client/src/views/supervision/recorddo.vue
index 419455b..6b7f41c 100644
--- a/client/src/views/supervision/recorddo.vue
+++ b/client/src/views/supervision/recorddo.vue
@@ -19,7 +19,7 @@
       <span class="desc">{{ record.task_.end_date }}</span>
     </div>
     <div class="ma" v-if="record.task_">
-      <span class="term">上报备注</span>
+      <span class="term">报送要求</span>
       <el-input
         v-model="record.note"
         placeholder=""
@@ -132,15 +132,20 @@ export default {
     return {
       upHeaders: upHeaders(),
       upUrl: upUrl(),
-      record: this.data.record,
+      record: null,
       fileList: [],
     };
   },
-  created() {},
+  created() {
+    this.initRecord();
+  },
   mounted() {
     this.initList();
   },
   methods: {
+    initRecord() {
+      this.record = Object.assign({}, this.data.record); 
+    },
     initList() {
       for (var i = 0; i < this.record.files_.length; i++) {
         this.fileList.push({
diff --git a/client/src/views/supervision/taskdo.vue b/client/src/views/supervision/taskdo.vue
index a6abab9..47c2c24 100644
--- a/client/src/views/supervision/taskdo.vue
+++ b/client/src/views/supervision/taskdo.vue
@@ -154,7 +154,7 @@
                       }}</template
                     >
                   </el-table-column>
-                  <el-table-column label="上报备注">
+                  <el-table-column label="报送要求">
           <template slot-scope="scope">{{ scope.row.note }}</template>
         </el-table-column>
                   <el-table-column label="文件">
@@ -334,7 +334,7 @@
                       >{{ scope.row.up_user_.name }}/{{ scope.row.up_date }}</template
                     >
                   </el-table-column>
-                  <el-table-column label="上报备注">
+                  <el-table-column label="报送要求">
           <template slot-scope="scope">{{ scope.row.note }}</template>
         </el-table-column>
                   <el-table-column label="文件">
@@ -451,6 +451,7 @@
       :visible.sync="dialogVisible"
       title="初始化任务"
       :close-on-click-modal="false"
+      width="70%"
     >
       <taskinit ref="taskinit" @handleChose="chooseComplete"></taskinit>
     </el-dialog>
@@ -486,6 +487,7 @@
   cursor: pointer;
   color: #409eff;
 }
+
 </style>
 <script>
 import { gettask, inittask, gettaskcontents, gettaskdepts, starttask } from "@/api/task";
@@ -543,7 +545,8 @@ export default {
     gettaskcontents() {
       gettaskcontents(this.task.id).then((res) => {
         this.contents = res.data;
-        this.listLoading = true;
+        if(this.contents[0]){
+          this.listLoading = true;
         this.nowcontent = {
           id: this.contents[0].id,
           name: this.contents[0].name,
@@ -556,6 +559,8 @@ export default {
           this.listLoading = false;
           this.recordList1 = res.data;
         });
+        }
+        
       });
     },
     starttask(){
diff --git a/client/src/views/supervision/taskinit.vue b/client/src/views/supervision/taskinit.vue
index 55277a0..4560dce 100644
--- a/client/src/views/supervision/taskinit.vue
+++ b/client/src/views/supervision/taskinit.vue
@@ -1,24 +1,37 @@
 <template>
   <div>
+    <div>
     <el-transfer
       v-model="contents"
       :data="contentOptions"
       :titles="['材料清单', '选择的清单']"
       :props="{ key : 'id' , label: 'name' }"
     />
+    </div>
+    <div style="margin-top:6px">
     <el-transfer
       v-model="depts"
       :data="deptOptions"
       :titles="['单位列表', '选择的单位']"
       :props="{ key : 'id' , label: 'name' }"
     />
-
+    </div>
     <div style="text-align: right">
       <el-button type="primary" @click="confirm()">确认</el-button>
     </div>
   </div>
 </template>
-<style >
+<style lang="scss">
+.el-transfer-panel {
+  width: 470px;
+}
+.el-transfer__buttons {
+  padding: 0 2px;
+  .el-button {
+    display: block;
+  }
+}
+
 </style>
 <script>
 import { getOrgList } from "@/api/org";