From aa97cdf4a5c0ee5668837ab9b08634724d44339d Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 6 Jun 2024 17:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicdata/brand/basicClient.vue     | 24 ++++++++++++++-----
 .../basicdata/brand/basicStoreContact.vue     |  5 ++++
 .../brand/basicdataTripartiteMall.vue         |  2 +-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 79a8fc8f..85b74095 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -704,7 +704,7 @@ export default {
         {
           prop: 'contractStartTime',
           label: '合同开始时间',
-          type: 5,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -714,7 +714,7 @@ export default {
         {
           prop: 'contractEntTime',
           label: '合同结束时间',
-          type: 5,
+          type: 1,
           values: '',
           width: '150',
           checkarr: [],
@@ -1368,7 +1368,7 @@ export default {
       })
       this.$nextTick(() => {
         this.$refs.form.resetFields();
-        this.form.defaultPaymentMethods = '1';
+        this.form.defaultPaymentMethods = '3';
       });
     },
     handleAddSon(row) {
@@ -1598,10 +1598,10 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       // console.log('-=-=', this.query);
-      if (this.dataShi.length > 0) {
+      if (this.dataShi?.length) {
         // console.log('-=-=', this.dataShi);
-        this.query.contractStartTime = this.dataShi[0];
-        this.query.contractEntTime = this.dataShi[1];
+        this.query.startDate = this.dataShi[0];
+        this.query.endDate = this.dataShi[1];
       }
       if (!!this.query.bladeRegionProvinceId) {
         this.query.bladeRegionCityId = this.query.bladeRegionProvinceId[1];
@@ -1785,4 +1785,16 @@ export default {
   font-weight: bold;
   color: var(--el-color-primary);
 }
+:deep(.header_search){
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  .el-btn{
+    .el-form-item__content{
+
+      justify-content: flex-end;
+    }
+  }
+
+}
 </style>
diff --git a/src/views/basicdata/brand/basicStoreContact.vue b/src/views/basicdata/brand/basicStoreContact.vue
index e6370277..bf372ab0 100644
--- a/src/views/basicdata/brand/basicStoreContact.vue
+++ b/src/views/basicdata/brand/basicStoreContact.vue
@@ -207,6 +207,7 @@ export default {
     //设置默认联系人
     makeCargo(row) {
       console.log('设置默认联系人！！', row);
+      row.defaultType =!row.defaultType
       let r = {
         id: row.id,
         shopId: row.shopId,
@@ -218,6 +219,8 @@ export default {
         row.defaultType = true;
         return
       }
+
+
       this.$confirm(`确定要修改默认联系人吗？`, {
         type: 'warning',
         //beforeClose 阻止关闭弹窗
@@ -225,7 +228,9 @@ export default {
           //下面这行代码就是弹出的确认删除和取消删除
           if (action === 'confirm') {
             // 调取接口
+          r.defaultType =!r.defaultType
             updateCargoControl(r).then(res => {
+              console.log(this.data,'data===>11')
               console.log(res);
               if (res.statusText == 'OK') {
                 this.onLoad(this.page);
diff --git a/src/views/basicdata/brand/basicdataTripartiteMall.vue b/src/views/basicdata/brand/basicdataTripartiteMall.vue
index 0fa45a70..352bc3e1 100644
--- a/src/views/basicdata/brand/basicdataTripartiteMall.vue
+++ b/src/views/basicdata/brand/basicdataTripartiteMall.vue
@@ -317,7 +317,7 @@ export default {
     remoteMethod(value) {
       // if (!value) return;
 
-      getBrandList(1, 20, { brandName: value }).then(res => {
+      getBrandList(1, 100, { brandName: value }).then(res => {
         console.log('res ===>', res);
         const {
           code,