Merge branch 'develop' into developer/yanjiaxu

src/views/processing/processed-review/index.vue

@@ -158,7 +158,8 @@ export default {
   justify-content: space-around;
 }
 .box-card {
-  margin-bottom: 31px;
+  margin-bottom: 15px;
+  font-size: 14px;
   ::v-deep .el-card__body {
     display: flex;
     justify-content: space-between;
@@ -175,6 +176,14 @@ export default {
   .cell-progress {
     width: 200px;
   }
+  .cell-lable {
+    color: #515a6e;
+    font-size: 13px;
+  }
+  .cell-value {
+    font-size: 14px;
+    color: #606266;
+  }
   .cell-value.green {
     color: #19be6b;
   }

src/views/processing/unprocessed-review/index.vue

@@ -276,7 +276,8 @@ export default {
   justify-content: space-around;
 }
 .box-card {
-  margin-bottom: 31px;
+  margin-bottom: 15px;
+  font-size: 14px;
   ::v-deep .el-card__body {
     display: flex;
     justify-content: space-between;
@@ -293,6 +294,14 @@ export default {
   .cell-progress {
     width: 200px;
   }
+  .cell-lable {
+    color: #515a6e;
+    font-size: 13px;
+  }
+  .cell-value {
+    font-size: 14px;
+    color: #606266;
+  }
   .cell-value.yellow {
     color: #fea623;
   }

src/views/review/view/index.vue

 <template>
-  <page-standard>
+  <el-card>
+    <div slot="header" class="clearfix">
+      <span>查看评审</span>
+      <el-button
+        size="mini"
+        icon="el-icon-back"
+        class="back-btn"
+        type="text"
+        @click="handleBack"
+      >
+        返回
+      </el-button>
+      <span class="card-top-text"
+        >参与评案人员: 张学良(组长)、于风至、赵一荻</span
+      >
+    </div>
     <div class="subtitle">评审对象</div>
     <el-row :gutter="20" justify="center" type="flex">
       <el-col :span="20">
@@ -35,34 +50,34 @@
         <message-item></message-item>
       </el-col>
     </el-row>
-    <div class="subtitle">讨论区</div>
-    <el-row :gutter="20" class="mt10" justify="center" type="flex">
-      <el-col :span="22">
-        <div class="message-box mt5">
-          <el-avatar :size="60" class="mr10" :src="circleUrl"></el-avatar>
-          <div style="width: 100%">
-            <el-input
-              v-model="model.deptName"
-              placeholder="输入评论内容"
-              clearable
-              type="textarea"
-              :autosize="false"
-              show-word-limit
-              :maxlength="100"
-              :rows="5"
-            />
-            <el-button size="mini" class="mt5" type="primary" plain
-              >发布评论</el-button
-            >
-            <div class="subtitle mt10">全部评论5条</div>
-            <talk-item> </talk-item>
-            <talk-item :has-child="true"> </talk-item>
-            <talk-item> </talk-item>
-          </div>
-        </div>
-      </el-col>
-    </el-row>
-  </page-standard>
+    <!--    <div class="subtitle">讨论区</div>-->
+    <!--    <el-row :gutter="20" class="mt10" justify="center" type="flex">-->
+    <!--      <el-col :span="22">-->
+    <!--        <div class="message-box mt5">-->
+    <!--          <el-avatar :size="60" class="mr10" :src="circleUrl"></el-avatar>-->
+    <!--          <div style="width: 100%">-->
+    <!--            <el-input-->
+    <!--              v-model="model.deptName"-->
+    <!--              placeholder="输入评论内容"-->
+    <!--              clearable-->
+    <!--              type="textarea"-->
+    <!--              :autosize="false"-->
+    <!--              show-word-limit-->
+    <!--              :maxlength="100"-->
+    <!--              :rows="5"-->
+    <!--            />-->
+    <!--            <el-button size="mini" class="mt5" type="primary" plain-->
+    <!--              >发布评论</el-button-->
+    <!--            >-->
+    <!--            <div class="subtitle mt10">全部评论5条</div>-->
+    <!--            <talk-item> </talk-item>-->
+    <!--            <talk-item :hasChild="true"> </talk-item>-->
+    <!--            <talk-item> </talk-item>-->
+    <!--          </div>-->
+    <!--        </div>-->
+    <!--      </el-col>-->
+    <!--    </el-row>-->
+  </el-card>
 </template>
 <script>
 import page from '@/mixins/page'
@@ -80,25 +95,23 @@ export default {
         'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
     }
   },
-  watch: {
-    'dialogManger.refreshList': function (val) {
-      if (val) {
-        this.loadData()
-        this.dialogManger.refreshList = false
-      }
-    }
-  },
   methods: {
-    handleAdd() {
-      this.dialogManger.dialogVisible = true
-      this.dialogManger.source = {}
-    },
-    handleDelete() {},
-    handleUpdate(row) {
-      this.dialogManger.dialogVisible = true
-      this.dialogManger.source = row
+    handleBack() {
+      this.$router.back()
     }
+    // handleAdd() {
+    //   this.dialogManger.dialogVisible = true
+    //   this.dialogManger.source = {}
+    // }
   }
+  // watch: {
+  //   'dialogManger.refreshList': function (val) {
+  //     if (val) {
+  //       this.loadData()
+  //       this.dialogManger.refreshList = false
+  //     }
+  //   }
+  // }
 }
 </script>
 <style lang="scss" scoped>
@@ -108,4 +121,13 @@ export default {
   align-items: flex-start;
   font-size: 12px;
 }
+.back-btn {
+  float: right;
+  margin-right: 10px;
+}
+.card-top-text {
+  float: right;
+  margin-right: 50px;
+  font-size: 16px;
+}
 </style>

src/views/task/confirm-result/index.vue

@@ -185,13 +185,14 @@
             </el-form>
           </div>
           <!--返回按钮-->
-          <el-button
-            class="btn"
-            type="primary"
-            plain
-            @click="goToProcessedReview"
-            >返 回
-          </el-button>
+          <div class="bottom-btn">
+            <el-button type="warning" @click="goToProcessedReview">
+              返回
+            </el-button>
+            <el-button type="primary" @click="goToProcessedReview">
+              确认提交
+            </el-button>
+          </div>
         </div>
       </div>
     </page-standard>
@@ -828,4 +829,8 @@ td {
   width: 300px;
   height: 100%;
 }
+.bottom-btn {
+  display: flex;
+  justify-content: center;
+}
 </style>

src/views/task/new/index.vue

@@ -439,12 +439,26 @@ export default {
      * 小组信息修改
      * @param row 行内信息
      */
-    handleUpdate(row) {},
+    handleUpdate(row) {
+      row.name = ''
+    },
     /**
      * 小组信息删除
      * @param row 行内信息
      */
-    handleDelete(row) {},
+    handleDelete(row) {
+      this.$confirm('是否确认删除此条数据,删除后不可恢复', '删除', {
+        confirmButtonText: '确定',
+        concelButtonText: '取消',
+        type: 'warning',
+        customClass: 'box-logout',
+        cancelButtonClass: 'resetBtn',
+        closeOnClickModal: false,
+        confirmButtonClass: 'queryBtn'
+      }).then(() => {
+        this.tableData = this.tableData.filter(item => item.name !== row.name)
+      })
+    },
     /**
      * 保存人员
      * @param row