Pārlūkot izejas kodu

Merge branch 'develop_yh36_2' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into pre-release

# Conflicts:
#	public/version.json
lilei 1 gadu atpakaļ
vecāks
revīzija
34a5636015

+ 5 - 5
src/views/allocationManagement/chainTransferOut/list.vue

@@ -433,8 +433,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -442,10 +442,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/allocationManagement/storeTransferOut/list.vue

@@ -424,8 +424,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -433,10 +433,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -350,8 +350,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -359,10 +359,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -383,8 +383,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -392,10 +392,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -384,8 +384,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -393,10 +393,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 20 - 12
src/views/customerManagement/customerInfo/list.vue

@@ -10,12 +10,12 @@
                 <a-input id="customerManagementList-customerName" v-model.trim="queryParam.customerName" allowClear placeholder="请输入客户名称"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="联系人">
                 <a-input id="customerManagementList-contactName" v-model.trim="queryParam.contactName" allowClear placeholder="请输入联系人"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="8" :sm="24">
               <a-form-item label="最后销售时间">
                 <rangeDate ref="rangeSaleDate" @change="dateSaleChange" />
               </a-form-item>
@@ -37,25 +37,25 @@
                   <v-select code="FLAG" id="customerManagementList-dealerFlag" v-model="queryParam.dealerFlag" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col> -->
-              <a-col :md="12" :sm="24">
+              <a-col :md="10" :sm="24">
                 <a-row>
                   <!-- 客户地址 -->
                   <a-form-item label="客户地址">
-                    <a-col span="7">
+                    <a-col span="8">
                       <a-form-item prop="provinceSn" style="margin: 0;">
                         <a-select v-model="queryParam.provinceSn" allowClear @change="getCityList" placeholder="请选择省">
                           <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
                         </a-select>
                       </a-form-item>
                     </a-col>
-                    <a-col span="7" offset="1">
+                    <a-col span="8">
                       <a-form-item prop="citySn" style="margin: 0;">
                         <a-select v-model="queryParam.citySn" allowClear @change="getAreaList" placeholder="请选择市">
                           <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
                         </a-select>
                       </a-form-item>
                     </a-col>
-                    <a-col span="7" offset="1">
+                    <a-col span="8">
                       <a-form-item prop="countySn" style="margin: 0;">
                         <a-select v-model="queryParam.countySn" allowClear placeholder="请选择区/县">
                           <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
@@ -65,9 +65,14 @@
                   </a-form-item>
                 </a-row>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="客户类型">
-                  <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型" style="max-width: 240px;"></custType>
+                  <custType v-model="queryParam.customerTypeSn" allowClear placeholder="请选择客户类型"></custType>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="启用状态">
+                  <v-select code="ENABLE_FLAG" v-model="queryParam.enabledFlag" allowClear placeholder="请选择启用状态"></v-select>
                 </a-form-item>
               </a-col>
             </template>
@@ -164,20 +169,22 @@ export default {
         countySn: undefined, //  区
         dealerFlag: undefined, //  是否卫星仓客户
         customerTypeSn: undefined, //  客户类型
+        enabledFlag: undefined, //  启用状态
         relationType: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '客户名称', dataIndex: 'customerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '联系人', dataIndex: 'contactName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'customerName', width: '28%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '联系人', dataIndex: 'contactName', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '联系电话', dataIndex: 'contactTel', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '联系手机', dataIndex: 'contactMobile', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户关系', dataIndex: 'relationTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户关系', dataIndex: 'relationTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '是否为下级', dataIndex: 'dealerFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
+        { title: '价格类型', dataIndex: 'priceTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '启用状态', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
         { title: <div><a-tooltip placement='top' title='注意:客户合并功能中,将以当前客户为对象,合并被选客户。'><a-icon type="question-circle" /></a-tooltip>&nbsp;操作</div>, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -227,6 +234,7 @@ export default {
       this.queryParam.dealerFlag = undefined
       this.queryParam.customerTypeSn = undefined
       this.queryParam.relationType = undefined
+      this.queryParam.enabledFlag = undefined
       this.addrCityList = []
       this.addrDistrictList = []
       this.$refs.table.refresh(true)

+ 2 - 2
src/views/financialManagement/financialCollection/list.vue

@@ -478,10 +478,10 @@ export default {
     console.log(this.getIsHomeNav(), isHomeNav, this.$route.name)
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
-      this.curBizType = isHomeNav.pageParams.bizType
       this.resetData()
+      this.curBizType = isHomeNav.pageParams.bizType
+      this.$refs.createDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-      this.$refs.createDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.pageInit()
     } else {
       // 如果是新页签打开,则重置当前页面

+ 2 - 2
src/views/financialManagement/financialPayment/list.vue

@@ -482,10 +482,10 @@ export default {
     console.log(this.getIsHomeNav(), isHomeNav, this.$route.name)
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
-      this.curBizType = isHomeNav.pageParams.bizType
       this.resetData()
+      this.curBizType = isHomeNav.pageParams.bizType
+      this.$refs.createDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-      this.$refs.createDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.pageInit()
     } else {
       // 如果是新页签打开,则重置当前页面

+ 1 - 1
src/views/financialManagement/warehousingAudit/list.vue

@@ -273,8 +273,8 @@ export default {
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
       this.resetData(true)
+      this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-      this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.$refs.table.refresh(true)
     } else {
       // 如果是新页签打开

+ 1 - 1
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -393,8 +393,8 @@ export default {
     // 待办查询
     if (isHomeNav && isHomeNav.type == 'todo') {
       this.resetData(true)
+      this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-	    this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.$refs.table.refresh(true)
     } else {
       // 如果是新页签打开

+ 11 - 8
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -156,9 +156,7 @@
                     class="button-primary"
                     :loading="addLoading"
                     @click="handleAdd(record,0)"
-                    v-if="record.purchasePrice>0"
                     id="purchaseOrderEdit-add-btn">添加</a-button>
-                  <span v-else>--</span>
                 </template>
               </s-table>
             </div>
@@ -388,7 +386,7 @@ export default {
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      // 产品来源
+      // 产品来源 
       if (this.isDealerUp) {
         arr.splice(1, 0, { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true })
         arr.splice(6, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
@@ -505,11 +503,16 @@ export default {
       }
       // 添加
       if (type == 0) {
-        params.productSn = row.productSn
-        params.purchaseBillSn = this.detail.purchaseBillSn
-        params.purchaseBillNo = this.detail.purchaseBillNo
-        params.price = row.purchasePrice
-        params.qty = row.qty
+        if(row.purchasePrice&&row.terminalPrice&&row.carOwnersPrice){
+          params.productSn = row.productSn
+          params.purchaseBillSn = this.detail.purchaseBillSn
+          params.purchaseBillNo = this.detail.purchaseBillNo
+          params.price = row.purchasePrice
+          params.qty = row.qty
+        }else{
+          this.$message.warning('成本价、终端会员价、终端会员价不能为空!')
+          return
+        }
       } else { //  编辑
         // 清空成本价或数量时,值应保持未清空前的值,因成本价和数量都不可为空
         if (!row.qty) {

+ 5 - 5
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -362,8 +362,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetSearchForm(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -371,10 +371,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 1 - 3
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -104,9 +104,7 @@
               class="button-primary"
               :loading="addLoading"
               @click="handleAdd(record)"
-              v-if="record.purchasePrice>0"
-              id="purchaseOrderEdit-add-btn">添加</a-button>
-            <span v-else>--</span>
+              >添加</a-button>
           </template>
         </s-table>
         <div v-else>

+ 11 - 5
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -414,11 +414,17 @@ export default {
       }
       // 添加
       if (type == 0) {
-        params.productSn = row.productSn
-        params.purchaseBillSn = this.detail.purchaseBillSn
-        params.purchaseBillNo = this.detail.purchaseBillNo
-        params.price = row.purchasePrice
-        params.qty = row.qty
+        if(row.purchasePrice&&row.terminalPrice&&row.carOwnersPrice){
+          params.productSn = row.productSn
+          params.purchaseBillSn = this.detail.purchaseBillSn
+          params.purchaseBillNo = this.detail.purchaseBillNo
+          params.price = row.purchasePrice
+          params.qty = row.qty
+        }else{
+          this.$message.warning('成本价、终端会员价、终端会员价不能为空!')
+          this.$refs.chooseProduct.spinning = false
+          return
+        }
       } else { //  编辑
         // 清空成本价或数量时,值应保持未清空前的值,因成本价和数量都不可为空
         if (!row.qty) {

+ 5 - 5
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -362,8 +362,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetSearchForm(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -371,10 +371,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -359,8 +359,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -368,10 +368,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseReturnApplyForm/list.vue

@@ -372,8 +372,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -381,10 +381,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 5 - 5
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -356,8 +356,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -365,10 +365,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {

+ 7 - 10
src/views/salesManagement/salesQuery/list.vue

@@ -572,7 +572,7 @@ export default {
       const b = this.$store.state.app.updateList
       // 是否从首页点击进入
       const isHomeNav = this.getIsHomeNav()[this.$route.name]
-      console.log(a, b)
+      console.log(a, b,'++++++++++++')
       console.log(isHomeNav)
       // 从首页进入,判断式新建还式待办查询
       if (isHomeNav) {
@@ -583,22 +583,19 @@ export default {
         }
         // 待办
         if (isHomeNav.type == 'todo') {
-          this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
-          setTimeout(() => {
-            this.$refs.table.refresh(true)
-          }, 100)
+          this.$refs.table.refresh(true)
         }
       } else {
         // 如果是新页签打开,则重置当前页面
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     }
   },

+ 6 - 5
src/views/salesManagement/salesQueryNew/list.vue

@@ -586,8 +586,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -595,11 +595,12 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
-      }
+      
     }
   },
   watch: {

+ 5 - 5
src/views/salesManagement/salesReturn/list.vue

@@ -322,8 +322,8 @@ export default {
         // 待办
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
+          this.$refs.rangeDate.resetDate([isHomeNav.pageParams.beginDate, isHomeNav.pageParams.endDate])
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
-          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {
@@ -331,10 +331,10 @@ export default {
         if (a && !b) {
           this.resetSearchForm()
         }
-      }
-      // 仅刷新列表,不重置页面
-      if (b || a == b) {
-        this.$refs.table.refresh()
+        // 仅刷新列表,不重置页面
+        if (b || a == b) {
+          this.$refs.table.refresh()
+        }
       }
     },
     setTableH () {