修复客户信息

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>

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);

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,