sale-client 3.5.181 → 3.5.183

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Mar 06 19:09:37 CST 2023
+gradle.version=7.5.1

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -93,7 +93,7 @@
         </div>
         <div class="row">
           <div class="col-sm-2"></div>
-          <input v-if="fileSaveData.reason ==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
+          <input v-if="fileSaveData.reason==='其他'" class="input_search" style="width:60%" placeholder='修改原因' v-model="fileSaveData.modifyReason"/>
         </div>
       </article>
       <footer slot="modal-footer" class="modal-footer">

package/src/components/chargeNew/HighMeterIdCard.vue

@@ -370,19 +370,19 @@ export default {
         })
       },
       // 设置自动裁边开启
-      SetAutoCutOn () {
-        console.log('设置自动采编')
-        if (this.iswaiting) return
-        this.iswaiting = true
-        this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open: 1}, (msg) => {
-          if (msg.err !== 0) {
-            this.iswaiting = false
-            return
-          }
-          this.output('设置自动裁边 : open=' + 1)
-          this.iswaiting = false
-        })
-      },
+     // SetAutoCutOn () {
+     //   console.log('设置自动采编')
+     //   if (this.iswaiting) return
+     //   this.iswaiting = true
+     //   this.sendMsg(this.CLT_MSG.SET_AUTOCROP, {open: 1}, (msg) => {
+     //     if (msg.err !== 0) {
+     //       this.iswaiting = false
+     //       return
+     //     }
+     //     this.output('设置自动裁边 : open=' + 1)
+     //     this.iswaiting = false
+     //   })
+     // },
       // 设置自动裁边关闭
       SetAutoCutOff () {
         if (this.iswaiting) return

package/src/components/revenue/comprehen/Bill/Eticket/EticketManage.vue

@@ -9,8 +9,8 @@
     <tabs header="卡表结算">
       <e-ticket-open-card></e-ticket-open-card>
     </tabs>
-    <tabs header="机表结算">
-      <e-ticket-open-jb></e-ticket-open-jb>
+    <tabs header="抄表结算">
+      <e-ticket-open-hand></e-ticket-open-hand>
     </tabs>
     <tabs header="自定义开票">
       <cust-query-eticket></cust-query-eticket>

package/src/components/revenue/machineHandManage/machineHandAudit.vue

@@ -394,7 +394,7 @@
   import * as Util from '../../../Util'
 
   let readyGen = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStartAndEndDateString()[0]
+    self.$refs.paged.$refs.cri.model.startDate =  self.$login.toStartAndEndDateString()[0]
     self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
     await self.$LoadParams.loadMeterBook(self.f_filialeid)
     self.loadMeterBooks()
@@ -414,13 +414,12 @@
           dep: [],
           user: []
         },
-        config: {
-          examine: false
+        config:{
+          examine: false,
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
-        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -445,8 +444,8 @@
           'f_adjustable_name': '调压箱名称',
           'f_inputtor': '抄表员'
         },
-        auditState: [{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
-        auditState1: [{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
+        auditState:[{label: '全部', value: ''}, {label: '已审核', value: '已抄表'}, {label: '未审核', value: '待审核'}],
+        auditState1:[{label: '全部', value: ''}, {label: '审核失败', value: '审核失败'}],
         meters: [{label: '全部', value: ''}, {label: '机表', value: '机表'}, {label: '物联网表', value: '物联网表'}],
         resultstate: this.$appdata.getParam('抄表结果状态'),
         meterstates: this.$appdata.getParam('抄表状态') ? [{
@@ -476,7 +475,7 @@
     methods: {
       // 修正本期底数
       amend (row) {
-        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：' + row.f_meter_base)
+        let tablebase = window.prompt('请输入你要修正的底数值，上期底数：'+ row.f_meter_base)
         if (!tablebase) return
         if (tablebase < 0) {
           this.$showAlert(`底数不能小于0，请注意!`, 'warning', 2000)
@@ -597,9 +596,9 @@
         this.imgshow = false
       },
       imgShow (val) {
-        console.log('-----------val2:', val)
+        console.log("-----------val2:",val)
         this.imgfilename = `rs/image/file/` + val
-        console.log('-----------imgfilename2:', this.imgfilename)
+        console.log("-----------imgfilename2:",this.imgfilename)
         this.imgshow = true
       },
       async getaddress () {
@@ -633,17 +632,6 @@
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }
-        // 抄表员查询条件
-        this.inputtouPerson = this.$refs.paged.$refs.cri.model.f_inputtor
-        if (this.inputtouPerson.length !== 0) {
-          let str = JSON.stringify(this.inputtouPerson)
-          str = str.replace(/"/g, `'`)
-          str = str.replace(/\[/g, ``)
-          str = str.replace(/\]/g, ``)
-          console.log('=====抄表员model22222222222绑定====', str)
-          // 查询多个抄表员时条件
-          args.condition += ` and f_inputtor in  ( ${str} )`
-        }
         this.excelCondition = args.condition
         this.$refs.paged.$refs.grid.selectInit()
         this.model.search(args.condition, args.model)
@@ -708,7 +696,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      }
+      },
 
     },
     computed: {

package/src/filiale/fugu/components/BlackListList.vue

@@ -19,22 +19,7 @@
                       type="text" v-model="model.name"
               />
             </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.downshow && !$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">电&emsp;&emsp;话</label>
-              <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
-                     type="text"
-                     v-model="model.f_user_phone">
-            </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!$parent.$parent.downshow && !$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">是否黑名单</label>
-              <v-select v-model="$parent.$parent.isBlack"
-                        :options="$parent.$parent.isBlackSelect"
-                        @change="$parent.$parent.isBlackChange"
-                        :value.sync="$parent.$parent.isBlack"
-                        close-on-select></v-select>
-            </div>
+
             <div class="form-group col-sm-3 button-range" style="padding-right: 10px">
               <button @click="$parent.$parent.search()" class="button_search button_spacing" style="width:80px;margin-left:30px;" v-el:cx>查询</button>
               <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
@@ -46,9 +31,6 @@
                 sqlurl="rs/logic/saleExport" progress="saleGetExportProgress" sql-name="sale_getBlackList" template-name='黑名单导出'
                 :choose-col="true">
               </export-excel>
-              <button @click="$parent.$parent.add()" class="button_export button_spacing" style="width: max-content;"
-                      v-el:cx>新增黑名单
-              </button>
               <button class="button_search button_spacing"
                       @click="$parent.$parent.modelShow()" v-el:cx>
                 黑名单用户导入
@@ -66,16 +48,6 @@
                       type="text" v-model="model.name"
               />
             </div>
-
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="$parent.$parent.$parent.isdetail">
-              <label class="font_normal_body">是否黑名单</label>
-              <v-select v-model="$parent.$parent.isBlack"
-                        :options="$parent.$parent.isBlackSelect"
-                        @change="$parent.$parent.isBlackChange"
-                        :value.sync="$parent.$parent.isBlack"
-                        close-on-select></v-select>
-            </div>
             <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
                  v-if="!$parent.$parent.downshow&&!$parent.$parent.$parent.isdetail">
               <label class="font_normal_body">表&emsp;&emsp;号</label>
@@ -99,8 +71,7 @@
                       type="text"
                       v-model="model.f_address">
             </div>
-            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}"
-                 v-if="!(!$parent.$parent.downshow && !$parent.$parent.$parent.isdetail)">
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
               <label class="font_normal_body">电&emsp;&emsp;话</label>
               <input :size="model.f_user_phone ? model.f_user_phone.length : 2" class="input_search" condition="f_user_phone = '{}'" placeholder='电话' style="width:60%"
                      type="text"
@@ -134,6 +105,14 @@
                           condition="f_parameter_value >= '{} 00:00:00'"
               ></datepicker>
             </div>
+            <div class="form-group" :class="{'col-sm-2':!$parent.$parent.$parent.isdetail, 'col-sm-3':$parent.$parent.$parent.isdetail}">
+              <label class="font_normal_body">是否黑名单</label>
+              <v-select v-model="$parent.$parent.isBlack"
+                        :options="$parent.$parent.isBlackSelect"
+                        @change="$parent.$parent.isBlackChange"
+                        :value.sync="$parent.$parent.isBlack"
+                        close-on-select></v-select>
+            </div>
           </div>
 
         </div>

package/src/filiale/gehua/FileManageNew/FileUserFiles.vue

@@ -723,7 +723,7 @@ let loadParamGem = async function (self) {
             }
             let self = this
             try {
-              axios.post('rs/business/batchRunExcelDefault/filemanage_fileSave_gehua/newPrepareSettleFileImport',
+              axios.post('rs/business/batchRunExcelProgress/filemanage_fileSave_gehua/newPrepareSettleFileImport',
                     {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                       if (res.data) {
                         self.$showMessage(`本次批量建档共上传${res.data.totalCount}条数据,符合条件的共${res.data.totalsum}条,不符合条件的共${res.data.totalCount -res.data.totalsum}条, 建档成功${res.data.successsum}条,建档失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)