Selaa lähdekoodia

Merge branch 'develop_yh23' of jianguan-web/qpls-md-html into pre-release

李磊 1 vuosi sitten
vanhempi
commit
a528081beb

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1690525618489
+  "version": 1691466218790
 }

+ 4 - 4
src/views/common/custList.vue

@@ -59,9 +59,9 @@ export default {
       type: Boolean,
       default: false
     },
-    isDealerFlag: { // 是否为下级
-      type: Boolean,
-      default: false
+    dealerFlag: { // 0不含下级,1 只是下级,all是全部
+      type: String,
+      default: 'all'
     }
   },
   data () {
@@ -80,7 +80,7 @@ export default {
       const fetchId = this.lastFetchId
       this.data = []
       this.fetching = true
-      const params = { pageNo: 1, pageSize: 20, mainFlag: this.mainFlag ? 1 : 0, dealerFlag: this.isDealerFlag ? 1 : 0 }
+      const params = { pageNo: 1, pageSize: 20, mainFlag: this.mainFlag ? 1 : 0, dealerFlag: this.dealerFlag == 'all' ? undefined : this.dealerFlag }
       if (this.satelliteFlag) {
         params.satelliteFlag = 1
       }

+ 7 - 1
src/views/customerManagement/customerInfo/mergeCustomerModal.vue

@@ -22,7 +22,13 @@
           <div>{{ mainCustomerName }}</div>
         </a-form-model-item>
         <a-form-model-item label="被合并的客户名称:" prop="customerSnSource">
-          <custList ref="custList" :notSn="form.customerSnTarget" dealerDisabled @change="custChange" placeholder="输入客户名称搜索"></custList>
+          <custList
+            ref="custList"
+            :notSn="form.customerSnTarget"
+            :dealerFlag="0"
+            dealerDisabled
+            @change="custChange"
+            placeholder="输入客户名称搜索"></custList>
         </a-form-model-item>
       </a-form-model>
       <div class="btn-cont">

+ 1 - 1
src/views/numsGoodsShelves/approveStore/authPass.vue

@@ -123,7 +123,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-model-item label="关联客户" prop="customerSn">
-                <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
+                <custList ref="custList" :dealerFlag="0" :isEnabled="true" @change="custChange"></custList>
               </a-form-model-item>
             </a-col>
             <a-col :span="12" v-if="form.settleType == 'CREDIT'">

+ 1 - 1
src/views/numsGoodsShelves/settlementManagement/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col flex="300px">
               <a-form-item label="关联客户">
-                <custList ref="custList" @change="custChange" v-model="queryParam.customerName"></custList>
+                <custList ref="custList" :dealerFlag="0" @change="custChange" v-model="queryParam.customerName"></custList>
               </a-form-item>
             </a-col>
             <a-col flex="200px">

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/basicInfoModal.vue

@@ -29,7 +29,7 @@
               关联客户<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
             </a-tooltip>
           </template>
-          <custList ref="custList" :isEnabled="true" @change="custChange"></custList>
+          <custList ref="custList" :dealerFlag="0" :isEnabled="true" @change="custChange"></custList>
         </a-form-model-item>
         <!-- <a-form-model-item prop="showPrice">
           <template slot="label">

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="关联客户">
-                <custList ref="custList" @change="custChange" :isEnabled="true"></custList>
+                <custList ref="custList" :dealerFlag="0" @change="custChange" :isEnabled="true"></custList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 1 - 1
src/views/reportData/salesOutofStockReport/list.vue

@@ -20,7 +20,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="客户名称">
-              <custList :isDealerFlag="true" id="salesOutofStockReport-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
+              <custList id="salesOutofStockReport-buyerName" ref="custSatelliteList" @change="custSatelliteChange"></custList>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">