From 1f88807491dc926b7ba2bceb31b597625d589c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98chaoosc=E2=80=99?= <‘chaoosc@gmail.com’>
Date: Sat, 22 Jul 2023 16:38:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=B9=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=9A=84=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basicdata/basicStorageServices.js  |  6 ++---
 .../basicdata/brand/basicStorageServices.vue  | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/option/basicdata/basicStorageServices.js b/src/option/basicdata/basicStorageServices.js
index feca2d12..29aad493 100644
--- a/src/option/basicdata/basicStorageServices.js
+++ b/src/option/basicdata/basicStorageServices.js
@@ -94,13 +94,13 @@ export default {
       hide: true,
     },
     {
-      label: "发货单位",
-      prop: "linkman",
+      label: "发站仓库",
+      prop: "sendWarehouseName",
       search: true,
     },
     {
       label: "服务仓库",
-      prop: "warehouseService",
+      prop: "serveWarehouseName",
       search: true,
     },
   ]
diff --git a/src/views/basicdata/brand/basicStorageServices.vue b/src/views/basicdata/brand/basicStorageServices.vue
index 63ac669b..013d0e23 100644
--- a/src/views/basicdata/brand/basicStorageServices.vue
+++ b/src/views/basicdata/brand/basicStorageServices.vue
@@ -8,10 +8,10 @@
 <!--            <el-input v-model="query.shopId" placeholder="请输入门店名称"></el-input>-->
 <!--          </el-form-item>-->
           <el-form-item label="发站仓库:">
-            <el-input v-model="query.sendWarehourseName" placeholder="请输入发站仓库"></el-input>
+            <el-input v-model="query.sendWarehouseName" placeholder="请输入发站仓库"></el-input>
           </el-form-item>
           <el-form-item label="服务仓库:">
-            <el-input v-model="query.serveWarehourseName" placeholder="请输入服务仓库"></el-input>
+            <el-input v-model="query.serveWarehouseName" placeholder="请输入服务仓库"></el-input>
           </el-form-item>
           <!-- 查询按钮 -->
           <el-form-item>
@@ -114,7 +114,7 @@
 
 
         <el-select
-              v-model="form.sendWarehourseId"
+              v-model="form.sendWarehouseId"
               filterable
               remote
               reserve-keyword
@@ -136,7 +136,7 @@
           <el-form-item label="服务仓库" prop="serveWarehourseId">
             
             <el-select
-              v-model="form.serveWarehourseId"
+              v-model="form.serveWarehouseId"
               filterable
               remote
               reserve-keyword
@@ -211,14 +211,14 @@ export default {
       options: [],
       warehouseOptions: [],
       rules: {
-        shopId: [
+        clientId: [
           { required: true, message: '请输入门店名称', trigger: 'blur' },
           // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
         ],
-        forwardingUnit: [
-          { required: true, message: '请输入发', trigger: 'change' }
+        sendWarehouseId: [
+          { required: true, message: '请选择发站仓', trigger: 'change' }
         ],
-        warehouseService: [
+        serveWarehouseId: [
           { required: true, message: '请选择服务仓', trigger: 'change' }
         ],
 
@@ -291,7 +291,7 @@ export default {
       this.$refs[from].validate((valid) => {
         if (valid) {
           if (!this.form.id) {
-            this.form.shopId = this.$route.query.id;
+            this.form.clientId = this.$route.query.id;
             if(!!this.$route.query.type ){
               this.form.distinguish = this.$route.query.type
             }
@@ -305,7 +305,7 @@ export default {
             });
           } else {
             if(this.form.shopId.length < 10){
-              this.form.shopId = null;
+              this.form.clientId = null;
             }
             if(this.form.forwardingUnit.length < 10){
               this.form.forwardingUnit = null;
@@ -410,7 +410,7 @@ export default {
     },
     onLoad (page, params = {}) {
       this.loading = true;
-      this.query.shopIds = this.$route.query.id;
+      this.query.clientId = this.$route.query.id;
       if(!!this.$route.query.type ){
         this.query.distinguish = this.$route.query.type
       }