From b84170977daf22007861946cf484ac9856637877 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 18 Jul 2024 15:43:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A2=86=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/maintenanceReceive/index.vue    | 176 +++++++++++-------
 1 file changed, 108 insertions(+), 68 deletions(-)

diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue
index c60101a82c..5e5f748915 100644
--- a/yxt-as-ui/src/views/maintenanceReceive/index.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue
@@ -10,36 +10,60 @@
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
               <el-form-item label="维修状态">
-                <el-select v-model="queryParams.params.repairState" filterable clearable placeholder="请选择"
-                  style="width:100%">
-                  <el-option v-for="item in repairTypeList" :key="item.sid" :label="item.name" :value="item.name">
-                  </el-option>
+                <el-select
+                  v-model="queryParams.params.repairState"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                  style="width:100%"
+                >
+                  <el-option v-for="item in repairTypeList" :key="item.sid" :label="item.name" :value="item.name" />
                 </el-select>
               </el-form-item>
               <el-form-item label="工单编号">
                 <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="工单类型">
-                <el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择"
-                  style="width:100%">
-                  <el-option v-for="item in billTypeList" :key="item.dictKey" :label="item.dictValue"
-                    :value="item.dictValue">
-                  </el-option>
+                <el-select
+                  v-model="queryParams.params.billType"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                  style="width:100%"
+                >
+                  <el-option
+                    v-for="item in billTypeList"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictValue"
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="科目">
-                <el-select v-model="queryParams.params.subject" filterable clearable placeholder="请选择"
-                  style="width:100%">
-                  <el-option v-for="item in subjectList" :key="item.subjectSid" :label="item.subject"
-                    :value="item.subject">
-                  </el-option>
+                <el-select
+                  v-model="queryParams.params.subject"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                  style="width:100%"
+                >
+                  <el-option
+                    v-for="item in subjectList"
+                    :key="item.subjectSid"
+                    :label="item.subject"
+                    :value="item.subject"
+                  />
                 </el-select>
               </el-form-item>
               <el-form-item label="完成状态">
-                <el-select v-model="queryParams.params.completeState" filterable clearable placeholder="请选择"
-                  style="width:100%">
-                  <el-option v-for="item in completeStateList" :key="item.sid" :label="item.name" :value="item.sid">
-                  </el-option>
+                <el-select
+                  v-model="queryParams.params.completeState"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                  style="width:100%"
+                >
+                  <el-option v-for="item in completeStateList" :key="item.sid" :label="item.name" :value="item.sid" />
                 </el-select>
               </el-form-item>
               <el-form-item label="客户名称">
@@ -52,13 +76,23 @@
                 <el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="进厂日期">
-                <el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker
+                  v-model="queryParams.params.createTimeStart"
+                  type="date"
+                  placeholder="选择日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  style="width: 200px;"
+                />
                 至
-                <el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker
+                  v-model="queryParams.params.createTimeEnd"
+                  type="date"
+                  placeholder="选择日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  style="width: 200px;"
+                />
               </el-form-item>
 
             </el-form>
@@ -75,8 +109,13 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="selectionLineChangeHandle">
+          <el-table
+            v-loading="tableLoading"
+            :data="dataList"
+            border
+            style="width: 100%"
+            @selection-change="selectionLineChangeHandle"
+          >
             <el-table-column fixed width="50" type="selection" align="center" />
             <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
             <el-table-column prop="repairState" label="维修状态" align="center" />
@@ -102,8 +141,14 @@
         <div class="pages">
           <div class="tit" />
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination
+            v-show="dataList.length > 0"
+            :total="queryParams.total"
+            :page.sync="queryParams.current"
+            :limit.sync="queryParams.size"
+            class="pagination"
+            @pagination="loadList"
+          />
         </div>
       </div>
     </div>
@@ -138,7 +183,7 @@
       divOutInfo,
       divReturnInfo,
       divConfirmInfo,
-      divInfo,
+      divInfo
 
     },
     data() {
@@ -184,37 +229,37 @@
           size: 10,
           total: 0,
           params: {
-            "repairState": "",
-            "billNo": "",
-            "billType": "",
-            "subject": "",
-            "customerName": "",
-            "vehMark": "",
-            "vinNo": "",
-            "createTimeStart": "",
-            "createTimeEnd": "",
-            "completeState": "0",
+            'repairState': '',
+            'billNo': '',
+            'billType': '',
+            'subject': '',
+            'customerName': '',
+            'vehMark': '',
+            'vinNo': '',
+            'createTimeStart': '',
+            'createTimeEnd': '',
+            'completeState': '0'
           }
         },
 
         sids: [],
         selectionList: [],
         repairTypeList: [{
-            name: "维修中",
-            sid: "1"
+            name: '维修中',
+            sid: '1'
           },
           {
-            name: "维修完成",
-            sid: "2"
+            name: '维修完成',
+            sid: '2'
           }
         ],
         completeStateList: [{
-            name: "未完成",
-            sid: "0"
+            name: '未完成',
+            sid: '0'
           },
           {
-            name: "已完成",
-            sid: "1"
+            name: '已完成',
+            sid: '1'
           }
         ],
         billTypeList: [],
@@ -246,11 +291,10 @@
             this.subjectList = resp.data
           }
         })
-
       },
 
       selectionLineChangeHandle(val) {
-        console.log("val", val);
+        console.log('val', val)
 
         this.selectionList = val
         const aa = []
@@ -258,7 +302,6 @@
           aa.push(element.sid)
         })
         this.sids = aa
-
       },
       // 搜索条件效果
       clicksearchShow() {
@@ -291,7 +334,7 @@
       toOut() {
         // this.$refs['divOutInfo'].showAdd('236195bd-2c76-4e39-aacb-e6ed89b4ca3d')
         // this.viewState = 2
-        if (this.sids.length === 1) {
+        if (this.sids.length == 1) {
           this.viewState = 2
           this.$refs['divOutInfo'].showAdd(this.sids[0])
         } else {
@@ -305,7 +348,7 @@
       toReturn() {
         // this.$refs['divReturnInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50')
         // this.viewState = 3
-        if (this.sids.length === 1) {
+        if (this.sids.length == 1) {
           this.viewState = 3
           this.$refs['divReturnInfo'].showAdd(this.sids[0])
         } else {
@@ -320,9 +363,7 @@
         // this.viewState = 4
         // this.$refs['divConfirmInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50')
         if (this.sids.length === 1) {
-
-          if (this.selectionList[0].repairState == '2') {
-
+          if (this.selectionList[0].repairState == '维修完成') {
             this.viewState = 4
             this.$refs['divConfirmInfo'].showAdd(this.sids[0])
           } else {
@@ -332,7 +373,6 @@
               message: '只能选择维修完成的工单'
             })
           }
-
         } else {
           this.$message({
             showClose: true,
@@ -383,16 +423,16 @@
           size: 10,
           total: 0,
           params: {
-            "repairState": "",
-            "billNo": "",
-            "billType": "",
-            "subject": "",
-            "customerName": "",
-            "vehMark": "",
-            "vinNo": "",
-            "createTimeStart": "",
-            "createTimeEnd": "",
-            "completeState": "0",
+            'repairState': '',
+            'billNo': '',
+            'billType': '',
+            'subject': '',
+            'customerName': '',
+            'vehMark': '',
+            'vinNo': '',
+            'createTimeStart': '',
+            'createTimeEnd': '',
+            'completeState': '0'
           }
         }
         this.loadList()
@@ -404,8 +444,8 @@
 
       showResult(row) {
         this.viewState = 5
-        this.$refs['divAdd'].showAdd(row.sid)
-      },
+        this.$refs['divAdd'].showInfos(row.sid)
+      }
     }
   }
 </script>

From 1616735bef22d9ec678711a668c34379cb75a66d Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Thu, 18 Jul 2024 16:01:55 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A2=86=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/maintenanceReceive/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue
index 5e5f748915..299d13399d 100644
--- a/yxt-as-ui/src/views/maintenanceReceive/index.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue
@@ -299,7 +299,7 @@
         this.selectionList = val
         const aa = []
         val.forEach(element => {
-          aa.push(element.sid)
+          aa.push(element.billSid)
         })
         this.sids = aa
       },