Ver Fonte

bug 修复

lilei há 3 anos atrás
pai
commit
2580943f7c

+ 1 - 1
public/version.json

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

+ 7 - 1
src/views/Home.vue

@@ -757,6 +757,13 @@ export default {
   computed: {
     ...mapGetters(['mustChangePwd'])
   },
+  watch: {
+    hiddenBizData (newValue, oldValue) {
+      if (!newValue) {
+        this.getBizData()
+      }
+    }
+  },
   methods: {
     hasNewProduct () {
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
@@ -840,7 +847,6 @@ export default {
   activated () {
     // 请求导航指引合计
     this.getNavCount()
-    this.getBizData()
     this.getMerchantData()
   },
   beforeRouteEnter (to, from, next) {

+ 41 - 15
src/views/allocationManagement/chainTransferOut/list.vue

@@ -5,14 +5,19 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="5" :sm="24">
-              <a-form-item label="审核时间">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
+              <a-form-item label="审核时间">
+                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-form-item label="出库时间">
-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+                <rangeDate ref="outWareRangeDate" :value="outWarehouseTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -29,18 +34,18 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调出产品类型">
-                <v-select
-                  v-model="queryParam.allocationType"
-                  ref="allocationType"
-                  id="chainTransferOutList-allocationType"
-                  code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
-                  placeholder="请选择调出产品类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="调出产品类型">
+                  <v-select
+                    v-model="queryParam.allocationType"
+                    ref="allocationType"
+                    id="chainTransferOutList-allocationType"
+                    code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
+                    placeholder="请选择调出产品类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
@@ -168,9 +173,15 @@ export default {
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
+      auditTime: [],
+      outWarehouseTime: [],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
+        auditBeginDate: '',
+        auditEndDate: '',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         putTenantSn: undefined, //  调往对象
         allocationType: undefined, //  调出产品类型
         state: undefined, //  业务状态
@@ -231,6 +242,14 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    auditDateChange (date) {
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
+    },
     //  重置
     resetSearchForm () {
       this.resetData()
@@ -241,6 +260,13 @@ export default {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
+      this.$refs.auditRangeDate.resetDate('')
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
+
       this.queryParam.putTenantSn = undefined
       this.queryParam.allocationType = undefined
       this.queryParam.state = undefined

+ 42 - 11
src/views/allocationManagement/storeTransferOut/list.vue

@@ -5,25 +5,35 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="调往对象名称">
-                <a-input id="storeTransferOutList-putPersonName" v-model.trim="queryParam.putPersonName" allowClear placeholder="请输入调往对象名称"/>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="审核时间">
+                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate ref="outWareRangeDate" :value="outWarehouseTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="调拨类型">
-                <a-select id="storeTransferOutList-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
-                  <a-select-option v-for="item in storeCallOutTypeList" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
-                </a-select>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="调往对象名称">
+                <a-input id="storeTransferOutList-putPersonName" v-model.trim="queryParam.putPersonName" allowClear placeholder="请输入调往对象名称"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="调拨类型">
+                  <a-select id="storeTransferOutList-callOutType" v-model="queryParam.callOutType" placeholder="请选择调拨类型" allowClear >
+                    <a-select-option v-for="item in storeCallOutTypeList" :key="item.storeCallOutTypeSn" :value="item.storeCallOutTypeSn">{{ item.name }}</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"
@@ -35,7 +45,7 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select
                     v-model="queryParam.settleState"
@@ -153,9 +163,15 @@ export default {
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
+      auditTime: [],
+      outWareTime: [],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
+        auditBeginDate: '',
+        auditEndDate: '',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         putPersonName: undefined, //  调往对象
         callOutType: undefined, //  调拨类型
         state: undefined, //  业务状态
@@ -216,6 +232,14 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    auditDateChange (date) {
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
+    },
     //  重置
     resetSearchForm () {
       console.log('resetSearchForm')
@@ -227,6 +251,13 @@ export default {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
+      this.$refs.auditRangeDate.resetDate('')
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
+
       this.queryParam.putPersonName = undefined
       this.queryParam.callOutType = undefined
       this.queryParam.state = undefined

+ 44 - 14
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -5,37 +5,47 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="散件退货单号">
-                <a-input id="bulkReturnGoodsList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入散件退货单号"/>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="审核时间">
+                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <supplier
-                  id="bulkReturnGoodsList-supplierSn"
-                  placeholder="请选择供应商"
-                  v-model="queryParam.supplierSn"
-                ></supplier>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="出库时间">
+                <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
+              <a-form-item label="散件退货单号">
+                <a-input id="bulkReturnGoodsList-sparePartsReturnNo" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入散件退货单号"/>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                  <supplier
+                    id="bulkReturnGoodsList-supplierSn"
+                    placeholder="请选择供应商"
+                    v-model="queryParam.supplierSn"
+                  ></supplier>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
                 <a-form-item label="是否抓单">
                   <v-select code="FLAG" id="bulkReturnGoodsList-isGrab" v-model="queryParam.isGrab" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select code="SPARE_PARTS_RETURN" id="bulkReturnGoodsList-state" v-model="queryParam.state" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select code="FINANCIAL_RECEIVE_STATUS" id="bulkReturnGoodsList-settleState" v-model="queryParam.settleState" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
@@ -153,9 +163,15 @@ export default {
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
+      auditTime: [],
+      outWareTime: [],
       queryParam: { //  查询条件
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
+        auditBeginDate: '',
+        auditEndDate: '',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         sparePartsReturnNo: '', //  散件退货单号
         supplierSn: undefined, //  供应商
         isGrab: undefined,
@@ -213,6 +229,14 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    auditDateChange (date) {
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
+    },
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
@@ -229,6 +253,12 @@ export default {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
       this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
+      this.$refs.auditRangeDate.resetDate('')
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
       this.queryParam.sparePartsReturnNo = ''
       this.queryParam.supplierSn = undefined
       this.queryParam.isGrab = undefined

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -316,7 +316,7 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
-            data.list[i].putCost = data.list[i].purchasePrice || ''
+            data.list[i].putCost = data.list[i].purchasePrice
             data.list[i].putQty = data.list[i].putQty || 1
             if (this.defaultWarehouseCascade.length > 0) {
               data.list[i].warehouseCascade = this.defaultWarehouseCascade

+ 24 - 9
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -5,17 +5,22 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="5" :sm="24">
+              <a-form-item label="入库时间">
+                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="4" :sm="24">
               <a-form-item label="散件单号">
                 <a-input id="bulkWarehousingOrderList-sparePartsPurchaseNo" v-model.trim="queryParam.sparePartsPurchaseNo" allowClear placeholder="请输入散件单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
                 <supplier
                   id="bulkWarehousingOrderList-supplierSn"
@@ -25,7 +30,7 @@
               </a-form-item>
             </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="业务状态">
                   <v-select
                     v-model="queryParam.state"
@@ -37,7 +42,7 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select
                     v-model="queryParam.settleState"
@@ -171,10 +176,13 @@ export default {
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
+      auditTime: [],
       // 查询参数
       queryParam: {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
+        auditBeginDate: '',
+        auditEndDate: '',
         sparePartsPurchaseNo: '', //  散件单号
         supplierSn: undefined, //  供应商
         state: undefined, //  单据状态
@@ -223,8 +231,12 @@ export default {
   methods: {
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0]
-      this.queryParam.endDate = date[1]
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
+    auditDateChange (date) {
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
     },
     // 合计
     getTotal (param) {
@@ -304,8 +316,11 @@ export default {
     // 重置数据
     resetData (flag) {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
-      this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
-      this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
+      this.queryParam.auditBeginDate = flag ? '' : getDate.getCurrMonthDays().starttime
+      this.queryParam.auditEndDate = flag ? '' : getDate.getCurrMonthDays().endtime
+      this.$refs.auditRangeDate.resetDate('')
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
       this.queryParam.sparePartsPurchaseNo = ''
       this.queryParam.supplierSn = undefined
       this.queryParam.state = undefined

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -93,7 +93,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return stockDetailList(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', isSellOut: '0' })).then(res => {
+        return stockDetailList(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', existStockFlag: '1' })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -103,7 +103,7 @@ export default {
             }
             this.disabled = false
             // 总计
-            this.getTotal(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', isSellOut: '0' }))
+            this.getTotal(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', existStockFlag: '1' }))
           }
           this.spinning = false
           return data

+ 22 - 6
src/views/reportData/salesReport/list.vue

@@ -14,17 +14,22 @@
         :wrapperCol="wrapperCol"
         @keyup.enter.native="handleSearch" >
         <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="审核时间" prop="time">
               <rangeDate ref="rangeDate" @change="dateChange" />
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
+            <a-form-item label="出库时间">
+              <rangeDate ref="outWareRangeDate" :value="outWarehouseTime" @change="outWareDateChange" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="客户名称">
               <a-input id="salesReportList-salesTargetName" v-model.trim="queryParam.salesTargetName" allowClear placeholder="请输入客户名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="客户类型">
               <a-select id="salesReportList-salesTargetType" v-model="queryParam.salesTargetType" allowClear placeholder="请选择客户类型">
                 <a-select-option v-for="item in custTypeList" :value="item.customerTypeSn" :key="item.customerTypeSn">{{ item.name }}</a-select-option>
@@ -32,7 +37,7 @@
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="收款方式">
                 <v-select
                   code="SETTLE_STYLE"
@@ -43,12 +48,12 @@
                 ></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="单号">
                 <a-input id="salesReportList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入单号"/>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="业务员">
                 <a-input id="salesReportList-salesManName" v-model.trim="queryParam.salesManName" allowClear placeholder="请输入业务员"/>
               </a-form-model-item>
@@ -151,6 +156,8 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         salesTargetName: '',
         salesTargetType: undefined,
         provinceSn: undefined, //  省
@@ -160,6 +167,7 @@ export default {
         salesBillNo: '',
         salesManName: ''
       },
+      outWareTime: [],
       rules: {
         'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
       },
@@ -235,6 +243,10 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
+    },
     //  查询
     handleSearch () {
       this.$refs.ruleForm.validate(valid => {
@@ -252,6 +264,10 @@ export default {
       this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
+
       this.queryParam.salesTargetName = ''
       this.queryParam.salesTargetType = undefined
       this.queryParam.provinceSn = undefined

+ 48 - 17
src/views/salesManagement/salesQuery/list.vue

@@ -5,33 +5,43 @@
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-                <custList ref="custList" @change="custChange" v-model="queryParam.buyerSn"></custList>
+              <a-form-item label="审核时间">
+                <rangeDate ref="auditRangeDate" :value="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-              <a-form-item label="销售单号">
-                <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+              <a-form-item label="出库时间">
+                <rangeDate ref="outWareRangeDate" :value="outWarehouseTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
-              <a-form-item label="单据来源">
-                <v-select
-                  v-model="queryParam.salesBillSource"
-                  ref="salesBillSource"
-                  id="salesManagementList-salesBillSource"
-                  code="SALES_SOURCE"
-                  placeholder="请选择单据来源"
-                  allowClear></v-select>
+              <a-form-item label="客户名称" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
+                <custList ref="custList" @change="custChange" v-model="queryParam.buyerSn"></custList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
+              <a-col :md="4" :sm="24">
+                <a-form-item label="销售单号">
+                  <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="单据来源">
+                  <v-select
+                    v-model="queryParam.salesBillSource"
+                    ref="salesBillSource"
+                    id="salesManagementList-salesBillSource"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
@@ -230,10 +240,16 @@ export default {
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
+      auditTime: [],
+      outWareTime: [],
       // 查询参数
       queryParam: {
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
+        auditBeginDate: '',
+        auditEndDate: '',
+        outWarehouseBeginDate: '',
+        outWarehouseEndDate: '',
         buyerSn: undefined, //  客户名称
         salesBillNo: '', //  销售单号
         purchaseBillNo: '', //  采购单号
@@ -304,6 +320,14 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    auditDateChange (date) {
+      this.queryParam.auditBeginDate = date[0]
+      this.queryParam.auditEndDate = date[1]
+    },
+    outWareDateChange (date) {
+      this.queryParam.outWarehouseBeginDate = date[0]
+      this.queryParam.outWarehouseEndDate = date[1]
+    },
     // 新增
     handleAdd () {
       this.openModal = true
@@ -404,10 +428,17 @@ export default {
       this.$refs.table.refresh(true)
     },
     // 重置数据
-    resetData (falg) {
-      this.$refs.rangeDate.resetDate(falg ? '' : this.time)
-      this.queryParam.beginDate = falg ? '' : getDate.getCurrMonthDays().starttime
-      this.queryParam.endDate = falg ? '' : getDate.getCurrMonthDays().endtime
+    resetData (flag) {
+      this.$refs.rangeDate.resetDate(flag ? '' : this.time)
+      this.queryParam.beginDate = flag ? '' : getDate.getCurrMonthDays().starttime
+      this.queryParam.endDate = flag ? '' : getDate.getCurrMonthDays().endtime
+      this.$refs.auditRangeDate.resetDate('')
+      this.queryParam.auditBeginDate = ''
+      this.queryParam.auditEndDate = ''
+      this.$refs.outWareRangeDate.resetDate('')
+      this.queryParam.outWarehouseBeginDate = ''
+      this.queryParam.outWarehouseEndDate = ''
+
       this.queryParam.buyerSn = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.purchaseBillNo = ''

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.151/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.16.151/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,