manage-client 3.3.233 → 3.3.235

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.233",
+    "version": "3.3.235",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/SellReport/BusinessClassify.vue

@@ -192,6 +192,45 @@ let getorg = async function (self) {
       console.log(this.$login.f)
     },
     methods: {
+      adjustParams(startDateStr,endDateStr) {
+        const now = new Date()
+        const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0)
+
+        const startDate = new Date(startDateStr)
+        const endDate = new Date(endDateStr)
+        let result
+        if (startDate < todayStart && endDate >= todayStart) {
+          // startDate 在今天之前，endDate 在今天或之后
+          let splitDates = 2
+          let month = now.getMonth() + 1
+          let date = now.getDate()
+          const yesterday = new Date(now);
+          yesterday.setDate(yesterday.getDate() - 1);
+          let month2 = yesterday.getMonth() + 1
+          let date2 = yesterday.getDate()
+          result = {
+            splitDates: splitDates,
+            yesterdayEnd: (yesterday.getFullYear() + '-' + (month2 < 10 ? '0' + month2 : month2) + '-' + (date2 < 10 ? '0' + date2 : date2) + ' 23:59:59'),
+            todayStart:  now.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date) + ' 00:00:00'
+          }
+        } else if (startDate >= todayStart && endDate >= todayStart) {
+          // startDate 和 endDate 都在今天或之后
+          let splitDates = 0
+          result = {
+            splitDates: splitDates
+          }
+        } else {
+          // startDate 和 endDate 都在今天之前
+          let splitDates = 1
+          result = {
+            splitDates: splitDates
+          }
+        }
+        function padZero(num) {
+          return num.toString().padStart(2, '0');
+        }
+        return result;
+      },
       searchData () {
         this.$refs.paged.$refs.criteria.search()
       },
@@ -231,16 +270,47 @@ let getorg = async function (self) {
         }
         orgcondition += ' and ' + args.condition
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        let monthObj = null
+        let yearObj = null
+        if (this.$refs.paged.$refs.criteria.model.startDate && this.$refs.paged.$refs.criteria.model.endDate ) {
+          monthObj = this.adjustParams(this.$refs.paged.$refs.criteria.model.startDate, this.$refs.paged.$refs.criteria.model.endDate)
+        }
+        if (this.$refs.paged.$refs.criteria.model.yearStartDate && this.$refs.paged.$refs.criteria.model.yearEndDate) {
+          yearObj = this.adjustParams(this.$refs.paged.$refs.criteria.model.yearStartDate, this.$refs.paged.$refs.criteria.model.yearEndDate)
+        }
+        console.log('========', monthObj)
+        console.log('========', yearObj)
         if (this.reportStyle == '1') {
           let load = new HttpResetClass()
+          let params = {
+            startDate: args.model.startDate,
+            endDate: args.model.endDate,
+            monthRealTime: 0,
+            yearRealTime: 0,
+            monthRealStart: '',
+            monthHistoryEnd: '',
+            yearRealStart: '',
+            yearHistoryEnd: '',
+            yearStartDate: args.model.yearStartDate,
+            yearEndDate: args.model.yearEndDate,
+            f_orgid: orgcondition
+          }
+          if (monthObj && monthObj.splitDates === 2) {
+            params.monthRealTime = monthObj.splitDates
+            params.monthRealStart = monthObj.todayStart
+            params.monthHistoryEnd = monthObj.yesterdayEnd
+          } else if (monthObj) {
+            params.monthRealTime = monthObj.splitDates
+          }
+          if (yearObj && yearObj.splitDates === 2) {
+            params.yearRealTime = yearObj.splitDates
+            params.yearRealStart = yearObj.todayStart
+            params.yearHistoryEnd = yearObj.yesterdayEnd
+          } else if (yearObj) {
+            params.yearRealTime = yearObj.splitDates
+          }
           load.load("POST", 'api/af-revenue/sql/UserCountNum',
-            {data: {
-                startDate: args.model.startDate,
-                endDate: args.model.endDate,
-                yearStartDate: args.model.yearStartDate,
-                yearEndDate: args.model.yearEndDate,
-                f_orgid: orgcondition
-              }},
+            {data: params},
             {resolveMsg: null, rejectMsg: null})
             .then((res) => {
               let info = res.data
@@ -261,6 +331,26 @@ let getorg = async function (self) {
               this.$refs.paged.search(args)
             })
         } else {
+          this.model.params.monthRealTime = 0
+          this.model.params.yearRealTime = 0
+          this.model.params.monthRealStart = ''
+          this.model.params.monthHistoryEnd = ''
+          this.model.params.yearRealStart = ''
+          this.model.params.yearHistoryEnd = ''
+          if (monthObj && monthObj.splitDates === 2) {
+            this.model.params.monthRealTime = monthObj.splitDates
+            this.model.params.monthRealStart = monthObj.todayStart
+            this.model.params.monthHistoryEnd = monthObj.yesterdayEnd
+          }else if (monthObj) {
+            this.model.params.monthRealTime = monthObj.splitDates
+          }
+          if (yearObj && yearObj.splitDates === 2) {
+            this.model.params.yearRealTime = yearObj.splitDates
+            this.model.params.yearRealStart = yearObj.todayStart
+            this.model.params.yearHistoryEnd = yearObj.yesterdayEnd
+          }else if (yearObj) {
+            this.model.params.yearRealTime = yearObj.splitDates
+          }
           this.model.url = 'api/af-revenue/report/BusinessClassifyTwo'
           this.$refs.paged.search(args)
         }

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -45,7 +45,7 @@
                     <export-excel :data="$parent.$parent.getCondition"
                                   :field="$parent.$parent.getExportField"
                                   v-if="$parent.$parent.authArr.includes('档案查询导出')"
-                                  sqlurl="/api/af-revenue/easyExcel/compreExport" sql-name="compreQuery" template-name='综合档案查询导出'  :choose-col="true"></export-excel>
+                                  sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="compreQuery" template-name='综合档案查询导出'  :choose-col="true"></export-excel>
                     <print-data :sum-field="$parent.$parent.getExportField" :model="$parent.model" :field="$parent.$parent.getExportField"
                                  :defaultfield="$parent.$parent.defaultfield"
                                 titletable="综合档案查询"

package/src/components/sale/filesquery/UserQuery.vue

@@ -99,7 +99,7 @@
                               v-model="model.f_payment"
                               :options='$parent.$parent.dypayment' placeholder='请选择'
                               condition="f_cost_type in {}"
-                              close-on-select></v-select>
+                    ></v-select>
                   </div>
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">客户地址</label>

package/src/components/webmeter/newwebmeter/NewException/TotalExceptionByMeter.vue

@@ -368,7 +368,7 @@
         },
         condition: '1=1',
         org:[this.$login.f.orgid],
-        orgCondtionStr: ` and f_orgid = ${this.$login.f.orgid}`
+        orgCondtionStr: ` and u.f_orgid = ${this.$login.f.orgid}`
       }
     },
     ready() {