sale-client 4.2.70 → 4.2.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.70",
+  "version": "4.2.72",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/FileUserFiles.vue

@@ -1046,7 +1046,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, headers: {token: Vue.$login.jwt, Authorization: 'Bearer ' + Vue.$login.jwtNew}}).then((res) => {
                 if (res.data.data) {
                   let resultData = res.data.data

package/src/components/revenue/Common/EticketPrint.vue

@@ -52,7 +52,7 @@ export default {
     async rushRedInvoice (data) {
       try {
         // 否则正常打票
-        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
+        let result = await this.$resetpost('/invoice/rs/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
           resolveMsg: null,
           rejectMsg: '发票冲红失败!!'
         })
@@ -75,7 +75,7 @@ export default {
     async openETicket (id, model, f_charge_type, invoice_type, retry, is_tax, handplanTableName) {
       console.log('>>> f_invoice_type', invoice_type)
       try {
-        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
+        let result = await this.$resetpost('/invoice/rs/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
           retry,

package/src/components/revenue/HandManager/CardHand.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>
@@ -445,8 +445,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         orderitem: 'f_userinfo_code',
         model: new PagedList('api/af-revenue/sql/cardHands', 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,
@@ -487,8 +487,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
       }
     },
     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)
       this.$nextTick(() => {
         if (this.shengyu == 'false') {

package/src/components/revenue/cardHandManage/cardDown.vue

@@ -14,7 +14,7 @@
                             class="datepicker"
                             v-model="model.startDate"
                             :value.sync="model.startDate"
-                            :format="'yyyy-MM-dd'"
+                            :format="'yyyy-MM-dd 00:00:00'"
                 ></datepicker>
               </div>
               <div class="col-sm-2 form-group">
@@ -23,7 +23,7 @@
                             style="width:60%"
                             v-model="model.endDate"
                             :value.sync="model.endDate"
-                            :format="'yyyy-MM-dd'"
+                            :format="'yyyy-MM-dd 23:59:59'"
                 ></datepicker>
               </div>
 
@@ -847,8 +847,8 @@ export default {
     },
     reflash () {
       this.$refs.paged.$refs.criteria.model.f_orgid = `${Vue.$login.f.orgid}`
-      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStartAndEndDateString()[0]
-      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStartAndEndDateString()[1]
+      this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStartAndEndDateString()[0] + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStartAndEndDateString()[1] + ' 23:59:59'
       this.search()
     },
     fileUpload () {
@@ -943,8 +943,8 @@ export default {
       if (this.downModel.downWay === 'downWithSelf') {
         param.inputtor = this.downModel.downInputtor[0]
         console.log('下发参数：', param)
-        console.log(param.inputtor,param.inputtor===undefined)
-        if(param.inputtor===undefined || param.inputtor===null){
+        console.log(param.inputtor, param.inputtor === undefined)
+        if (param.inputtor === undefined || param.inputtor === null) {
           this.$showAlert(`抄表员为空`, 'danger', 10000)
           return
         }