sale-client 4.0.34-preview → 4.0.36-preview

package/build/dev-server.js

@@ -108,10 +108,10 @@ var devConfig = {
         target: 'http://localhost:8085'
       },
       '/rs/logic': {
-        target: serverRul
+        target: localUrl
       },
       '/rs/sql': {
-        target: serverRul
+        target: localUrl
       },
       '/webmeter': {
         target: serverRul

package/package.json

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

package/src/components/FilesManage/MeterinfoTest.vue

@@ -264,14 +264,10 @@
                v-show="(formconfig && formconfig.f_use_limit && formconfig.f_use_limit.required) || !onlyshowmust"
                v-if="getConfigShowItem('f_use_limit')">
             <label class="font_normal_body">表具使用年限</label>
-<!--            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"-->
-<!--                   v-validate:f_use_limit=getConfigValidate("f_use_limit",false)-->
-<!--                   :value.sync="row.f_use_limit"-->
-<!--                   placeholder='表具使用年限' >-->
-            <v-select :value.sync="row.f_use_limit?row.f_use_limit:'10'" :options='uselimit'
-                      :placeholder="getConfigPlaceholder('f_use_limit','使用年限')"
-                      close-on-select
-                      v-model='row.f_use_limit'></v-select>
+            <input type="number" class="input_search" style="width:60%" v-model="row.f_use_limit"
+                   v-validate:f_use_limit=getConfigValidate("f_use_limit",false)
+                   :value.sync="row.f_use_limit"
+                   placeholder='表具使用年限' >
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_gas_person.required ? 'has-error' : '']"
                v-show="(formconfig && formconfig.f_gas_person && formconfig.f_gas_person.required) || !onlyshowmust"
@@ -655,7 +651,12 @@
     try {
       let result = yield http.load('GET', `rs/vue/MeterinfoTest.json`, {}, {resolveMsg: null, rejectMsg: null})
       Object.assign(self.config, result.data)
-      if (!self.row.f_open_way) self.row.f_open_way = self.config.open_way
+      if (!self.row.f_open_way) {
+        self.row.f_open_way = self.config.open_way
+      }
+      if (!self.row.f_usetype || self.row.f_usetype.length === 0) {
+        self.row.f_usetype = self.config.f_usetype
+      }
     } catch (error) {
       // 忽略704,文件找不到异常
       if (error.status !== 704) {
@@ -704,7 +705,8 @@
           stuckFlowmeterShow: false,
           overduesetShow: true,
           f_install_date: true,
-          open_way: '发卡开户'
+          f_usetype: '',
+          open_way: '指令开户'
         },
         mapShow: false,
         viewsee: false,
@@ -724,7 +726,6 @@
         usetype: this.$appdata.getParam('使用类型'),
         usestate: this.$appdata.getParam('使用状态'),
         aroundmeters: this.$appdata.getParam('左右表'),
-        uselimit: this.$appdata.getParam('表具使用年限'),
         forceMeasure: this.$appdata.getParam('三项强制措施'),
         garbagefee: this.$appdata.getParam('垃圾费'),
         valvestate: this.$appdata.getParam('阀门状态'),
@@ -1003,7 +1004,6 @@
             resolveMsg: null,
             rejectMsg: '表号验证失败！！'
           })
-          console.log("res=====",res)
           if (this.row.gasbrand[0].f_meter_type === '物联网表') {
             if (res.data) {
               this.row.f_meternumber = ''

package/src/components/charge/business/CardChangeFill.vue

@@ -40,9 +40,11 @@
                      v-next-el='sk' :disabled="row.f_collection_type !== '按气量'">
             </div>
 
-            <div class="col-sm-4 form-group">
+            <div class="col-sm-4 form-group"
+                 :class="[$v.f_preamount.required || $v.f_preamount.dctest? 'has-error' : 'has-success']">
               <label for="f_preamount" class=" font_normal_body">预购金额</label>
               <input class="input_search" style="width:60%" type="number" v-model="model.f_preamount"
+                     v-validate:f_preamount='{dctest: [maxmoney, "<=" ]}'
                      v-scale="[model.f_preamount, 4]" placeholder="预购金额" disabled>
             </div>
           </div>
@@ -77,10 +79,15 @@
                      v-validate:f_totalcost='{required: true, dctest: [(openFee - 0), ">=" ] }' placeholder="应收金额"
                      v-next-el='sk' v-scale="[model.f_totalcost, 4]" :disabled="row.f_collection_type !== '按金额'">
             </div>
-            <div class="col-sm-4 form-group" v-if="hasLimit">
+            <div class="col-sm-4 form-group" v-if="hasLimit&&limitgas">
               <label class="font_normal_body">购气上限</label>
               <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxgas"
-                     v-scale="[maxgas, 4]" placeholder='限购余气' disabled>
+                     v-scale="[maxgas, 2]" placeholder='限购余气' disabled>
+            </div>
+            <div class="col-sm-4 form-group" v-if="hasLimit&&limitmoney">
+              <label class="font_normal_body">金额上限</label>
+              <input class="input_search" style="width:60%" style="width:60%" type="number" v-model="maxmoney"
+                     v-scale="[maxmoney, 2]" placeholder='限购金额' disabled>
             </div>
             <!--<div class="col-sm-4 form-group" v-if="!hasLimit">-->
             <!--</div>-->
@@ -330,11 +337,20 @@
     console.log('获取限购值', getLimit)
     self.hasLimit = getLimit.data.hasLimit
     if (self.hasLimit) {
-      if (getLimit.data.f_limit_value < 0) {
-        self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
-        self.$dispatch('refresh')
-      } else {
-        self.maxgas = getLimit.data.f_limit_value
+      if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
+        if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
+          self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
+          self.$dispatch('refresh')
+        } else {
+          if (getLimit.data.f_limit_value) {
+            self.maxgas = (getLimit.data.f_limit_value - 0)
+            self.limitgas = true
+          }
+          if (getLimit.data.f_limit_amount) {
+            self.maxmoney = (getLimit.data.f_limit_amount - 0)
+            self.limitmoney = true
+          }
+        }
       }
     }
   }
@@ -392,6 +408,9 @@
         validateOk: false,
 
         maxgas: 99999999,
+        maxmoney: 99999999,
+        limitmoney: false,
+        limitgas: false,
 
         clickConfirm: false,
 
@@ -416,7 +435,7 @@
       let getResult = this.$CommonService.calRemanentMoney(this.row)
       if (this.row.f_collection_type === '按气量') {
         if (getResult > 0) {
-          this.model.f_pregas = this.model.f_fill_gas = getResult
+          this.model.f_pregas = this.model.f_fill_gas = getResult - 0
           this.model.f_preamount = 0
         } else {
           this.model.f_pregas = ''

package/src/components/charge/business/IOTMeterCenter.vue

@@ -428,7 +428,7 @@
     self.hasLimit = getLimit.data.hasLimit
     if (self.hasLimit) {
       if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
-        if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
+        if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
           self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
           self.$dispatch('refresh')
         } else {

package/src/components/charge/business/NoCardMeterCenter.vue

@@ -297,7 +297,7 @@
     self.hasLimit = getLimit.data.hasLimit
     if (self.hasLimit) {
       if (getLimit.data.f_limit_value || getLimit.data.f_limit_amount) {
-        if (getLimit.data.f_limit_value < 0 && getLimit.data.f_limit_amount < 0) {
+        if (getLimit.data.f_limit_value < 0 || getLimit.data.f_limit_amount < 0) {
           self.$showAlert(`${getLimit.data.msg}`, 'warning', 3000)
           self.$dispatch('refresh')
         } else {

package/src/components/common/searchuploadfile/uploadFilesHistory.vue

@@ -154,10 +154,11 @@ export default {
                   let temp = res.data.array[j].f_downloadpath
                   let URL = temp.substring(temp.lastIndexOf(':\\') + 2)
                   if (res.data.array[j].fusetype == '安检照片') {
-                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
+                    res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/rs/image/file/' + res.data.array[j].f_filename
                   } else {
-                    res.data.array[j].f_downloadURL = 'http://' + location.host + '/' + URL
+                    res.data.array[j].f_downloadURL = location.protocol + '//' + location.host + '/' + URL
                   }
+                  console.log('res.data.array[j].f_downloadURL', res.data.array[j].f_downloadURL)
                   this.files[i].arrays.push(res.data.array[j])
                 }
               }

package/src/components/common/userinfo_detail/UserBaseInfoNew.vue

@@ -498,14 +498,12 @@ export default {
       if (this.row.parentname === 'charge-manage') {
         this.$emit('cancel-re')
       } else {
-        try {
+        if (window.parent !== window) {
+          window.parent.postMessage({type: 'route', path:'/chargeMange/charge-manage'}, '*')
+        } else {
           this.$goto('charge-manage', {f: this.$login.f}, 'main')
-        } catch (e) {
-        }
-        try {
-          window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
-        } catch (e) {
         }
+        // window.parent.dispatchEvent(new CustomEvent('gotoChargeManage', {detail: 'Hello from iframe'}))
       }
     },
     openUser () {

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -95,12 +95,12 @@
         <saletab header="用户重点记录" >
           <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
         </saletab>
-        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">
-          <supervisory-control :row="row"  ></supervisory-control>
-        </saletab>
-        <saletab header="报装收费记录"   v-if="permission('报装收费记录查看')">
-          <apply-charge-search :row="row"  ></apply-charge-search>
-        </saletab>
+<!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
+<!--          <supervisory-control :row="row"  ></supervisory-control>-->
+<!--        </saletab>-->
+<!--        <saletab header="报装收费记录"   v-if="permission('报装收费记录查看')">-->
+<!--          <apply-charge-search :row="row"  ></apply-charge-search>-->
+<!--        </saletab>-->
       </saletabbut>
     </div>
   </div>
@@ -127,8 +127,8 @@
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
   import contractSigningList from './ic_detail/contractSigningList'
   import UserKeyRecord from './ic_detail/UserKeyRecord'
-  import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
-  import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
+  // import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
+  // import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
   import QueryHistoryInstruct from './iot_detail/QueryHistoryInstruct'
@@ -170,9 +170,9 @@ export default {
       MachineRecordQuery,
       UserDeviceQuery,
       contractSigningList,
-      UserKeyRecord,
-      SupervisoryControl,
-      ApplyChargeSearch
+      UserKeyRecord
+      // SupervisoryControl,
+      // ApplyChargeSearch
     },
     data () {
       return {
@@ -204,6 +204,9 @@ export default {
           condition = `f_userinfo_id = '${this.f_userinfo_id}'`
         } else if (this.f_userinfo_code) {
           condition = `f_userinfo_code = '${this.f_userinfo_code}'`
+        }else{
+          this.$showMessage('用户信息缺失，查询详情信息失败')
+          return
         }
 
         let getBaseInfo = await http.load('POST', 'api/af-revenue/sql/iot_getUserBaseData',
@@ -213,7 +216,12 @@ export default {
       },
 
       cancel (val) {
-        this.$emit('cancel-main', val)
+        // 判断当前是否在 iframe 环境中
+        if (window.parent !== window) {
+          window.parent.postMessage({type: 'goBack'}, '*')
+        } else {
+          this.$emit('cancel-main', val)
+        }
       },
 
       cancelRe (val) {

package/src/components/common/userinfo_detail/apply_detail/Supervisory/Service/ResAreaSelectGroup.vue

@@ -81,7 +81,7 @@ export default {
     //获取区域地址
     async getResList() {
       let http = new HttpResetClass()
-      let req = await http.load('POST', '/rs/logic/resAreaSelect', {
+      let req = await http.load('POST', '/api/af-revenue/logic/resAreaSelect', {
         userid: this.$login.f.id,
         orgid: this.$login.f.orgid
       }, {resolveMsg: null, rejectMsg: '获取区域地址失败'})

package/src/components/common/userinfo_detail/iot_detail/QueryInstruct.vue

@@ -227,7 +227,7 @@ export default {
       cancelreason: '',
       cancelid: '',
       f_userfiles_id: '',
-      model: new PagedList('api/af-revenue/sql/insturctDetailQuery', 30),
+      model: new PagedList('api/af-revenue/sql/insturctDetailQuery', 30, {f_userfiles_id: this.row.f_userfiles_id}),
       row: null,
       searchshow: false,
       show: false,

package/src/components/revenue/HandManager/MeterBookUser.vue

@@ -18,7 +18,7 @@
               <export-excel
                 :data="{condition: $parent.$parent.condition,orderitem: $parent.$parent.orderitem}"
                 :field="$parent.$parent.getfield"
-                sqlurl="api/af-revenue/logic/saleExport" sql-name="getMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
+                sqlurl="rs/logic/saleExport" sql-name="getMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
                 :choose-col="true"></export-excel>
               <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
               <div
@@ -209,6 +209,7 @@
             <td style="text-align:center" v-if="$parent.$parent.$parent.removebook">
               <nobr>
                 <span title="移出表册" class="glyphicon glyphicon-paste"  style="font-size: 20px" @click="$parent.$parent.$parent.delete($index, row)" v-el:cba></span>
+<!--                <button class="btn btn-deltete width-10" @click="$parent.$parent.$parent.delete($index, row)"><a style="color: #e51a1abf"><b>移出表册</b></a></button>-->
               </nobr>
             </td>
             <td style="text-align:center"><nobr><span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span></nobr></td>
@@ -275,7 +276,7 @@
   <modal :show.sync="show" width="800px" title="文件导入" v-ref:modal large backdrop="false">
     <article slot="modal-body" class="modal-body">
       <file-upload class="my-file-uploader " name="UploadFile"  style="border-radius: 2px;"
-                   action="api/af-revenue/file/uploadFile" tagname="导入表册用户" v-ref:file  multiple></file-upload>
+                   action="rs/file/uploadFile" tagname="导入表册用户" v-ref:file  multiple></file-upload>
     </article>
     <footer slot="modal-footer" class="modal-footer">
     </footer>
@@ -495,11 +496,6 @@
           }
         }
       },
-      // dblclick(obj){
-      //   console.log("-------------------------row",obj)
-      //   this.row=obj
-      //   this.sortShow=true
-      // },
       async saveEditSort () {
         for (let item of this.$refs.paged.$refs.grid.model.rows) {
           let param = {
@@ -524,11 +520,9 @@
           let temp = rows[index + 1]
           rows[index + 1] = rows[index]
           rows[index] = temp
-
           let tempsort = rows[index + 1].f_meter_book_sort
           rows[index + 1].f_meter_book_sort = rows[index].f_meter_book_sort
           rows[index].f_meter_book_sort = tempsort
-
           this.$refs.paged.$refs.grid.model.rows = rows
         }
       },
@@ -538,13 +532,11 @@
           this.$showAlert('已经是本页第一个了', 'warning', 2000)
         } else {
           let rows = this.$refs.paged.$refs.grid.model.rows
-
           this.$refs.paged.$refs.grid.model.rows = []
           let temp = rows[index - 1]
           rows[index - 1] = rows[index]
           rows[index] = temp
           console.log('--------------this.$refs.paged.$refs.grid.model.rows,', rows)
-
           let tempsort = rows[index - 1].f_meter_book_sort
           rows[index - 1].f_meter_book_sort = rows[index].f_meter_book_sort
           rows[index].f_meter_book_sort = tempsort
@@ -574,7 +566,6 @@
           bookname: ''
         }
       },
-
       userTypeChange () {
         this.gasproperties = []
         if (this.$refs.paged.$refs.criteria.model !== null) {
@@ -584,7 +575,6 @@
           this.gasproperties = [{label: '全部', value: ''}]
         }
       },
-
       async initParams () {
         console.log('=================>加载', this.$GetSaleParam.getGasbrand())
         let arr = []
@@ -659,9 +649,6 @@
     },
     events: {
       onFileUpload: function (file, res) {
-        // let URL = res.f_downloadpath.substring(res.f_downloadpath.lastIndexOf(":\\") + 2)
-        // res.f_downloadpath = "http://" + location.host + "/" + URL
-        // res.f_downloadpath.replace('\\','/')
         this.$resetpost('api/af-revenue/logic/upLoadBookFile',
           {data: {
             condition: this.condition,

package/src/components/revenue/base/rightview/CardList.vue

@@ -494,11 +494,11 @@
           name = 'api/af-revenue/report/garbageChargeReport'
         } else if (type === '物联网赠费') {
           name = 'api/af-revenue/report/iotGiftFee'
-        }else if (type === '物联网赠气') {
+        } else if (type === '物联网赠气') {
           name = 'api/af-revenue/report/iotGiftGas'
-        }else if (type === '卡表赠费') {
+        } else if (type === '卡表赠费') {
           name = 'api/af-revenue/report/icGiftFee'
-        }else if (type === '卡表赠费') {
+        } else if (type === '卡表赠气') {
           name = 'api/af-revenue/report/icGiftGas'
         }
         return name

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -91,7 +91,7 @@
             <div class="form-group col-sm-2">
               <label class="font_normal_body">收款人&nbsp;&nbsp;</label>
               <input type="text" class="form-control" v-model="model.sell_operator" style="width:60%"
-                     condition="sell_operator = '{}'" placeholder="收款人"
+                     condition="(s.sell_operator = '{}' or other.sell_operator  = '{}') " placeholder="收款人"
               >
             </div>
             <div  class="col-sm-2 form-group">
@@ -99,7 +99,7 @@
               <v-select :value.sync="model.f_user_type"
                         :options='$parent.$parent.usertypes'
                         placeholder='请选择' v-model="model.f_user_type"
-                        condition="f_user_type = '{}'"
+                        condition="(s.f_user_type = '{}' or uf.f_user_type = '{}') "
                         close-on-select></v-select>
             </div>
           </div>

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -56,6 +56,7 @@
           <button class="button_clear" @click="clean()" >取消</button>
         </div>
       </validator>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
     </div>
   </div>
   <upload :blodid="row.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="赠气"></upload>
@@ -123,6 +124,10 @@
       await self.$resetpost('api/af-revenue/logic/otherGasRollback', {data: rollback}, {rejectMsg: '赠气回滚出错', resolveMsg: null})
     }
   }
+  let asyncIcTable = async function (self) {
+    await self.$getConfig(self, 'icTable')
+    console.log('卡表赠气赠费config', self.config)
+  }
 
   export default {
     title: '卡表赠气赠费',
@@ -144,6 +149,14 @@
           f_reason: '',
           f_add_gas: '不计入'
         },
+        config: {
+          hasPrint: false
+        },
+        billData: {
+          url: 'rs/report/icGiftGas',
+          operator: this.$login.f.name,
+          billnumber: ''
+        },
         print: false
       }
     },
@@ -153,6 +166,12 @@
       this.row.cardInfo = this.cardData
       console.log('卡信息', this.row.cardInfo)
       this.getRandomId()
+      asyncIcTable(this)
+      if (this.isGas) {
+        this.billData.url = 'rs/report/icGiftGas'
+      } else {
+        this.billData.url = 'rs/report/icGiftFee'
+      }
     },
     events: {
       // 删除Resid数组元素
@@ -185,7 +204,14 @@
           }
           this.$resetpost('api/af-revenue/logic/updatefiles', data)
 
-          this.$dispatch('success')
+          if (this.config.hasPrint) {
+            this.row.id = res
+            this.row.f_bill_type = this.isGas ? '卡表赠气' : '卡表赠费'
+            this.row.f_bill_style = '普通收据'
+            this.print = true
+          } else {
+            this.$dispatch('success')
+          }
         })
       },
       pregas () {
@@ -251,6 +277,9 @@
       clean () {
         this.$info('取消操作')
         this.$dispatch('cancelclean', this.row)
+      },
+      printok () {
+        this.$dispatch('success')
       }
     },
     computed: {

package/src/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -59,7 +59,7 @@
     </validator>
     <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
     <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
-    <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+    <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
   </div>
   <upload :blodid="row.f_userinfo_id"  v-ref:upload  :businessid="randomBusinessId"  :isremark="true" fusetype="赠气"></upload>
 </template>
@@ -90,7 +90,16 @@ export default {
           f_preamount: 0,
           f_add_gas: '计入',
           f_comments: ''
-        }
+        },
+        config: {
+          hasPrint: false
+        },
+        billData: {
+          url: 'rs/report/iotGiftGas',
+          operator: this.$login.f.name,
+          billnumber: ''
+        },
+        print: false
 
       }
     },
@@ -101,8 +110,10 @@ export default {
       this.getRandomId()
       if (this.row.f_collection_type === '按气量') {
         this.model.f_operat_type = ['物联网赠气']
+        this.billData.url = 'rs/report/iotGiftGas'
       } else {
         this.model.f_operat_type = ['物联网赠费']
+        this.billData.url = 'rs/report/iotGiftFee'
       }
     },
     events: {
@@ -168,19 +179,22 @@ export default {
             f_blobid: res.data.id
           }
           this.$resetpost('api/af-revenue/logic/updatefiles', data)
-          this.clean()
+          if (this.config.hasPrint) {
+            this.row.id = res.data.id
+            this.row.f_bill_type = this.row.f_collection_type === '按气量' ? '物联网赠气' : '物联网赠费'
+            this.row.f_bill_style = '普通收据'
+            this.print = true
+          } else {
+            this.clean()
+          }
         })
       },
-      clean () {
-        this.$dispatch('refresh')
-      },
       printok () {
         this.$dispatch('success')
       },
-      close () {
-        this.print = false
-        this.clean()
-      },
+      clean () {
+        this.$dispatch('refresh')
+      }
     }
   }
 </script>

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterListMaintain.vue

@@ -394,7 +394,7 @@ const myMap = new Map()
         }
         console.log('查询。。。', this.f_orgid)
         if (!this.orgCondtionStr) {
-          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+          args.condition = `${args.condition}` + ' and f_orgid = ' + `'${this.$login.f.orgid}'`
         } else {
           args.condition = `${args.condition}` + this.orgCondtionStr
         }

package/src/components/revenue/comprehen/Maintenance/otherRecords/specificInformation.vue

@@ -32,9 +32,9 @@
 <!--            <label class="font_normal_body">收据类型</label>-->
 <!--            <input type="text" v-model="model.bill_style"  style="width: 60%" class="input_search">-->
 <!--          </div>-->
-          <div class="col-sm-4">
+          <div class="col-sm-4" title="参数:操作时间, 权限:【其他收费金额修改】">
             <label class="font_normal_body">缴费金额</label>
-            <input type="text" v-model="model.f_collection"  disabled=disabled  style="width: 60%" class="input_search">
+            <input type="text" v-model="model.f_collection"  :disabled="!editcollection"  style="width: 60%" class="input_search">
           </div>
             <div class="col-sm-4">
               <label class="font_normal_body">收费时间</label>
@@ -114,15 +114,15 @@
             </div>
           </div>
           <div class="row auto">
-            <div class="form-group form-input-group">
+            <div class="form-group form-input-group" title="参数:操作时间, 权限:【其他收费金额修改】">
               <label for="" class="control-label">数量：</label>
-              <input type="text" width="300px"  class="form-control" v-model="mingxi.number" >
+              <input type="text" width="300px"  class="form-control" v-model="mingxi.number"   :disabled="!editcollection">
             </div>
           </div>
           <div class="row auto">
-            <div class="form-group form-input-group">
+            <div class="form-group form-input-group" title="参数:操作时间, 权限:【其他收费金额修改】">
               <label for="" class="control-label">单价：</label>
-              <input type="text" width="300px"  class="form-control" v-model="mingxi.unitprice" >
+              <input type="text" width="300px"  class="form-control" v-model="mingxi.unitprice"  :disabled="!editcollection" >
             </div>
           </div>
           <div class="row auto">
@@ -166,6 +166,7 @@
         bill_styles: this.$appdata.getParam('打印格式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('打印格式')] : [],
         payments: this.$appdata.getParam('付款方式') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')] : [],
         editshow: false,
+        editcollection: false,
         mingxi: '',
         oldmingxi: '',
         brand_spec: '',
@@ -206,6 +207,9 @@
       recordlist: Array
     },
     ready () {
+      if (this.$login.r.includes('其他收费金额修改')) {
+        this.editcollection = true
+      }
       this.cou()
       this.oldmodel = JSON.parse(JSON.stringify(this.model))
       console.log(this.model)