From cfa6fbe23b5aea9b400fab78e04239b64d0dda92 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 18:44:35 +0800
Subject: [PATCH] 工单下发分页优化

---
 src/views/system/work-order/distribute/index.vue |   55 ++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 90f3c72..5bd701e 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -18,11 +18,19 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
           <el-form-item label="鍏抽敭璇�" prop="keyword">
             <el-input
-              v-model="queryParams.menuName"
+              v-model="queryParams.keyword"
               placeholder="鍏抽敭璇嶆悳绱�"
               clearable
               @keyup.enter.native="page"
+              @clear="page"
             />
+          </el-form-item>
+          <el-form-item label="鏁呴殰绫诲瀷" prop="errorTypeList">
+            <el-select v-model="queryParams.errorTypeList" multiple placeholder="鏁呴殰绫诲瀷" clearable @change="page" @clear="page">
+              <el-option v-for="dict in dict.type.error_type"
+                         :value="dict.value"
+                         :label="dict.label"/>
+            </el-select>
           </el-form-item>
           <el-form-item label="涓嬪彂鐘舵��" prop="status">
             <el-select v-model="queryParams.status" @change="page" placeholder="涓嬪彂鐘舵��" clearable>
@@ -71,10 +79,11 @@
               </el-date-picker>
             </el-form-item>
             <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
-              <el-select v-model="fastDistributeForm.errorType">
-                <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
-                <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
-                <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+              <el-select v-model="fastDistributeForm.errorType" multiple>
+                <el-option v-for="dict in dict.type.error_type"
+                           :value="dict.value"
+                           :key="dict.value"
+                           :label="dict.label"/>
               </el-select>
             </el-form-item>
             <el-form-item label="鏁伴噺闄愬埗" prop="fastNumLimit">
@@ -96,10 +105,22 @@
         <el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="宸ュ崟鍙�" align="center" prop="workOrderNo"/>
-          <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName"/>
-          <el-table-column label="宸ュ崟鏉ユ簮" align="center" prop="source"/>
+          <el-table-column label="鏁呴殰鐐逛綅" align="center" prop="source">
+            <template slot-scope="scope">
+              <el-popover
+                placement="right"
+                :title="scope.row.important ? '閲嶇偣鐐逛綅': '姝e父鐐逛綅'"
+                width="200"
+                trigger="hover">
+                <span :class="{important: scope.row.important}" slot="reference">{{ scope.row.source }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
           <el-table-column label="鏁呴殰绫诲瀷" align="center" prop="errorType"/>
+          <el-table-column label="杩愮淮鍗曚綅" align="center" prop="unitName"/>
           <el-table-column label="浜х敓鏃堕棿" align="center" prop="createTime"/>
+          <el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂浜�" align="center" prop="realName"/>
+          <el-table-column v-if="queryParams.status === 'DISTRIBUTED'" label="涓嬪彂鏃堕棿" align="center" prop="distributeTime"/>
         </el-table>
 
         <pagination
@@ -145,16 +166,17 @@
           </el-select>
         </el-form-item>
         <el-form-item label="鏁呴殰绫诲瀷" prop="errorType">
-          <el-select v-model="form.errorType">
-            <el-option label="甯傛斂鏂藉伐" value="甯傛斂鏂藉伐"/>
-            <el-option label="璁惧鏁呴殰" value="璁惧鏁呴殰"/>
-            <el-option label="璁惧閬楀け" value="璁惧閬楀け"/>
+          <el-select v-model="form.errorType" multiple>
+            <el-option v-for="dict in dict.type.error_type"
+                       :value="dict.value"
+                       :key="dict.value"
+                       :label="dict.label"/>
           </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
         <el-button @click="cancel">鍙� 娑�</el-button>
+        <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
       </div>
     </el-dialog>
 
@@ -166,6 +188,7 @@
 import {workList} from "@/api/platform/unit";
 import { pointSelectData } from "@/api/platform/point";
 export default {
+  dicts: ['error_type'],
   name: 'index',
   data() {
     return {
@@ -275,7 +298,7 @@
   methods: {
     setPointId(selectedValue) {
       const selectedItem = this.pointList.find(item => item.value === selectedValue);
-      this.form.pointId = selectedItem.id
+      this.form.serialNumber = selectedItem.id
     },
     submitSetting() {
       this.$refs['settingForm'].validate((valid) => {
@@ -419,6 +442,12 @@
 </script>
 
 <style scoped>
+.important {
+  color: red;
+}
+/deep/ .el-popover__title {
+  margin-bottom: 0px;
+}
 .row {
   padding: 0 20px;
 }

--
Gitblit v1.8.0