sale-client 3.6.416 → 3.6.418

package/package.json

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

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

@@ -261,7 +261,7 @@ export default {
       }, ...this.$appdata.getParam('表具状态')] : [],
       // 控制单选
       radio: [],
-      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userinfo_id',
       // 选中的页
       all: [],
       other: [],

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

@@ -45,7 +45,7 @@
                   <button class="btn btn-default" @click="$parent.$parent.Fileinput()">反盘导入</button>
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getBankfield" :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="newhandplanQuery" template-name='送盘导出' btn-name="送盘导出"
+                                sqlurl="rs/logic/saleExport" sql-name="newhandplanQuery" template-name='送盘导出' btn-name="送盘导出"
                                 :choose-col="true"></export-excel>
                   <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
                                 :field="$parent.$parent.getfield" :header="$parent.$parent.other"

package/src/filiale/liaoyuan/FileManage/UserGeneralInfoTest.vue

@@ -16,7 +16,7 @@
       </div>
 
       <div style="height: auto;width: 100%">
-        <file-user-meter-info :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo"
+        <file-user-meter-info :meterinfo="data.meterinfo" :f_filialeid="f_filialeid" :metervalid.sync="meterInfo" :addressinfo="data.addressinfo"
                          :f_userinfo_id="data.baseinfo.base.f_userinfo_id" v-ref:meter></file-user-meter-info>
       </div>
 
@@ -114,7 +114,11 @@ export default {
             f_bank_name: ''
           }
         },
-        addressinfo: {},
+        addressinfo: {
+          id: '',
+          f_address: '',
+          f_address_state: ''
+        },
         fileSaveData:{},
         meterinfo: [{
           f_user_type: '',
@@ -124,7 +128,8 @@ export default {
         devicesinfo: [],
         address: {
           id: '',
-          f_address: ''
+          f_address: '',
+          f_address_state: ''
         }
       },
       show_userinfodevices: false,
@@ -224,6 +229,9 @@ export default {
       this.data.meterinfo.forEach((item) => {
         item.f_meternumber = Util.removerUnnecessary(item.f_meternumber)
       })
+      if (this.data.meterinfo[0].f_gas_date != null) {
+        this.data.addressinfo.f_address_state = '已通气'
+      }
       this.fileSaveData = this.$FileManageService.fileSaveBefore(this.data)
       this.$FileManageService.fileSave(this.fileSaveData).then((res) => {
         this.$parent.resdata = res.data.result[0].f_userinfo_code
@@ -339,6 +347,7 @@ export default {
         row.f_valve_state = row.f_valve_state ? [row.f_valve_state] : '开阀'
         row.f_usetype = row.f_usetype ? [row.f_usetype] : '居民灶'
         row.f_usestate = row.f_usestate ? [row.f_usestate] : '正常'
+        row.f_userfiles_address = row.f_userfiles_address && row.f_userfiles_address.length > 0 ? [row.f_userfiles_address] : ''
         row.f_inputtor = row.f_inputtor ? [row.f_inputtor] : ''
         row.f_position = row.f_position ? row.f_position : ''