Browse Source

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

lilei 3 năm trước cách đây
mục cha
commit
befe2c1152

+ 22 - 4
src/views/Home.vue

@@ -308,7 +308,7 @@ export default {
               name: '入库审核',
               styleC: 'blue-color',
               url: '/financialManagement/warehousingAudit/list',
-              params: { auditState: 'WAIT_PUT_WAREHOUSE' },
+              params: { auditState: 'WAIT_PUT_WAREHOUSE_AUDIT' },
               permission: 'M_warehousingAuditList',
               orderNum: 'purchaseWaitAuditCount'
             },
@@ -538,6 +538,7 @@ export default {
               name: '财务收款',
               styleC: 'blue-color',
               url: '/financialManagement/financialCollection/list',
+              params: JSON.stringify({ bizType: 'ALL' }),
               permission: 'M_financialCollectionList',
               orderNum: ''
             }
@@ -556,6 +557,7 @@ export default {
               name: '财务付款',
               styleC: 'blue-color',
               url: '/financialManagement/financialPayment/list',
+              params: JSON.stringify({ bizType: 'ALL' }),
               permission: 'M_financialPaymentList',
               orderNum: ''
             }
@@ -636,9 +638,25 @@ export default {
     },
     // 导航跳转
     goPage (data) {
-    	if (data) {
-    		this.$router.push({ path: data.url, query: { pageParams: data.params ? data.params : null } })
-    	}
+      if (data) {
+        // 有待办数据,则跳转带有条件的;若无待办数据,则跳转全部数据
+        if (data.orderNum && this.countData[data.orderNum]) {
+          this.$router.push({ path: data.url, query: { pageParams: data.params ? data.params : null } })
+        } else {
+          if (data.url == '/outboundOrderManagement/outboundOrder/list') { // 出库
+            const params = data.params ? JSON.parse(data.params) : null
+            this.$router.push({ path: data.url, query: { pageParams: JSON.stringify({ outBizType: params && params.outBizType ? params.outBizType : null }) } })
+          } else if (data.url == '/financialManagement/financialPayment/list') { // 财务付款
+            const params = data.params ? JSON.parse(data.params) : null
+            this.$router.push({ path: data.url, query: { pageParams: JSON.stringify({ bizType: params && params.bizType ? params.bizType : null }) } })
+          } else if (data.url == '/financialManagement/financialCollection/list') { // 财务收款
+            const params = data.params ? JSON.parse(data.params) : null
+            this.$router.push({ path: data.url, query: { pageParams: JSON.stringify({ bizType: params && params.bizType ? params.bizType : null }) } })
+          } else {
+            this.$router.push({ path: data.url, query: { pageParams: null } })
+          }
+        }
+      }
     },
     // 数据看板信息
     getBizData () {

+ 6 - 6
src/views/reportData/chainSalesDetailsCountReport/list.vue

@@ -14,6 +14,11 @@
           :wrapperCol="wrapperCol"
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
+            <a-col :md="6" :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-form-model-item label="连锁店" prop="tenantId">
                 <a-select
@@ -28,11 +33,6 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :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" style="margin-bottom: 10px;">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="chainSalesDetailsCountReportList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="chainSalesDetailsCountReportList-reset">重置</a-button>
@@ -102,7 +102,7 @@ export default {
         endDate: ''
       },
       rules: {
-        'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
+        // 'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择审核日期', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作

+ 3 - 3
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.16.103:8503/qpls-md',
-        target: 'https://t.qpls.360arrow.com/qpls-md', //  练习
-        // target: 'http://p.iscm.360arrow.com/qpls-md', //  预发布
+        // target: 'http://192.168.16.151:80/qpls-md',
+        // target: 'https://t.qpls.360arrow.com/qpls-md', //  练习
+        target: 'http://p.iscm.360arrow.com/qpls-md', //  预发布
         // target: 'http://qpls-md.360arrow.com/qpls-md', //  生产
         // ws: false,
         ws: true,