sale-client 3.6.184 → 3.6.186

package/package.json

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

package/src/components/chargeBatch/CardList.vue

@@ -251,7 +251,10 @@
         asideTitle: '用户操作',
         row: Object,
         comp: null,
-        operationtypes: [{label: '全部', value: ''}],
+        operationtypes: this.$appdata.getParam('操作类型') ? [{
+          label: '全部',
+          value: ''
+        }, ...this.$appdata.getParam('操作类型')] : [],
         cancel_show: false,
         cancel_data: null,
         paytype: this.$appdata.getParam('付款方式'),

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

@@ -8,80 +8,90 @@
         <validator name='v'>
           <form class="form-horizontal  select-overspread">
             <div class="row">
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">第三方缴费</label>
-                <v-select
+              <div class="col-sm-6 form-group" :class="[$v.f_third_pay.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >第三方缴费</label>
+                <input type="text" v-show="false" v-model="$refs.f_third_pay.selectedItems"
+                       v-validate:f_third_pay='{required: true }'>
+                <v-select width="60%"
                   :value.sync="model.f_third_pay"
                   v-model="model.f_third_pay"
                   :options='thirdPays'
-                  :value-single="true"
+                  :value-single="true" v-ref:f_third_pay
                   close-on-select></v-select>
               </div>
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">限制类型</label>
-                <v-select
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_style.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >限制类型</label>
+                <input type="text" v-show="false" v-model="$refs.f_limit_style.selectedItems"
+                       v-validate:f_limit_style='{required: true }'>
+                <v-select width="60%"
                   :value.sync="model.f_limit_style"
                   v-model="model.f_limit_style"
                   :options='limitstyle'
-                  :value-single="true"
+                  :value-single="true" v-ref:f_limit_style
                   close-on-select></v-select>
               </div>
             </div>
             <div class="row" style="margin-top:10px;" >
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">周期类型</label>
-                <v-select
+              <div class="col-sm-6 form-group" :class="[$v.f_time_type.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >周期类型</label>
+                <input type="text" v-show="false" v-model="$refs.f_time_type.selectedItems"
+                       v-validate:f_time_type='{required: true }'>
+                <v-select width="60%"
                   :value.sync="model.f_time_type"
                   v-model="model.f_time_type"
                   :options='timeTypes'
-                  :value-single="true"
+                  :value-single="true" v-ref:f_time_type
                   close-on-select></v-select>
               </div>
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">周期时长</label>
-                <input type="text" v-model="model.f_time_value" placeholder="周期时长" style="vertical-align:middle">
+              <div class="col-sm-6 form-group" :class="[$v.f_time_value.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >周期时长</label>
+                <input type="text" class="input_search" v-model="model.f_time_value" placeholder="周期时长"  v-validate:f_time_value='{required: true }' style="vertical-align:middle;width: 60%">
               </div>
             </div>
 
             <div class="row" style="margin-top:10px;" v-if="model.f_limit_style !=='按总量'">
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">限制次数</label>
-                <input type="text" v-model="model.f_limit_times" placeholder="限制次数">
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_times.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >限制次数</label>
+                <input type="text" class="input_search" v-model="model.f_limit_times"  style="vertical-align:middle;width: 60%" v-validate:f_limit_times='{required: true }' placeholder="限制次数">
               </div>
-              <div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='气量'">
-                <label class="font_normal_body col-sm-3">单次限购</label>
-                <input type="text" v-model="model.f_limit_value" placeholder="单次限购">
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_value.required ? 'has-error' : '']" v-if="model.f_limit_type ==='气量'">
+                <label class="font_normal_body col-sm-3" >单次限购</label>
+                <input type="text" class="input_search" v-model="model.f_limit_value"  style="vertical-align:middle;width: 60%" v-validate:f_limit_value='{required: true }' placeholder="单次限购">
               </div>
-              <div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='金额'">
-                <label class="font_normal_body col-sm-3">单次限购</label>
-                <input type="text" v-model="model.f_limit_amount" placeholder="单次限购">
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_amount.required ? 'has-error' : '']" v-if="model.f_limit_type ==='金额'">
+                <label class="font_normal_body col-sm-3" >单次限购</label>
+                <input type="text" class="input_search" v-model="model.f_limit_amount"  style="vertical-align:middle;width: 60%" v-validate:f_limit_amount='{required: true }' placeholder="单次限购">
               </div>
             </div>
             <div class="row" style="margin-top:10px;" v-if="model.f_limit_style ==='按总量'">
-              <div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='气量'">
-                <label class="font_normal_body col-sm-3">总限购量</label>
-                <input type="text" v-model="model.f_limit_value" placeholder="单次限购">
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_value.required ? 'has-error' : '']" v-if="model.f_limit_type ==='气量'">
+                <label class="font_normal_body col-sm-3" >总限购量</label>
+                <input type="text" class="input_search" v-model="model.f_limit_value" style="vertical-align:middle;width: 60%" v-validate:f_limit_value='{required: true }' placeholder="单次限购">
               </div>
-              <div class="col-sm-6 form-input-group" v-if="model.f_limit_type ==='金额'">
-                <label class="font_normal_body col-sm-3">总限购量</label>
-                <input type="text" v-model="model.f_limit_amount" placeholder="单次限购">
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_amount.required ? 'has-error' : '']" v-if="model.f_limit_type ==='金额'">
+                <label class="font_normal_body col-sm-3" >总限购量</label>
+                <input type="text" class="input_search" v-model="model.f_limit_amount"  style="vertical-align:middle;width: 60%" v-validate:f_limit_amount='{required: true }' placeholder="单次限购">
               </div>
             </div>
             <div class="row" style="margin-top:10px;">
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">支付限制</label>
-                <v-select
+              <div class="col-sm-6 form-group" :class="[$v.f_limit_type.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >支付限制</label>
+                <input type="text" v-show="false" v-model="$refs.f_limit_type.selectedItems"
+                       v-validate:f_limit_type='{required: true }'>
+                <v-select width="60%"
                   :value.sync="model.f_limit_type"
                   v-model="model.f_limit_type"
                   :options='limitTypes'
-                  :value-single="true"
+                  :value-single="true" v-ref:f_limit_type
                   close-on-select></v-select>
               </div>
-              <div class="col-sm-6 form-input-group">
-                <label class="font_normal_body col-sm-3">执行时间</label>
-                <datepicker placeholder="执行时间"
+              <div class="col-sm-6 form-group" :class="[$v.f_start_date.required ? 'has-error' : '']">
+                <label class="font_normal_body col-sm-3" >执行时间</label>
+                <input type="text" v-show="false" v-model="model.f_start_date"
+                       v-validate:f_start_date='{required: true }'>
+                <datepicker placeholder="执行时间" style="width:60%"
                             v-model="model.f_start_date"
-                            :value.sync="model.f_start_date"
+                            :value.sync="model.f_start_date" v-ref:f_start_date
                             :format="'yyyy-MM-dd'">
                 </datepicker>
               </div>
@@ -91,7 +101,7 @@
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button class="btn btn-success" v-if="limitshow" @click="cancellimit">取消限购</button>
-        <button class="button_search btn-gn" @click="confirm">确认</button>
+        <button class="button_search btn-gn" :disabled="!$v.valid" @click="confirm">确认</button>
         <button class="button_clear btn-gn" @click="cancel">取消</button>
       </footer>
     </modal>
@@ -165,7 +175,17 @@
           getLimitDataGen(this)
         }
       },
-
+      computed: {
+        limitValid () {
+          let result = true
+          for (let key in this.model) {
+            if (this.model[key] === '') {
+              result = false
+            }
+          }
+          return result
+        },
+      },
       confirm () {
         this.$dispatch('limit', this.model)
         this.model = {

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

@@ -63,7 +63,7 @@
         messShow: false
       }
     },
-    props: ['show','data','billData', 'billConfig'],
+    props: ['show', 'data', 'billData', 'billConfig'],
     ready () {
       console.log('打票', this.billConfig, this.billData)
     },
@@ -92,7 +92,7 @@
           if (this.billConfig.hasBillManage) {
             if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
           } else {
-            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
+            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！', newly: true})
           }
           if (select) {
             this.$refs.reportprint.print(true)
@@ -109,14 +109,13 @@
         if (val) {
           getBillData(this, val).then(() => {
             console.log(444)
-            if(this.billConfig.autoPrint){
+            if (this.billConfig.autoPrint) {
               this.print()
             }
-            this.$emit('ready')
+            this.confirmbuttonfocus()
           }).catch((error) => {
             this.$emit('error', error)
           })
-          this.confirmbuttonfocus()
         }
       }
     },

package/src/components/revenue/comprehen/ComprehenOperation/BankPayment/BankPayment.vue

@@ -213,6 +213,7 @@
       },
       async chargecal (row) {
         let param = {
+          f_operator: Vue.$login.f.name,
           f_sell_id: row.maxid,
           f_cancel_reason: '',
           f_orgid: Vue.$login.f.orgid,

package/src/filiale/qianneng/chargeBatch/ChargeGroupList.vue

@@ -148,7 +148,7 @@
         </data-grid>
       </criteria-paged>
       <print-data :sum-field="getfield" :model="printModel" :thead="getHead"
-                  :starthead="starthead"
+                  :starthead="getStarthead"
                   :field="getfield" :printview="true"
                   :sumsmodel="{'f_oughtfee':printModel.sums.f_oughtfee}"
                   :defaultfield="defaultfield"
@@ -263,6 +263,12 @@ export default {
     },
     getHead () {
       return `团缴号：${this.row.f_customer}`
+    },
+    getStarthead () {
+      return `<div style="display: inline-block;width: 100%;">
+                          <div style="text-align: left;display: inline-block;width: 49%;float: left;">&nbsp;团缴编号: ${this.row.f_customer}</div>
+                          <div style="text-align: right;display: inline-block;width: width: 49%;float: right;">总欠费金额: ${this.row.f_oughtfee_all}元&nbsp;</div>
+              </div>`
     }
   },
   watch: {
@@ -338,10 +344,6 @@ export default {
       this.row = row
       let condition = `p.f_civill_id = ${row.id}`
       await this.printModel.search(condition)
-      this.starthead = `<div style="display: inline-block;width: 100%;">
-                          <div style="text-align: left;display: inline-block;width: 49%;float: left;">&nbsp;团缴编号: ${row.f_customer}</div>
-                          <div style="text-align: right;display: inline-block;width: width: 49%;float: right;">总欠费金额: ${row.f_oughtfee_all}元&nbsp;</div>
-                        </div>`
       this.$refs.printdata.printData()
     },
     // 导出
@@ -349,7 +351,6 @@ export default {
       this.row = row
       this.getotherfooter(row)
       this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
-      this.starthead = `团缴编号: ${row.f_customer},总欠费金额: ${row.f_oughtfee_all}元`
       this.excelhead = []
       let headData = []
       headData.push(this.starthead)