From 920260b21bbf883ad4c8e8abce79cc4b172da2f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Fri, 22 Sep 2023 09:50:56 +0800
Subject: [PATCH 1/2] 123

---
 src/views/shopManage/shopIndex.vue | 18 ++++++++++--------
 src/views/shopManage/shopModal.vue |  7 +++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/shopManage/shopIndex.vue b/src/views/shopManage/shopIndex.vue
index 4906ac5..58c9237 100644
--- a/src/views/shopManage/shopIndex.vue
+++ b/src/views/shopManage/shopIndex.vue
@@ -8,7 +8,7 @@
   <!-- 工具栏 -->
   <a-card :bordered="false" :body-style="{ paddingBottom: 0 }">
     <div class="operationButtonArea">
-      <a-button class="operationButton" @click="addShop">新建店铺</a-button>
+      <a-button type="primary" @click="addShop">新建店铺</a-button>
       <!-- 更多操作 -->
     </div>
   </a-card>
@@ -30,7 +30,7 @@
       <template v-else-if="column.key === 'operate'">
         <operation-group>
           <a @click="editShop(record)">编辑</a>
-          <delete-text-button @confirm="deleteShopFun(record)" />
+          <!-- <delete-text-button @confirm="deleteShopFun(record)" /> -->
           <a @click="selectReservation(record)">预约详情</a>
         </operation-group>
       </template>
@@ -94,7 +94,7 @@ const editShop = (record: shopDetailVO) => {
 const selectReservation = (record: shopDetailVO) => {
   reservationModalRef.value?.open(FormAction.OTHER, record)
 }
-// 删除门店
+// 删除店铺
 const deleteShopFun = (record: shopDetailVO) => {
   doRequest(deleteShop(record.id as number), {
     successMessage: '删除成功！',
@@ -115,11 +115,11 @@ const columns: ProColumns[] = [
     dataIndex: 'id'
   },
   {
-    title: '门店名称',
+    title: '店铺名称',
     dataIndex: 'storeName'
   },
   {
-    title: '门店类型',
+    title: '店铺类型',
     dataIndex: 'storeType',
     customRender: ({ record }: any) => {
       if (record.storeType === 0) {
@@ -130,7 +130,7 @@ const columns: ProColumns[] = [
     }
   },
   {
-    title: '门店状态',
+    title: '店铺状态',
     dataIndex: 'storeStatus',
     customRender: function ({ record }: any) {
       if (record.storeStatus === 0) {
@@ -157,6 +157,10 @@ const columns: ProColumns[] = [
   },
   {
     title: '承接销售',
+    dataIndex: 'address'
+  },
+  {
+    title: '店铺地址',
     dataIndex: 'userName'
   },
   {
@@ -193,9 +197,7 @@ const columns: ProColumns[] = [
   padding-bottom: 20px;
 }
 .operationButton {
-  background-color: #f4f4f5;
   border-radius: 5px;
-  color: #909399;
   margin-right: 10px;
 }
 .editable-row-operations a {
diff --git a/src/views/shopManage/shopModal.vue b/src/views/shopManage/shopModal.vue
index e20fa41..15ffa64 100644
--- a/src/views/shopManage/shopModal.vue
+++ b/src/views/shopManage/shopModal.vue
@@ -96,7 +96,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row v-if="title != '编辑门店'" justify="start">
+        <a-row justify="start">
           <a-col :span="24">
             <a-form-item
               label="门店地址"
@@ -105,10 +105,12 @@
               :rules="[{ required: true, message: '请输入详细地址', trigger: ['blur'] }]"
               name="address"
             >
-              <a-input
+              <a-textarea
                 id="tipinput"
                 v-model:value="formModel.address"
+                :disabled="title == '编辑门店'"
                 allow-clear
+                auto-size
                 placeholder="请输入详细地址"
               />
             </a-form-item>
@@ -258,6 +260,7 @@ const selectUserList = () => {
 }
 const handleClose = () => {
   closeModal()
+  formModel.tradeTime = []
   submitLoading.value = false
 }
 

From 79c55346e542e2fccc4068056e8ae1d7582e7ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=98=E6=B3=8A=E5=AE=A2?= <1059510186@qq.com>
Date: Fri, 22 Sep 2023 10:07:05 +0800
Subject: [PATCH 2/2] 123

---
 .../geopoliticalCustomersModal.vue            | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 94c21a9..18d93fc 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -63,23 +63,28 @@
           :readonly="title === '详情' || title === '审核'"
         />
       </a-form-item>
-      <a-form-item
-        label="备注"
-        name="remark"
-        :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
-        :wrapper-col="
-          title === '详情' || title === '审核'
-            ? { sm: { span: 24 }, md: { span: 9 } }
-            : { sm: { span: 24 }, md: { span: 11 } }
-        "
-      >
-        <a-input
-          v-model:value="formModel.remark"
-          placeholder="请输入备注"
-          style="width: 65%"
-          :readonly="title === '详情' || title === '审核'"
-        />
-      </a-form-item>
+      <a-row>
+        <a-col :span="24">
+          <a-form-item
+            label="备注"
+            name="remark"
+            :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
+            :wrapper-col="
+              title === '详情' || title === '审核'
+                ? { sm: { span: 24 }, md: { span: 9 } }
+                : { sm: { span: 24 }, md: { span: 19 } }
+            "
+          >
+            <a-input
+              v-model:value="formModel.remark"
+              placeholder="请输入备注"
+              style="width: 100%"
+              allow-clear
+              :readonly="title === '详情' || title === '审核'"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row :gutter="16">
         <a-col :xl="14" :md="14" :sm="14">
           <a-form-item