Merge branch 'dev' into 'master'

Dev

See merge request !15

src/common/components/base/tableView.vue

@@ -116,6 +116,9 @@ export default {
       type: Boolean,
       default: true,
     },
+    cellClassName: {
+      type: Function,
+    },
   },
   computed: {
     ...mapState({
@@ -350,15 +353,6 @@ export default {
         }
       }
     },
-    cellClassName({ row }) {
-      const item = this.highIds.find(
-        (item) => item === row.id,
-      )
-      if (item) {
-        return 'green'
-      }
-      return ''
-    },
     // 单选
     radioChange(options) {
       this.$emit('currentChange', options)

src/common/components/element-ui.js

@@ -28,6 +28,7 @@ import {
   Dropdown,
   DropdownItem,
   DropdownMenu,
+  Tooltip,
 } from 'element-ui'
 
 const components = [
@@ -55,6 +56,7 @@ const components = [
   Dropdown,
   DropdownItem,
   DropdownMenu,
+  Tooltip,
 ]
 
 export default {

src/views/taskManage/index.vue

@@ -120,38 +120,8 @@
         <table-view
           :tableColumns="tableColumns"
           :sourceData="sourceData"
+          :cellClassName="cellClassName"
         >
-          <template #serialNumberRender="{ row, rowIndex }">
-            <div>
-              <el-tooltip
-                v-if="row.sign === 0"
-                content="该工单已回复"
-                placement="bottom"
-                effect="light"
-              >
-                <span
-                  style="
-                    font-size: 16px;
-                    color: rgb(255, 153, 0);
-                    float: right;
-                    margin-top: 4px;
-                    margin-left: 5px;
-                    position: absolute;
-                    top: 40%;
-                    cursor: pointer;
-                    right: 38px;
-                    transform: translateY(-50%);
-                    display: inline-block;
-                    width: 8px;
-                    height: 8px;
-                    background-color: green;
-                    border-radius: 50%;
-                  "
-                ></span>
-              </el-tooltip>
-              <span>{{ rowIndex + 1 }}</span>
-            </div>
-          </template>
         </table-view>
       </div>
       <div class="pagination">
@@ -173,6 +143,7 @@
       :close-on-click-modal="false"
       :visible.sync="detailVisible"
       width="900px"
+      @close="getlist()"
     >
       <div class="step-bar">
         <!-- step-pass 已经完成,step-active当前步骤 -->
@@ -343,17 +314,17 @@
         <div style="margin-top: 10px; text-align: right">
           <el-button
             size="mini"
+            type="primary"
+            @click="reply"
+            >回复</el-button
+          >
+          <el-button
+            size="mini"
             type="success"
             v-if="statusCode === 'PRE_HANDLING'"
             @click="confirm"
             >受理</el-button
           >
-          <el-button
-            size="mini"
-            type="primary"
-            @click="reply"
-            >回复</el-button
-          >
         </div>
       </div>
     </el-dialog>
@@ -475,6 +446,25 @@ export default {
     tableColumns() {
       // const employeeId = this.employeeId
       return [
+        {
+          label: '工单标题',
+          key: 'title',
+          minWidth: 120,
+          align: 'left',
+          render: (item) => (
+            <span>
+              <span
+                class={
+                  item.sign === 0
+                    ? 'set-blue'
+                    : 'order-title'
+                }
+              >
+                {item.title}
+              </span>
+            </span>
+          ),
+        },
         { label: '工单编号', key: 'orderNo', width: 110 },
         {
           label: '工单类型',
@@ -482,10 +472,9 @@ export default {
           width: 80,
         },
         {
-          label: '工单标题',
-          key: 'title',
-          minWidth: 120,
-          align: 'left',
+          label: '工单状态',
+          key: 'orderStatusTxt',
+          width: 80,
         },
         {
           label: '负责人',
@@ -499,12 +488,6 @@ export default {
         },
 
         {
-          label: '工单状态',
-          key: 'orderStatusTxt',
-          width: 80,
-        },
-
-        {
           label: '创建时间',
           key: 'createTime',
           width: 130,
@@ -567,6 +550,40 @@ export default {
     },
   },
   methods: {
+    cellClassName({ row, columnIndex }) {
+      if (
+        (row.orderStatus === 'TO_BE_ASSIGN' ||
+          row.orderStatus === 'TO_BE_CONFIRMED' ||
+          row.orderStatus === 'IN_PROGRESS') &&
+        columnIndex === 4
+      ) {
+        return 'order-blue'
+      }
+      if (
+        row.orderStatus === 'PRE_HANDLING' &&
+        columnIndex === 4 &&
+        row.sign === 1
+      ) {
+        return 'order-red'
+      }
+      if (
+        row.orderStatus === 'PRE_HANDLING' &&
+        columnIndex === 4 &&
+        row.sign === 0
+      ) {
+        return 'order-green'
+      }
+      if (
+        row.orderStatus === 'PRE_HANDLING' &&
+        columnIndex === 4 &&
+        !row.sign
+      ) {
+        return 'order-orange'
+      }
+      if (columnIndex === 4) {
+        return 'order-grey'
+      }
+    },
     async getOrderTypes() {
       try {
         const res = await getOrderType()
@@ -665,7 +682,7 @@ export default {
       }
       try {
         const res = await workAssigned(
-          this.selections[0].id,
+          this.currentRowId,
           this.user,
         )
         if (res.code === 200) {
@@ -762,6 +779,54 @@ export default {
   overflow: hidden;
 
   &::v-deep {
+    .order-blue {
+      background-color: #409EFF !important;
+      color: #fff;
+    }
+
+    .order-red {
+      background-color: #F56C6C !important;
+      color: #fff;
+    }
+
+    .order-green {
+      background-color: #67C23A !important;
+      color: #fff;
+    }
+
+    .order-orange {
+      background-color: #E6A23C !important;
+      color: #fff;
+    }
+
+    .order-grey {
+      background-color: #909399 !important;
+      color: #fff;
+    }
+    .set-blue {
+      margin-left: 20px;
+    }
+
+    .el-table tr {
+      position: relative;
+    }
+
+    .set-blue::after {
+      position: absolute;
+      content: '';
+      display: inline-block;
+      width: 8px;
+      height: 8px;
+      background-color: green;
+      border-radius: 50%;
+      left: 6px;
+      top: 50%;
+      transform: translateY(-50%);
+    }
+
+    .order-title {
+      margin-left: 20px;
+    }
     .el-tree-node {
       font-size: 14px;
     }