sale-client 3.6.157 → 3.6.159

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -964,6 +964,18 @@
 </script>
 <style lang="less">
   #meterInfoTest{
+    // 去掉number类型输入框的上下箭头
+    input[type="number"] {
+      &::-webkit-inner-spin-button,
+      &::-webkit-outer-spin-button {
+        -webkit-appearance: none;
+        margin: 0;
+      }
+
+      & {
+        -moz-appearance: textfield;
+      }
+    }
     #addboxmap {
       height: 300px;
     }

package/src/components/chargeBatch/ReissueBillBatch.vue

@@ -62,14 +62,10 @@
           for (let row of this.sellingData) {
             let bill = await this.$resetpost(this.data.billUrl, {data: {condition: row.id, operator: `'${this.data.f_operator}'`}}, {resolveMsg: null})
             this.bill.data = bill.data
-            await new Promise(resolve => {
-              this.$nextTick(() => {
-                setTimeout(() => {
-                  // 在延迟后执行打印操作
-                  this.asyncPrint(select)
-                  resolve()
-                }, parseInt(this.timeOut)) // 延迟1秒钟打印下一张票据，可以根据需要调整延迟时间
-              })
+            this.$nextTick(function () {
+              setTimeout(function () {
+                this.asyncPrint(select)
+              }, parseInt(this.timeOut)) // 延迟时间从this.timeOut中获取，需要确保timeOut是一个数字值
             })
             this.printControl = null
           }

package/src/components/common/userinfo_detail/ic_detail/ChangeMeterQueryUser.vue

@@ -115,7 +115,6 @@
         }, ...this.$appdata.getParam('是否有效')] : [],
         // row数据
         rowsdata: [],
-        searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
         fields: {'f_userinfo_code': '客户编号', 'f_user_name': '客户姓名', 'f_type': '换表类型', 'f_meter_base': '旧表底数', 'f_newmeter_base': '新表底数', 'f_changemeter_fee': '换表费', 'f_operator': '操作员', 'f_changemeter_date': '换表日期'},
         defaultfield: [
           'f_userinfo_code', 'f_user_name', 'f_type', 'f_meter_base', 'f_newmeter_base', 'f_changemeter_fee', 'f_operator', 'f_changemeter_date'
@@ -131,7 +130,7 @@
     },
     methods: {
       async search () {
-        this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}' `
+        this.condition = `${this.$refs.paged.$refs.criteria.condition} and f_user_id = '${this.row.f_user_id}'`
         this.model.search(this.condition, this.model)
         let http = new HttpResetClass()
         let res = await http.load('POST', 'rs/sql/sale_ChangeMeterQuery', {

package/src/components/revenue/comprehen/gasbrand/GasBrandUser.vue

@@ -19,7 +19,7 @@
               <export-excel
                 :data="{condition: $parent.$parent.condition}"
                 :field="$parent.$parent.getfield"
-                sqlurl="rs/logic/exportfile" sql-name="salegetGasUser" :template-name="$parent.$parent.meterbrand+'气价使用人'"
+                sqlurl="rs/logic/saleExport" sql-name="getGasBrandsUser" :template-name="$parent.$parent.meterbrand+'气价使用人'"
                 :choose-col="true"></export-excel>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_top': $parent.$parent.criteriaShow2,'button_shrink_bottom': !$parent.$parent.criteriaShow2}"
@@ -93,11 +93,12 @@
         pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
         config: {
           excelHeaders: {
-            'f_price_name': '气价名称',
             'f_userinfo_code': '客户编号',
+            'f_meternumber': '表号',
+            'f_meter_brand': '气表品牌',
+            'f_meter_type': '气表类型',
             'f_user_name': '客户姓名',
-            'f_address': '客户地址',
-            'f_orgname': '组织机构'
+            'f_address': '客户地址'
           }
         },
         checked1: true,

package/src/filiale/qianneng/revenue/common/ic_detail/ChargeQueryUser.vue

@@ -67,7 +67,7 @@
               <th><nobr>违约金</nobr></th>
               <th><nobr>减免金额</nobr></th>
               <th><nobr>上期结余</nobr></th>
-              <th><nobr v-if="!$parent.$parent.$parent.isIot">应交金额</nobr></th>
+              <th v-if="!$parent.$parent.$parent.isIot"><nobr >应交金额</nobr></th>
               <th><nobr>实收金额</nobr></th>
               <th><nobr>本期结余</nobr></th>
               <th><nobr>付款方式</nobr></th>

package/src/filiale/yuncheng/FilesManage/MeterinfoTest.vue

@@ -397,6 +397,12 @@
                       :options='overdueset' placeholder='违约金规则'
                       close-on-select></v-select>
           </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="三项强制措施">三项强制措施</label>
+            <v-select :value.sync="row.f_force_measure" :options='forceMeasure'
+                      placeholder='三项强制措施' close-on-select :multiple="true"
+                      v-model='row.f_force_measure'></v-select>
+          </div>
 
           <template v-if="config.stuckFlowmeterShow">
             <div class="col-sm-4 form-group">
@@ -602,6 +608,7 @@ export default {
       usetype: this.$appdata.getParam('使用类型'),
       usestate: this.$appdata.getParam('使用状态'),
       aroundmeters: this.$appdata.getParam('左右表'),
+      forceMeasure: this.$appdata.getParam('三项强制措施'),
       garbagefee: this.$appdata.getParam('垃圾费'),
       valvestate: this.$appdata.getParam('阀门状态'),
       usertypes: this.$appdata.getParam('用户类型'),
@@ -640,6 +647,9 @@ export default {
     if (this.row.pricetype === '混合气价') {
       this.ratioshow = true
     }
+    if (this.row.f_force_measure[0]) {
+      this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+    }
     if (this.row.f_meternumber) {
       this.meterNumberDisabled = true
     }

package/src/filiale/yuncheng/FilesManageNew/MeterinfoTest.vue

@@ -253,14 +253,20 @@
                       :options='usestate' placeholder='使用状态'
                       close-on-select></v-select>
           </div>
-          <div style="" class="col-sm-6 form-group">
+          <div style="" class="col-sm-8 form-group">
             <label for="f_userfiles_address" class="font_normal_body ">安装地址&nbsp;</label>
             <input class="input_search" style="width:80%" v-model="row.f_userfiles_address"/>
           </div>
-          <div style="" class="col-sm-6 form-group">
+          <div style="" class="col-sm-8 form-group">
             <label for="f_alarm_code" class="font_normal_body ">报警器编码&nbsp;</label>
             <input class="input_search" style="width:80%" v-model="row.f_alarm_code"/>
           </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="三项强制措施">三项强制措施</label>
+            <v-select :value.sync="row.f_force_measure" :options='forceMeasure'
+                      placeholder='三项强制措施' close-on-select :multiple="true"
+                      v-model='row.f_force_measure'></v-select>
+          </div>
         </div>
       </form>
     </validator>
@@ -354,6 +360,7 @@ let meterBookGen = function * (self) {
         selectUserFiles: '', // 选中的 userfiles
         jurisdiction: this.$login.r,
         positions: this.$appdata.getParam('安装位置'),
+        forceMeasure: this.$appdata.getParam('三项强制措施'),
         usetype: this.$appdata.getParam('使用类型'),
         usestate: this.$appdata.getParam('使用状态'),
         aroundmeters: this.$appdata.getParam('左右表'),
@@ -380,6 +387,9 @@ let meterBookGen = function * (self) {
       if (this.row.pricetype === '混合气价') {
         this.ratioshow = true
       }
+      if (this.row.f_force_measure[0]) {
+        this.row.f_force_measure = this.row.f_force_measure[0].split(',')
+      }
       co(meterBookGen(this))
     },
     methods: {

package/src/filiale/zhongsheng/charge/OtherChargeNew.vue

@@ -51,7 +51,7 @@
                        v-model="row.f_unitprice"
                        :value.sync="row.f_unitprice"
                        v-validate:f_unitprice='{required: true}'
-                       :disabled="row.brandspec[0]==='开卡费'"
+                       :disabled="row.f_brand_spec[0]==='开卡费'"
                        placeholder="单价" v-next-el='sl'>
               </div>
               <div class="col-sm-4" :class="{'has-success':row.f_number,'has-error':!row.f_number}">

package/src/plugins/FileManageService.js

@@ -148,6 +148,21 @@ let FileManageService = {
       meter.f_remanent_gas = isNaN(meter.f_remanent_gas) || meter.f_remanent_gas === '' ? 0.00 : (meter.f_remanent_gas - 0).toFixed(4)
       meter.f_price_ratio = meter.f_price_ratio ? meter.f_price_ratio : null
       meter.f_fire_state = meter.f_fire_state1 ? '1' : '0'
+      let forcemeasure = meter.f_force_measure
+      meter.f_force_measure = ''
+      if (forcemeasure.length > 0) {
+        for (var c = 0; c < forcemeasure.length; c++) {
+          if (forcemeasure[c]) {
+            if (c !== forcemeasure.length - 1) {
+              meter.f_force_measure = meter.f_force_measure + forcemeasure[c] + ','
+            } else {
+              meter.f_force_measure = meter.f_force_measure + forcemeasure[c]
+            }
+          }
+        }
+      } else {
+        meter.f_force_measure = null
+      }
       if (meter.gasmodel[0] == null) {
         meter.f_gasmodel_id = ''
       } else {