浏览代码

时间调整

lilei 3 年之前
父节点
当前提交
790a31fc64

+ 1 - 1
public/version.json

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

+ 41 - 34
src/views/Home.vue

@@ -232,45 +232,47 @@
     <div>
       <a-row>
         <a-col :span="16">
-          <a-card size="small" :bordered="false" class="page-cont" :bodyStyle="{padding: '17px 30px 20px'}">
-            <h3 class="page-tit">
-              <span>销售/采购/调拨指引</span>
-              <a-radio-group v-model="curDate" @change="onDateChange">
-                <!-- <a-radio-button value="6">
+          <a-spin :spinning="spinning" tip="Loading...">
+            <a-card size="small" :bordered="false" class="page-cont" :bodyStyle="{padding: '17px 30px 20px'}">
+              <h3 class="page-tit">
+                <span>销售/采购/调拨指引</span>
+                <a-radio-group v-model="curDate" @change="onDateChange">
+                  <!-- <a-radio-button value="6">
                   最近半年
                 </a-radio-button> -->
-                <a-radio-button value="12">
-                  最近一年
-                </a-radio-button>
-                <a-radio-button value="0">
-                  全部
-                </a-radio-button>
-              </a-radio-group>
-            </h3>
-            <div class="page-nav-main">
-              <!-- 导航指引  start -->
-              <div class="page-nav-con" v-for="(item, index) in navList" :key="index">
-                <div class="page-nav-box" v-for="(subItem, subInd) in item" :key="subInd">
-                  <a-badge
-                    :count="countData&&unitItem.permission&&unitItem.orderNum&&$hasPermissions(unitItem.permission) ? countData[unitItem.orderNum] : 0"
-                    class="page-nav-badge"
-                    v-for="(unitItem, unitInd) in subItem"
-                    :key="unitInd"
-                    @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem,subInd) : null"
-                    :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
-                    <div :class="['page-nav-item', unitItem.styleC]">
-                      <div class="page-nav-n">
-                        <img v-show="unitItem.icon" :src="unitItem.icon" width="16" height="16" />
-                        <span>{{ unitItem.name }}</span>
+                  <a-radio-button value="12">
+                    最近一年
+                  </a-radio-button>
+                  <a-radio-button value="0">
+                    全部
+                  </a-radio-button>
+                </a-radio-group>
+              </h3>
+              <div class="page-nav-main">
+                <!-- 导航指引  start -->
+                <div class="page-nav-con" v-for="(item, index) in navList" :key="index">
+                  <div class="page-nav-box" v-for="(subItem, subInd) in item" :key="subInd">
+                    <a-badge
+                      :count="countData&&unitItem.permission&&unitItem.orderNum&&$hasPermissions(unitItem.permission) ? countData[unitItem.orderNum] : 0"
+                      class="page-nav-badge"
+                      v-for="(unitItem, unitInd) in subItem"
+                      :key="unitInd"
+                      @click="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission) ? goPage(unitItem,subInd) : null"
+                      :style="{cursor: unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)?'pointer': 'initial'}">
+                      <div :class="['page-nav-item', unitItem.styleC]">
+                        <div class="page-nav-n">
+                          <img v-show="unitItem.icon" :src="unitItem.icon" width="16" height="16" />
+                          <span>{{ unitItem.name }}</span>
+                        </div>
+                        <a-icon type="caret-right" v-show="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)" style="color: #BBBBBB;" />
                       </div>
-                      <a-icon type="caret-right" v-show="unitItem.permission&&unitItem.url&&$hasPermissions(unitItem.permission)" style="color: #BBBBBB;" />
-                    </div>
-                  </a-badge>
+                    </a-badge>
+                  </div>
                 </div>
-              </div>
               <!-- 导航指引  end -->
-            </div>
-          </a-card>
+              </div>
+            </a-card>
+          </a-spin>
         </a-col>
         <a-col :span="8">
           <a-card size="small" :bordered="false" class="page-cont right-con" :bodyStyle="{padding: '17px 30px 20px'}">
@@ -356,6 +358,7 @@ export default {
   mixins: [mixin, commonMixin],
   data () {
     return {
+      spinning: false,
       message: '欢迎登录' + process.env.VUE_APP_PRO_NAME,
       hiddenBizData: true, // 隐藏数据概览
       openResetPwd: false, //  重置密码是否显示
@@ -818,12 +821,14 @@ export default {
     },
     // 导航指引合计
     getNavCount () {
+      this.spinning = true
       bizStateCount(this.queryParams).then(res => {
         if (res.status == 200) {
           this.countData = res.data
         } else {
           this.countData = null
         }
+        this.spinning = false
       })
     },
     onDateChange (e) {
@@ -844,6 +849,8 @@ export default {
         let params = null
         // 有待办数据,则跳转带有条件的;若无待办数据,则跳转全部数据
         if (data.orderNum && this.countData[data.orderNum] || data.params) {
+          data.params.beginDate = this.queryParams.beginDate
+          data.params.endDate = this.queryParams.endDate
           params = { pageParams: data.params, type: 'todo' }
         } else {
           params = { pageParams: null, type: subInd == 1 ? 'new' : 'todo' }

+ 1 - 0
src/views/allocationManagement/chainTransferOut/list.vue

@@ -392,6 +392,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/allocationManagement/storeTransferOut/list.vue

@@ -378,6 +378,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -295,6 +295,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -382,6 +382,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -383,6 +383,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
+          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {

+ 4 - 3
src/views/financialManagement/financialCollection/list.vue

@@ -35,11 +35,11 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
-              <!-- <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="创建时间">
                   <rangeDate ref="createDate" @change="createDateChange" />
                 </a-form-item>
-              </a-col> -->
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="审核时间">
                   <rangeDate ref="rangeDate" @change="dateChange" />
@@ -405,7 +405,7 @@ export default {
     resetData () {
       if (this.advanced) {
         this.$refs.rangeDate.resetDate()
-        // this.$refs.createDate.resetDate()
+        this.$refs.createDate.resetDate()
       }
       this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam = {
@@ -458,6 +458,7 @@ export default {
       this.curBizType = isHomeNav.pageParams.bizType
       this.resetData()
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
+      this.$refs.createDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.pageInit()
     } else {
       // 如果是新页签打开,则重置当前页面

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

@@ -34,11 +34,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <!-- <a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="创建时间">
                   <rangeDate ref="createDate" @change="createDateChange" />
                 </a-form-item>
-              </a-col> -->
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="审核时间">
                   <rangeDate ref="rangeDate" @change="dateChange" />
@@ -345,7 +345,7 @@ export default {
     resetData () {
       if (this.advanced) {
         this.$refs.rangeDate.resetDate()
-        // this.$refs.createDate.resetDate()
+        this.$refs.createDate.resetDate()
       }
       this.$refs.table.clearSelected() // 清空表格选中项
       this.queryParam = {
@@ -398,6 +398,7 @@ export default {
       this.curBizType = isHomeNav.pageParams.bizType
       this.resetData()
       this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
+      this.$refs.createDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
       this.pageInit()
     } else {
       // 如果是新页签打开,则重置当前页面

+ 1 - 0
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -359,6 +359,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetSearchForm(true)
           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 - 0
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -358,6 +358,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -353,6 +353,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/salesManagement/salesQuery/list.vue

@@ -502,6 +502,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           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 - 0
src/views/salesManagement/salesReturn/list.vue

@@ -324,6 +324,7 @@ export default {
         if (isHomeNav.type == 'todo') {
           this.resetData(true)
           this.queryParam = Object.assign(this.queryParam, isHomeNav.pageParams)
+          this.$refs.rangeDate.resetDate([this.queryParam.beginDate, this.queryParam.endDate])
           this.$refs.table.refresh(true)
         }
       } else {

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