Sfoglia il codice sorgente

Merge branch 'develop_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_fencang

chenrui 2 anni fa
parent
commit
af83fd9990
27 ha cambiato i file con 123 aggiunte e 66 eliminazioni
  1. 1 1
      public/version.json
  2. 3 2
      src/api/dealerRelation.js
  3. 1 1
      src/views/allocationManagement/matchSendOutOrder/list.vue
  4. 8 6
      src/views/dealerManagement/rebateSettings/associateModal.vue
  5. 32 6
      src/views/dealerManagement/rebateSettings/list.vue
  6. 19 2
      src/views/dealerManagement/rebateSettings/queryChild.vue
  7. 1 0
      src/views/inventoryManagement/inventoryCheck/list.vue
  8. 2 0
      src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue
  9. 3 2
      src/views/purchasingManagement/purchaseReturn/addModal.vue
  10. 4 3
      src/views/reportData/actualSalesReport/list.vue
  11. 4 4
      src/views/reportData/allocationDetails/list.vue
  12. 1 1
      src/views/reportData/billingBackReport/list.vue
  13. 1 1
      src/views/reportData/billingOrderReport/list.vue
  14. 4 3
      src/views/reportData/billingReturnReport/list.vue
  15. 1 1
      src/views/reportData/regionTypeSalesReport/list.vue
  16. 4 3
      src/views/reportData/returnGoodsPresentation/list.vue
  17. 4 3
      src/views/reportData/returnSlipReport/list.vue
  18. 3 3
      src/views/reportData/salesAmountReport/list.vue
  19. 1 1
      src/views/reportData/salesDetails/list.vue
  20. 4 3
      src/views/reportData/salesPresentation/list.vue
  21. 4 3
      src/views/reportData/salesReturnReport/list.vue
  22. 4 3
      src/views/reportData/salesSlipReport/list.vue
  23. 1 1
      src/views/reportData/warehousingOrderDetail/list.vue
  24. 8 8
      src/views/salesManagement/receiptPrint/list.vue
  25. 2 2
      src/views/salesManagement/salesQuery/edit.vue
  26. 2 2
      src/views/salesReturnManagement/pickUp/list.vue
  27. 1 1
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.16",
+    "version": "2.2.17",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 3 - 2
src/api/dealerRelation.js

@@ -51,8 +51,9 @@ export const unbindRelation = (params) => {
 // 更新经销商返利信息
 export const updateRebate = (params) => {
   return axios({
-    url: `/dealerRelation/updateRebate/${params.dealerSn}/${params.rebateDealerSn}`,
-    method: 'get'
+    url: `/dealerRelation/updateRebate`,
+    data: params,
+    method: 'post'
   })
 }
 

+ 1 - 1
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -43,7 +43,7 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="调拨单号">
                   <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
                 </a-form-item>

+ 8 - 6
src/views/dealerManagement/rebateSettings/associateModal.vue

@@ -70,17 +70,13 @@ export default {
   methods: {
     handleDisassociate (val) {
       console.log('选中', val)
-      this.rebateDealerSn = val.key
+      this.rebateDealerSn = val ? val.key : ''
     },
     //  保存
     handleSave () {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
-          if (_this.rebateDealerSn == '') {
-            this.$message.info('请选择下级')
-            return
-          }
           const formData = {
             rebateDealerSn: _this.rebateDealerSn,
             dealerSn: _this.nowData && _this.nowData.subDealer.dealerSn ? _this.nowData.subDealer.dealerSn : undefined
@@ -118,7 +114,13 @@ export default {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
         this.$refs.queryChid.resetForm()
-        this.rebateDealerSn = []
+        this.rebateDealerSn = ''
+      }else{
+        this.$nextTick(()=>{
+          this.rebateDealerSn = this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerSn ? this.nowData.rebateDealer.dealerSn : ''
+          const dealerName = this.nowData && this.nowData.rebateDealer && this.nowData.rebateDealer.dealerName ? this.nowData.rebateDealer.dealerName : ''
+          this.$refs.queryChid.setVal(this.rebateDealerSn, dealerName)
+        })
       }
     }
   }

+ 32 - 6
src/views/dealerManagement/rebateSettings/list.vue

@@ -10,6 +10,16 @@
                 <a-input id="rebateSettingsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入经销商名称"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="归属经销商名称">
+                <a-input id="rebateSettingsList-dealerName1" v-model.trim="queryParam.rebateDealerName" allowClear placeholder="请输入归属经销商名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="上级经销商名称">
+                <a-input id="rebateSettingsList-dealerName2" v-model.trim="queryParam.supDealerName" allowClear placeholder="请输入上级经销商名称"/>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="rebateSettingsList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="rebateSettingsList-reset">重置</a-button>
@@ -53,11 +63,21 @@
         </template>
         <!-- 差价归属 -->
         <template slot="cjgs" slot-scope="text, record">
-          <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+          <span v-if="record.rebateDealer">{{ record.rebateDealer.dealerName }}</span>
           <span v-else>--</span>
         </template>
         <!-- 归属经销商级别 -->
         <template slot="gsjxsjb" slot-scope="text, record">
+          <span v-if="record.rebateDealer">{{ record.rebateDealer.provinceName }} > {{ record.rebateDealer.dealerLevelDictValue }}</span>
+          <span v-else>--</span>
+        </template>
+         <!-- 上级差价归属 -->
+         <template slot="sjcjgs" slot-scope="text, record">
+          <span v-if="record.supDealer">{{ record.supDealer.dealerName }}</span>
+          <span v-else>--</span>
+        </template>
+        <!-- 上级归属经销商级别 -->
+        <template slot="sjgsjxsjb" slot-scope="text, record">
           <span v-if="record.supDealer">{{ record.supDealer.provinceName }} > {{ record.supDealer.dealerLevelDictValue }}</span>
           <span v-else>--</span>
         </template>
@@ -86,14 +106,18 @@ export default {
         wrapperCol: { span: 16 }
       },
       queryParam: {
-        dealerName: ''
+        dealerName: '',
+        supDealerName:'',
+        rebateDealerName:''
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '经销商名称', width: '22.5%', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
-        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center', width: '22.5%' },
-        { title: '差价归属', scopedSlots: { customRender: 'cjgs' }, align: 'center', width: '22.5%' },
-        { title: '归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center', width: '22.5%' },
+        { title: '经销商名称', width: '15%', scopedSlots: { customRender: 'jxs' }, align: 'center', ellipsis: true },
+        { title: '经销商级别', scopedSlots: { customRender: 'dealerLevel' }, align: 'center', width: '15%' },
+        { title: '指定差价归属经销商', scopedSlots: { customRender: 'cjgs' }, align: 'center', width: '15%' },
+        { title: '指定归属经销商级别', scopedSlots: { customRender: 'gsjxsjb' }, align: 'center', width: '15%' },
+        { title: '上级经销商', scopedSlots: { customRender: 'sjcjgs' }, align: 'center', width: '15%' },
+        { title: '上级经销商级别', scopedSlots: { customRender: 'sjgsjxsjb' }, align: 'center', width: '15%' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -123,6 +147,8 @@ export default {
     //  重置
     resetSearchForm () {
       this.queryParam.dealerName = ''
+      this.queryParam.supDealerName = ''
+      this.queryParam.rebateDealerName = ''
       this.$refs.table.refresh(true)
     },
     // 编辑

+ 19 - 2
src/views/dealerManagement/rebateSettings/queryChild.vue

@@ -9,6 +9,7 @@
     :not-found-content="fetching ? undefined : null"
     @search="fetchUser"
     @change="handleChange"
+    allowClear
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
     <a-select-option v-for="item in data" :key="item.dealerSn" :value="item.dealerSn">
@@ -34,7 +35,8 @@ export default {
     return {
       data: [],
       dealerName: [],
-      fetching: false
+      fetching: false,
+      itemSn: null
     }
   },
   methods: {
@@ -45,7 +47,13 @@ export default {
       const fetchId = this.lastFetchId
       this.data = []
       this.fetching = true
-      dealerRelationList({ 'dealerName': dealerName, 'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }).then(res => {
+      const params = {'dealerLevelList': this.dealerLevelList, pageNo: 1, pageSize: 20 }
+      if(this.itemSn){
+        params.dealerSn = this.itemSn
+      }else{
+        params.dealerName = dealerName
+      }
+      dealerRelationList(params).then(res => {
         if (fetchId !== this.lastFetchId) {
           return
         }
@@ -54,6 +62,7 @@ export default {
       })
     },
     handleChange (value) {
+      console.log(value)
       Object.assign(this, {
         dealerName: value,
         data: [],
@@ -61,7 +70,15 @@ export default {
       })
       this.$emit('change', value)
     },
+    setVal(value, label){
+      if(value){
+        this.itemSn = value
+        this.fetchUser()
+        this.handleChange({key: this.itemSn, label: label})
+      }
+    },
     resetForm () {
+      this.itemSn = null
       this.dealerName = []
     }
   }

+ 1 - 0
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -230,6 +230,7 @@ export default {
       this.queryParam.checkWarehouseNo = ''
       this.queryParam.checkState = undefined
       this.queryParam.checkSuperviseState = undefined
+      this.queryParam.warehouseSn = undefined
       this.$refs.table.refresh(true)
     },
     closeModal () {

+ 2 - 0
src/views/purchasingManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -141,6 +141,8 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.$refs.ruleForm.resetFields()
+      }else{
+        this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse.warehouseSn
       }
     }
   }

+ 3 - 2
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -186,12 +186,13 @@ export default {
         this.$nextTick(() => {
           this.$refs.attachList.setFileList('')
           this.$refs.ruleForm.resetFields()
-          // 默认仓库
-          this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse&&this.defWarehouse.warehouseSn
         })
       } else {
         if (this.itemSn) {
           this.getDetail()
+        }else{
+          // 默认仓库
+          this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse&&this.defWarehouse.warehouseSn
         }
       }
     }

+ 4 - 3
src/views/reportData/actualSalesReport/list.vue

@@ -33,19 +33,20 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="actualSalesReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="actualSalesReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom:10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom:10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="actualSalesReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="actualSalesReportList-reset">重置</a-button>
               <a-button

+ 4 - 4
src/views/reportData/allocationDetails/list.vue

@@ -24,7 +24,7 @@
                 <a-input id="allocationDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-model-item label="品牌分类">
                 <v-select code="BRAND_TYPE" id="allocationDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
               </a-form-model-item>
@@ -88,14 +88,14 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
-              <a-button
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <!-- <a-button
                 style="margin-left: 0px"
                 type="primary"
                 class="button-info"
                 size="small"
                 @click="handleStock"
-                id="allocationDetailsList-stockDate">盘点区间日期</a-button>
+                id="allocationDetailsList-stockDate">盘点区间日期</a-button> -->
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocationDetailsList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocationDetailsList-reset">重置</a-button>
               <a-button

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

@@ -26,7 +26,7 @@
                 <AreaList id="billingBackReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;display:flex;align-item:center;justify-content: center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingBackReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="billingBackReportList-reset">重置</a-button>
               <a-button

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

@@ -31,7 +31,7 @@
                 <AreaList id="returnSlipReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-model-item>
             </a-col>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;display:flex;align-item:center;justify-content: center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingOrderReport-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="billingOrderReport-reset">重置</a-button>
               <a-button

+ 4 - 3
src/views/reportData/billingReturnReport/list.vue

@@ -33,19 +33,20 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+           
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="billingReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="billingReturnReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="billingReturnReportList-reset">重置</a-button>
               <a-button

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

@@ -39,7 +39,7 @@
                 </a-form-model-item>
               </a-col>
             </template> -->
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
               <a-button

+ 4 - 3
src/views/reportData/returnGoodsPresentation/list.vue

@@ -34,12 +34,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="退货单号">
                 <a-input id="returnGoodsPresentationList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="returnGoodsPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -51,7 +52,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnGoodsPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="returnGoodsPresentationList-reset">重置</a-button>
               <a-button

+ 4 - 3
src/views/reportData/returnSlipReport/list.vue

@@ -33,12 +33,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-item label="退货单号">
                 <a-input id="returnSlipReportList-salesReturnBillNo" v-model.trim="queryParam.salesReturnBillNo" allowClear placeholder="请输入退货单号"/>
               </a-form-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="returnSlipReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -50,7 +51,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="returnSlipReportList-reset">重置</a-button>
               <a-button

+ 3 - 3
src/views/reportData/salesAmountReport/list.vue

@@ -33,19 +33,19 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="salesAmountReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="salesAmountReportList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesAmountReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesAmountReportList-reset">重置</a-button>
               <a-button

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

@@ -32,7 +32,6 @@
                   <a-input id="salesDetailsList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户名称">
                   <a-input id="salesDetailsList-dealerName" v-model.trim="queryParam.dealerName" allowClear placeholder="请输入客户名称"/>
@@ -49,6 +48,7 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="品牌分类">
                   <v-select code="BRAND_TYPE" id="salesDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>

+ 4 - 3
src/views/reportData/salesPresentation/list.vue

@@ -33,12 +33,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="销售单号">
                 <a-input id="salesPresentationList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesPresentationList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
@@ -50,7 +51,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesPresentationList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesPresentationList-reset">重置</a-button>
               <a-button

+ 4 - 3
src/views/reportData/salesReturnReport/list.vue

@@ -33,19 +33,20 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+           
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="所在区域">
                 <subarea id="salesReturnReportList-subareaSn" ref="subarea" @change="subareaChange"></subarea>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="地区">
                   <AreaList id="salesReturnDetailList-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
               <a-button

+ 4 - 3
src/views/reportData/salesSlipReport/list.vue

@@ -33,12 +33,13 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
               <a-form-model-item label="销售单号">
                 <a-input id="salesSlipReportList-allocateTypeSn" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-model-item>
             </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="salesSlipReportList-allocateTypeSn" ref="subarea" @change="subareaChange"></subarea>
@@ -50,7 +51,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesSlipReportList-reset">重置</a-button>
               <a-button

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

@@ -44,12 +44,12 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
-            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="入库仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.billWarehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
+            <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="单位名称">
                   <a-input id="warehousingOrderDetailList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入单位名称"/>

+ 8 - 8
src/views/salesManagement/receiptPrint/list.vue

@@ -24,11 +24,16 @@
                   <a-input id="salesCollectionList-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入备货单号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="客户名称">
                   <dealerSearchList ref="payerName" id="alesCollectionList-payerName" @change="custChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+                <a-form-model-item label="仓库">
+                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-if="currentTab == 1">
                 <a-form-item label="收款打印状态">
                   <v-select
@@ -52,13 +57,8 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                <a-form-model-item label="仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
-                </a-form-model-item>
-              </a-col>
-              <a-col :md="currentTab==2?4:24" :sm="24">
-                <span class="table-page-search-submitButtons">
+              <a-col :md="currentTab==2?24:6" :sm="24">
+                <span class="table-page-search-submitButtons" :style="{float:currentTab==2?'right':'none'}">
                   <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                   <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 </span>

+ 2 - 2
src/views/salesManagement/salesQuery/edit.vue

@@ -6,9 +6,9 @@
         <template slot="subTitle">
           <a id="salesEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
-          <div style="width:420px;display:inline-block;color: #666;">
+          <div style="margin: 0 15px;display:inline-block;color: #666;">
             <span>出库仓库:</span>
-            <chooseWarehouse style="width:80%" ref="warehouse" v-model="warehouseSn" @change="handleWarehouse"></chooseWarehouse>
+            <chooseWarehouse style="width:200px" :allowClear="false" ref="warehouse" v-model="warehouseSn" @change="handleWarehouse"></chooseWarehouse>
           </div>
         </template>
       </a-page-header>

+ 2 - 2
src/views/salesReturnManagement/pickUp/list.vue

@@ -54,8 +54,8 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24">
-              <div class="table-page-search-submitButtons" style="text-align:center;">
+            <a-col :md="6" :sm="24">
+              <div class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">

+ 1 - 1
vue.config.js

@@ -107,7 +107,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.113:8660/ocs-admin',
+        // target: 'http://192.168.2.103/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,