sale-client 4.2.71 → 4.2.72

package/src/filiale/jinhuang/cardsHand.vue

@@ -20,7 +20,7 @@
                 <datepicker style="width:60%" id="startDate" placeholder="开始日期"
                             v-model="model.startDate"
                             :value.sync="model.startDate"
-                            :format="'yyyy-MM-dd'"
+                            :format="'yyyy-MM-dd 00:00:00'"
                             :show-reset-button="true">
                 </datepicker>
               </div>
@@ -30,7 +30,7 @@
                 <datepicker style="width:60%" id="endDate" placeholder="结束日期"
                             v-model="model.endDate"
                             :value.sync="model.endDate"
-                            :format="'yyyy-MM-dd'"
+                            :format="'yyyy-MM-dd 23:59:59'"
                             :show-reset-button="true">
                 </datepicker>
               </div>
@@ -489,8 +489,8 @@ export default {
       orderitem: 'f_userinfo_code',
       model: new PagedList('api/af-revenue/sql/getCardPlan', 50, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_userinfo_code'`}, {f_actualtablebase: 0}),
       // model: new PagedList('api/af-revenue/sql/cardHands', 50),
-      startDate: Util.toStartAndEndDateString()[0],
-      endDate: Util.toStartAndEndDateString()[1],
+      startDate: Util.toStartAndEndDateString()[0] + ' 00:00:00',
+      endDate: Util.toStartAndEndDateString()[1] + ' 23:59:59',
       handDate: null,
       batch_audit: false,
       cardCental: false,
@@ -535,14 +535,14 @@ export default {
     if (this.timer) clearInterval(this.timer)
   },
   ready () {
-    this.$refs.paged.$refs.criteria.model.startDate = Util.toStartAndEndDateString()[0]
-    this.$refs.paged.$refs.criteria.model.endDate = Util.toStartAndEndDateString()[1]
+    this.$refs.paged.$refs.criteria.model.startDate = Util.toStartAndEndDateString()[0] + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = Util.toStartAndEndDateString()[1] + ' 23:59:59'
     loadParamGem(this)
   },
   methods: {
     downloadFiles () {
       let downurl = 'api/af-revenue/downloadfile/file?filename=卡表批量抄表导入模板'
-      this.$downFile(downurl,'卡表批量抄表导入模板.xlsx')
+      this.$downFile(downurl, '卡表批量抄表导入模板.xlsx')
     },
     hidden () {
       this.criteriaShow = !this.criteriaShow
@@ -644,7 +644,7 @@ export default {
       if (!row.f_tablebase || ((row.f_tablebase - 0) - (row.f_last_tablebase - 0)).toFixed(3) < 0) {
         return
       }
-      if (row.f_tablebase.toString().split(".").length>1 && row.f_tablebase.toString().split(".")[1].length>3) {
+      if (row.f_tablebase.toString().split('.').length > 1 && row.f_tablebase.toString().split('.')[1].length > 3) {
         Vue.set(row, 'error', '底数最多只能输入小数点后3位')
         return
       }

package/src/filiale/kelai/FileUserFilesKeLai.vue

@@ -959,7 +959,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/konggang/FileUserFiles.vue

@@ -922,7 +922,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)