From 426d3d33f23bd04e7cafda728cdcc82f11d5baa3 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 21 二月 2023 17:09:07 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

---
 src/views/operate/disposal/casepool/pool/createUser/vio/index.vue |   66 +++++++++++++++------------------
 1 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
index 982f8cb..15d17ee 100644
--- a/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
+++ b/src/views/operate/disposal/casepool/pool/createUser/vio/index.vue
@@ -83,8 +83,9 @@
                         </el-form-item>
                         <!-- 鍏宠仈鍟嗛摵鍚嶇О -->
                         <el-form-item class="optionItems" label="鍏宠仈鍟嗛摵鍚嶇О:" prop="shopName">
-                            <el-input placeholder="璇峰～鍐欏叧鑱斿晢閾哄悕绉�" v-model="vio.shopName"
-                                :disabled="vio.linkShop === 1 ?false : true"></el-input>
+                          <el-select v-model="vio.shopName" :disabled="vio.linkShop === 0" placeholder="璇峰～鍐欏叧鑱斿晢閾哄悕绉�">
+                            <el-option v-for="store in storeList" :key="store.id" :value="store.id" :label="store.storeName"></el-option>
+                          </el-select>
                         </el-form-item>
                     </div>
                     <!-- 濉啓杞︾墝鍙� -->
@@ -137,10 +138,12 @@
     </div>
 </template>
 <script>
-import MyMap from '@/components/map'
+// import MyMap from "@/components/map";
+import MyMap from "@/components/map/leafletMap.vue";
 import { validateName, validatePhone, validateCarNum, validateCardId } from '@/utils/validate'
 import { getTypeList } from '@/utils/helper'
 import { parseTime } from "@/utils/index"
+import { getStoreInfoList } from "@/api/operate/storeManagement";
 export default {
     components: {
         MyMap
@@ -209,17 +212,6 @@
                 callback(new Error('鎶ヨ鏃堕棿涓嶈兘涓虹┖'))
             }
         }
-        const checkCarNumber = (rule, value, callback) => {
-            if (value) {
-                if (validateCarNum(value)) {
-                    callback();
-                } else {
-                    callback(new Error('璇疯緭鍏ユ纭殑杞︾墝鍙�'));
-                }
-            } else {
-                callback(new Error("杞︾墝鍙蜂笉鑳戒负绌�"))
-            }
-        }
         const checkName = (rule, value, callback) => {
             if (value) {
                 validateName(value) ? callback() : callback(new Error('璇疯緭鍏ユ纭殑濮撳悕'))
@@ -263,7 +255,6 @@
             vio: {
                 actionCause: "",//妗堢敱
                 carNumber: "",//杞︾墝鍙�
-                // category:1,//1:杩濊2:杩濆缓
                 categoryId: '',//澶х被
                 communityId: '',//鎵�灞炵ぞ鍖�
                 description: '',//闂鎻忚堪
@@ -286,12 +277,6 @@
                         required: true, trigger: 'blur', validator: checkCause,
                     }
                 ],
-                // //杞︾墝鍙�
-                // carNumber: [
-                //     {
-                //         required: true, trigger: 'blur', validator: checkCarNumber
-                //     }
-                // ],
                 //澶х被
                 categoryId: [
                     {
@@ -383,6 +368,7 @@
             streetList: [],
             communityList: [],
             anYouList: [],
+            storeList: []
         }
     },
     created() {
@@ -391,6 +377,7 @@
         setBigKindList();
         getStreetList(0);
         getEventLevel();
+        this.getShopList();
     },
     methods: {
         handleStop() {
@@ -417,7 +404,6 @@
                     return item;
                 }
             })
-            console.log(this.anYouList);
         },
         // 鏌ヨ澶х被鍒楄〃
         async getBigKind() {
@@ -513,9 +499,7 @@
         },
         // 琛楅亾鏇存敼
         handleStreet(id) {
-            console.log(id);
             this.vio.communityId = '';
-            // this.communityList = getTypeList(1,'11')
             this.$axios({
                 method: 'get',
                 url: `sccg/sccg_region/getChildren/${id}`
@@ -544,7 +528,17 @@
             if (e.target.value) {
                 this.vio.actionCause = e.target.value;
             }
-        }
+        },
+
+      getShopList() {
+        getStoreInfoList({ current: 1, size: 100 })
+            .then(({ list }) => {
+              this.storeList = list;
+            })
+            .catch(err => {
+              this.$message.error(err)
+            })
+      }
     },
     props: ['mytype', 'changeDialog', 'refresh']
 }
@@ -579,19 +573,19 @@
 
         .input-form {
             .el-form {
-                &::v-deep .el-form-item__label {
-                    color: #4b9bb7;
-                }
+                // &::v-deep .el-form-item__label {
+                //     color: #4b9bb7;
+                // }
 
-                &::v-deep .el-input__inner {
-                    background-color: #09152f;
-                    border: 1px solid #17324c;
-                }
+                // &::v-deep .el-input__inner {
+                //     // background-color: #09152f;
+                //     border: 1px solid #17324c;
+                // }
 
-                &::v-deep .el-textarea__inner {
-                    background-color: #09152f;
-                    border: 1px solid #17324c;
-                }
+                // &::v-deep .el-textarea__inner {
+                //     // background-color: #09152f;
+                //     border: 1px solid #17324c;
+                // }
             }
         }
 

--
Gitblit v1.8.0