lilei 2 years ago
parent
commit
c83fa1e161

+ 1 - 1
public/version.json

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

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

@@ -45,6 +45,11 @@
                   <rangeDate ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款时间">
+                  <rangeDate ref="settleDate" @change="settleChange" />
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -196,7 +201,9 @@ export default {
         settleClientName: '',
         billState: '',
         auditBeginDate: '',
-        auditEndDate: ''
+        auditEndDate: '',
+        settleBeginDate: '',
+        settleEndDate: ''
       },
       // 总计
       totalData: {
@@ -290,6 +297,10 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    settleChange (date) {
+      this.queryParam.settleBeginDate = date[0]
+      this.queryParam.settleEndDate = date[1]
+    },
     // 总计
     settleReceiptQuerySum (params) {
       settleReceiptQuerySum(params).then(res => {
@@ -408,6 +419,7 @@ export default {
       if (this.advanced) {
         this.$refs.rangeDate.resetDate()
         this.$refs.createDate.resetDate()
+        this.$refs.settleDate.resetDate()
       }
       this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam = {
@@ -419,7 +431,9 @@ export default {
         beginDate: '',
         endDate: '',
         auditBeginDate: '',
-        auditEndDate: ''
+        auditEndDate: '',
+        settleBeginDate: '',
+        settleEndDate: ''
       }
     },
     pageInit () {

+ 17 - 3
src/views/financialManagement/financialPayment/list.vue

@@ -15,7 +15,7 @@
               <a-form-item label="付款单号"><a-input id="finacialPay-settleNo" v-model.trim="queryParam.settleNo" allowClear placeholder="请输入付款单号" /></a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="发货单号"><a-input id="finacialPay-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入发货单号" /></a-form-item>
+              <a-form-item label="关联单号"><a-input id="finacialPay-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单号" /></a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="商户名称">
@@ -44,6 +44,11 @@
                   <rangeDate ref="rangeDate" @change="dateChange" />
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="收款时间">
+                  <rangeDate ref="settleDate" @change="settleChange" />
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -177,7 +182,9 @@ export default {
         settleClientName: '',
         billState: '',
         auditBeginDate: '',
-        auditEndDate: ''
+        auditEndDate: '',
+        settleBeginDate: '',
+        settleEndDate: ''
       },
       // 总计
       totalData: {
@@ -268,6 +275,10 @@ export default {
       this.queryParam.beginDate = date[0]
       this.queryParam.endDate = date[1]
     },
+    settleChange (date) {
+      this.queryParam.settleBeginDate = date[0]
+      this.queryParam.settleEndDate = date[1]
+    },
     // 总计
     settlePayQuerySum (params) {
       settlePayQuerySum(params).then(res => {
@@ -387,6 +398,7 @@ export default {
       if (this.advanced) {
         this.$refs.rangeDate.resetDate()
         this.$refs.createDate.resetDate()
+        this.$refs.settleDate.resetDate()
       }
       this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam = {
@@ -398,7 +410,9 @@ export default {
         beginDate: '',
         endDate: '',
         auditBeginDate: '',
-        auditEndDate: ''
+        auditEndDate: '',
+        settleBeginDate: '',
+        settleEndDate: ''
       }
     },
     pageInit () {

+ 23 - 3
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -26,7 +26,7 @@
                   <ProductBrand id="inventoryQueryList-productBrandSn" placeholder="请选择产品品牌" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <a-col :md="4" :sm="24">
                 <a-form-model-item label="产品分类">
                   <ProductType id="inventoryQueryList-productType" placeholder="请选择产品分类" :isDealer="true" @change="changeType" v-model="productTypeSn"></ProductType>
                 </a-form-model-item>
@@ -60,8 +60,23 @@
                   </a-input-group>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="4" :sm="24">
+                <a-form-item label="产品来源">
+                  <a-select
+                    placeholder="请选择产品来源"
+                    v-model="queryParam.productSysFlag"
+                  >
+                    <a-select-option value="1">
+                      箭冠
+                    </a-select-option>
+                    <a-select-option value="0">
+                      自建
+                    </a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
             </template>
-            <a-col :md="12" :sm="24">
+            <a-col :md="10" :sm="24">
               <a-checkbox v-model="queryParam.zeroQtyFlag" id="inventoryQueryList-zeroQtyFlag">只查看有库存</a-checkbox>
               <a-checkbox v-model="queryParam.enableFlag" :checked="queryParam.enableFlag" id="inventoryQueryList-enableFlag">包括禁用产品</a-checkbox>
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryList-refresh">查询</a-button>
@@ -167,7 +182,8 @@ export default {
         zeroQtyFlag: false, //  库存情况
         enableFlag: true, // 显示禁用产品
         minUnsalableDays: undefined, // 滞销天数最小值
-        maxUnsalableDays: undefined // 滞销天数最大值
+        maxUnsalableDays: undefined, // 滞销天数最大值
+        productSysFlag: undefined
       },
       productTypeSn: [],
       exportLoading: false, // 导出loading
@@ -199,6 +215,9 @@ export default {
           const params = Object.assign(parameter, this.queryParam)
           params.zeroQtyFlag = params.zeroQtyFlag ? '0' : ''
           params.enableFlag = params.enableFlag ? '' : '1'
+          params.product = {
+            sysFlag: params.productSysFlag || undefined
+          }
           return stockList(params).then(res => {
             let data
             if (res.status == 200) {
@@ -314,6 +333,7 @@ export default {
       this.productTypeSn = []
       this.queryParam.minUnsalableDays = undefined // 滞销天数最小值
       this.queryParam.maxUnsalableDays = undefined // 滞销天数最大值
+      this.queryParam.productSysFlag = undefined
       this.$refs.table.refresh(true)
     },
     // 合计

+ 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.0.182:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.215:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,