From 600725fd9c21f36c2de2b0483fea49343f0686ea Mon Sep 17 00:00:00 2001
From: luobisheng <727299681@qq.com>
Date: 星期四, 08 十二月 2022 14:22:44 +0800
Subject: [PATCH] 案卷查询搜索字段更新

---
 src/views/operate/viewEvent/index.vue            |   18 +++++++++++++-----
 src/views/intelligentPatrol/studyJudge/index.vue |   24 ++++++++++++++----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue
index f3960a0..5872fd5 100644
--- a/src/views/intelligentPatrol/studyJudge/index.vue
+++ b/src/views/intelligentPatrol/studyJudge/index.vue
@@ -55,9 +55,9 @@
               <el-form-item v-if="eventInfoData.store" label="搴楅摵寰楀垎:">
                 <span>{{ selectStoreChange(eventInfoData.store).storeScore }}</span>
               </el-form-item>
-              <el-form-item label="澶勭悊鎰忚:" prop="advice">
-                <el-radio-group v-model="eventInfoData.advice">
-                  <el-radio :label="item.id" v-for="item in adviceList" :key="item.id">{{ item.label }}</el-radio>
+              <el-form-item label="澶勭悊鎰忚:" prop="state">
+                <el-radio-group v-model="eventInfoData.state">
+                  <el-radio :label="item.id" v-for="item in stateList" :key="item.id">{{ item.label }}</el-radio>
                 </el-radio-group>
               </el-form-item>
               <el-form-item label="澶х被鍚嶇О:" prop="categoryId">
@@ -99,7 +99,6 @@
 import { FILE_ORIGINAL_URL } from "@/utils";
 import { validateCarNum } from "@/utils/validate";
 import MyDispatch from '@/components/dispatch';
-import { formatDate } from "@/utils/date";
 
 export default {
   components: { MyDispatch },
@@ -151,7 +150,7 @@
         register: 0
       },
       currentEvent: {},
-      adviceList: [
+      stateList: [
         {
           id: 2,
           label: '涓婃姤',
@@ -171,7 +170,7 @@
       ],
       eventInfoData: null,
       rules:{
-        advice:[
+        state:[
           {
             required: true, trigger:['blur', 'change'], message: '澶勭悊鎰忚涓嶈兘涓虹┖'
           },
@@ -233,7 +232,7 @@
           this.eventInfoData.baseId = this.currentEvent.baseId;
 
           // 璋冨害
-          if (this.eventInfoData.advice === 6) {
+          if (this.eventInfoData.state === 6) {
             this.isShowDialog = true;
           } else {
             this.confirmInspection();
@@ -248,7 +247,7 @@
       this.eventInfoData = {
         baseId: null,
         store: null,
-        advice: null,
+        state: null,
         categoryId: null,
         typeId: null,
         carNumber: null,
@@ -263,7 +262,12 @@
     },
 
     confirmInspection(data) {
-      basecase.confirmInspection({ ...this.eventInfoData, ...data })
+      if (data) {
+        data.baseCaseId = data.id;
+      }
+      const eventParams = Object.assign({}, this.eventInfoData);
+      delete eventParams.store;
+      basecase.confirmInspection({ ...eventParams, ...data })
           .then(() => {
             this.$message.success('鎿嶄綔鎴愬姛');
             this.getInspectionData();
@@ -278,7 +282,7 @@
 
     selectStoreChange(id) {
       const selectedStore = this.storeList.find(store => store.id === id);
-      this.eventInfoData.shopName = selectedStore.storeName;
+      this.eventInfoData.shopName = selectedStore.id;
       this.eventInfoData.linkShop = 1;
       return selectedStore;
     }
diff --git a/src/views/operate/viewEvent/index.vue b/src/views/operate/viewEvent/index.vue
index 628f749..cb544e7 100644
--- a/src/views/operate/viewEvent/index.vue
+++ b/src/views/operate/viewEvent/index.vue
@@ -23,9 +23,8 @@
         <div class="contentItem">
           <div style="width: 80px">鎸夌ぞ鍖�:</div>
           <div class="search">
-            <el-select clearable v-model="searchData.communityId" placeholder="璇烽�夋嫨绀惧尯">
-              <el-option v-for="option in communityOptions" :key="option.id" :value="option.id" :label="option.regionName"></el-option>
-            </el-select>
+            <el-cascader clearable v-model="searchData.community" :props="communityProps" :options="communityOptions" placeholder="璇烽�夋嫨绀惧尯">
+            </el-cascader>
           </div>
         </div>
         <div class="contentItem">
@@ -208,12 +207,16 @@
       currentPage: 1,
       categoryOptions: CATEGOTY,
       communityOptions: [],
+      communityProps: {
+        label: 'regionName',
+        value: 'id'
+      },
       myproblem: 1,
       number: "",
       searchData: {
         categories: null,
         number: null,
-        communityId: null,
+        community: null,
         endTime: null,
         site: null,
         startTime: null,
@@ -227,11 +230,16 @@
   methods: {
     // 鑾峰彇鍒楄〃
     getList() {
+      const searchData = Object.assign({}, this.searchData);
+      if (this.searchData.community) {
+        searchData.communityId = searchData.community[1];
+      }
+      delete searchData.community;
       casequery
         .baseCaseQuery({
           current: this.currentPage,
           pageSize: this.pageSize,
-          ...this.searchData,
+          ...searchData,
         })
         .then((res) => {
           this.tableData = res.records;

--
Gitblit v1.8.0