sale-client 3.5.224 → 3.5.225

package/package.json

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

package/src/components/FilesManage/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -205,7 +205,7 @@
         </div>
       </form>
     </validator>
-    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="50%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
+    <modal v-if="showselectaddress" :show.sync="showselectaddress" width="70%" height="80%" title="地址信息" v-ref:modal large backdrop="false">
       <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
         <file-address-manage :is-select="isSelect" :fileinfo="addressinfo"
                              @address-valid="doNothing"   :showselectaddress.sync="showselectaddress" v-ref:fileaddress ></file-address-manage>

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/revenue/base/leftview/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
     <safe-check :data="data"></safe-check>

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,12 +414,13 @@
           dep: [],
           user: []
         },
-        config:{
-          examine: false,
+        config: {
+          examine: false
         },
         imgfilename: '',
         // 小区
         residentialArea: [],
+        inputtouPerson: [],
         imgshow: false,
         criteriaShow: false,
         orgCondtionStr: '',
@@ -444,8 +445,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('抄表状态') ? [{
@@ -475,7 +476,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)
@@ -596,9 +597,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 () {
@@ -632,6 +633,17 @@
         } 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)
@@ -696,7 +708,7 @@
       },
       loadMeterBooks () {
         this.meterbooks = this.$GetSaleParam.getMeterBooks()
-      },
+      }
 
     },
     computed: {

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

@@ -172,12 +172,25 @@
       }
     },
     ready () {
-
+      if (this.data) {
+        if (this.data.f_parameter_key != undefined) {
+          this.isBlackList = true
+          initGen(this, this.data)
+        } else {
+          this.isBlackList = false
+          this.initNormalModel(this.data,this)
+        }
+      } else {
+        this.isBlackList = false
+        this.initModel()
+      }
     },
     watch: {
       'data' (val) {
+        console.log('看看传进来的。。。。' + JSON.stringify(val))
+        this.data = val
         if (val) {
-          if(this.data.f_parameter_value){
+          if (this.data.f_parameter_key != undefined) {
             this.isBlackList = true
             initGen(this, this.data)
           } else {

package/src/filiale/gehua/ChargeGroupList.vue

@@ -0,0 +1,345 @@
+<template>
+  <div id="ChargeGroupList">
+    <div class="flex" @keyup.enter="search" :style="{height:(oweShow?'auto':'100%')}">
+      <criteria-paged :model="model" v-ref:paged :pager="!oweShow">
+        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">组织机构</label>
+                <res-select restype='organization'
+                            @res-select="$parent.$parent.getorg"
+                            :is-mul="false"
+                            :initresid='$parent.$parent.curorgid'>
+                </res-select>
+              </div>
+              <div :class="$parent.$parent.style">
+                <label class="font_normal_body">客戶编码</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_customer"
+                       condition="f_customer like '%{}%'" placeholder="客戶编码"/>
+              </div>
+              <div :class="$parent.$parent.style" v-show="!$parent.$parent.listShow">
+                <label class="font_normal_body">客戶名称</label>
+                <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                       condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
+              </div>
+
+              <div class="col-sm-3 form-group button-range">
+
+                <button class="button_search button_spacing" @click="search()">查询</button>
+                <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add()" v-if="!$parent.$parent.chargeToChoose">建档
+                </button>
+                <print-data :defaultfield="$parent.$parent.defaultfieldtop" :field="$parent.$parent.fields"
+                            :is-selected="true" :model="$parent.$parent.model"
+                            print-name="团缴列表">
+                </print-data>
+                <button class="button_clear button_spacing" @click="clear">清空</button>
+                <div style="float: right" class="button_spacing"
+                     :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
+                     @click="criteriaShow = !criteriaShow"></div>
+              </div>
+              <div class="row" v-show="criteriaShow">
+                <div :class="$parent.$parent.style" v-show="$parent.$parent.listShow">
+                  <label class="font_normal_body">客戶名称</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客戶地址</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder="客戶地址"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">客户电话</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" placeholder="客户电话"/>
+                </div>
+                <div :class="$parent.$parent.style">
+                  <label class="font_normal_body">是否欠费</label>
+                  <v-select v-model="model.oughtfee"
+                            :search="fasle"
+                            placeholder='是否欠费'
+                            :value.sync="model.oughtfee"
+                            :options='$parent.$parent.oughtfee'
+                            condition="f_oughtfee_all {}"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.oweShow" @dblclick="$parent.showOwe">
+          <template partial='head'>
+            <tr>
+              <th>
+                <nobr>序号</nobr>
+              </th>
+              <th>
+                <nobr>客戶编码</nobr>
+              </th>
+              <th>
+                <nobr>客戶名称</nobr>
+              </th>
+              <th>
+                <nobr>账户结余</nobr>
+              </th>
+              <th>
+                <nobr>客戶类型</nobr>
+              </th>
+              <th>
+                <nobr>客戶地址</nobr>
+              </th>
+              <th>
+                <nobr>客戶电话</nobr>
+              </th>
+              <th>
+                <nobr>团缴户数</nobr>
+              </th>
+              <th>
+                <nobr>欠费金额</nobr>
+              </th>
+              <th>
+                <nobr>操作</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{ $index + 1 }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_customer }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_name }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_balance }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_type }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_address }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{ row.f_user_phone }}</nobr>
+              </td>
+              <td style="text-align:center" v-if="!$parent.$parent.$parent.chargeToChoose">
+                <button @click.stop="$parent.$parent.$parent.operate(row)"
+                        class="btn btn-link"><b>{{ row.sumuserfiles }}</b>
+                </button>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.sumuserfiles }}</nobr>
+              </td>
+              <td style="text-align:center" v-else>
+                <nobr>{{ row.f_oughtfee_all }}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.print(row)">打印明细
+                  </button>
+                  <button type="button" name="button" class="btn btn-link"
+                          @click.stop="$parent.$parent.$parent.export(row)">导出明细
+                  </button>
+                </nobr>
+              </td>
+            </tr>
+          </template>
+          <template partial='foot'></template>
+        </data-grid>
+      </criteria-paged>
+
+    </div>
+
+    <export-excel
+      :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
+      sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
+    </export-excel>
+
+    <div v-show="false">
+      <print-data  :sum-field="getfield" :model="printModel" :field="getfield" :printview="true"
+                   :defaultfield="defaultfield" titletable="团体欠费明细报表" v-ref:printdata>
+      </print-data>
+    </div>
+    <owe-record-query v-if="oweShow" :row="row" :f_civill_id="f_civill_id"></owe-record-query>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+
+export default {
+  data () {
+    return {
+      interval: null,
+      searchTime: this.$appdata.getSingleValue('磁条卡读卡间隔') ? this.$appdata.getSingleValue('磁条卡读卡间隔') : 2,
+      oughtfee: [{label: '全部', value: ''}, {label: '是', value: '> 0'}, {label: '否', value: '<= 0'}],
+      model: new PagedList('rs/sql/ncarchivesQuery', 20),
+      // 公司下拉
+      curorgid: [this.$login.f.orgid],
+      f_orgid: '',
+      f_civill_id: null,
+      oweShow: false,
+      getCondition: null,
+      getfield: null,
+      config: {
+        // 导出列
+        excelHeaders: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户姓名',
+          'f_meter_classify': '气表类型',
+          'c': '欠费期数',
+          'f_hand_date': '欠费区间',
+          'f_last_tablebase': '上期底数',
+          'f_tablebase': '本期底数',
+          'f_oughtamount': '用气量',
+          'f_oughtfee': '用气金额',
+          'f_debt_money': '已交金额',
+          'f_oughtfee_new': '应交气费',
+          'overdue': '滞纳金',
+          'f_oughtfee_all': '合计欠费'
+        }
+      },
+      fields: {'f_customer': '客户编码', 'f_user_name': '客户名称',
+        'f_balance': '账户结余', 'f_user_type': '客户类型',
+        'f_address': '客户地址','f_user_phone':'客户电话',
+        'sumuserfiles': '团缴户数', 'f_oughtfee_all': '欠费金额'},
+      defaultfieldtop: [
+        'f_customer', 'f_user_name'
+      ],
+      defaultfield: [],
+      printModel: new PagedList('rs/sql/batchOweQuery', 20),
+      row: null
+    }
+  },
+  title: '档案查询',
+  props: {
+    f_filialeids: {
+      type: String
+    },
+    style: {
+      type: String,
+      default: 'col-sm-3 form-group'
+    },
+    // 控制在修改数据时显示少的查询条件,剩余隐藏
+    listShow: {
+      type: Boolean,
+      default: false
+    },
+    // 收费时的展示控制
+    chargeToChoose: {
+      type: Boolean,
+      default: false
+    }
+  },
+  ready () {
+    this.getfield = this.config.excelHeaders
+    this.search()
+    this.readCiTiaoCard()
+  },
+  destroyed () {
+    clearInterval(this.interval)
+  },
+  watch: {
+    'oweShow' (val) {
+      if (val) {
+        clearInterval(this.interval)
+      } else {
+        this.readCiTiaoCard()
+      }
+    }
+  },
+  methods: {
+    async readCiTiaoCard () {
+      console.log('读磁条卡，开始，不停的循环')
+      let data = {}
+      let getUser = {data: []}
+      let forgid = this.$login.convertToIn([this.$login.f.orgid])
+      try {
+        // let res = {data:{Factory : 'CiTiao',CardID : '00000009'}}
+        let http = new HttpResetClass()
+        this.interval = setInterval(async () => {
+          // 1秒一轮回
+          http.load('POST', 'http://127.0.0.1:8003/ReadCard_HEC', data, {
+            resolveMsg: null,
+            rejectMsg: null
+          }).then(async res => {
+            if (res.data.CardID !== '') {
+              if (res.data.Err === null && res.data.Exception) {
+                this.$showAlert(res.data.Exception, 'danger', 2000)
+                // clearInterval(interval)
+              } else {
+                if (res.data.Factory === 'CiTiao') {
+                  // 获取用户信息
+                  getUser = await this.$resetpost('rs/sql/ncarchivesQuery', {
+                    data: {
+                      condition: `f_orgid  in ${forgid} and f_card_id='${res.data.CardID}'`,
+                      orderitem: `f_userinfo_id`
+                    }
+                  }, {resolveMsg: null, rejectMsg: '读卡失败'})
+                  this.showOwe(getUser.data[0])
+                  clearInterval(this.interval)
+                }
+              }
+            }
+          })
+        }, this.searchTime * 1000)
+      } catch (error) {
+        console.log('捕获到异常', error)
+        // this.$showAlert(error.data, 'danger', 2000)
+      }
+    },
+    // 打印
+    async print (row) {
+      let condition = `p.f_civill_id = ${row.id}`
+      await this.printModel.search(condition)
+      this.$refs.printdata.printData()
+    },
+    // 导出
+    export (row) {
+      this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
+      this.$refs.excel.exportExcel()
+    },
+    showOwe (row) {
+      if (this.chargeToChoose) {
+        this.f_civill_id = row.id
+        this.row = row
+        this.oweShow = true
+      }
+    },
+    search () {
+      this.$refs.paged.$refs.cri.search()
+    },
+    add () {
+      if (this.f_filialeids) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('add')
+      } else {
+        this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+      }
+    },
+    operate (val) {
+      this.$dispatch('operate', val)
+    },
+    selfSearch (args) {
+      if (!this.f_orgid) {
+        this.getorg([this.$login.f.orgid])
+      }
+      args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
+      this.oweShow = false
+      this.model.search(args.condition, args.model)
+      if (this.$refs.paged.$refs.grid) this.$refs.paged.$refs.grid.selectInit()
+      this.$dispatch('newsearch')
+    },
+    getorg (val) {
+      this.f_orgid = this.$login.convertToIn(val)
+      this.f_filialeids = val[0]
+    }
+  }
+
+}
+</script>

package/src/filiale/gehua/sale.js

@@ -97,4 +97,7 @@ export default function () {
   Vue.component('user-info-detail-manage-new', (resolve) => {
     require(['./userinfo_detail/UserInfoDetailManageNew'], resolve)
   })
+  // 团体缴费查询列表
+  Vue.component('charge-group-list', (resolve) => {
+    require(['./ChargeGroupList'], resolve) })
 }

package/src/filiale/huayin/base/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
     <safe-check :data="data"></safe-check>
     <bill-message @setstate="setstate" :state="state" :data="data"></bill-message>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>

package/src/filiale/qianneng/eticket/EticketPrint.vue

@@ -132,11 +132,12 @@ export default {
             id: ticket_id,
             f_bill_code: req.fpDm,
             f_bill_number: req.fpHm,
-            f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-            f_sign_result: req.msg,
+            f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+            f_sign_url: req.shareurl,
+            f_sign_result: req.sharecode,
             f_bill_state: req.status
           }
-          this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+          this.eticket_src = 'https://qnjtkf.cn:7400' + model.f_bill_url
         } else if (req.status === '开票中') {
           model = {
             id: ticket_id,
@@ -303,11 +304,12 @@ export default {
                   f_eticket_id: ticket_id,
                   f_bill_code: req.fpDm,
                   f_bill_number: req.fpHm,
-                  f_bill_url: req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', ''),
-                  f_sign_result: req.msg,
+                  f_bill_url: req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download'),
+                  f_sign_url: req.shareurl,
+                  f_sign_result: req.sharecode,
                   f_bill_state: req.status
                 })
-                this.eticket_src = req.shareurl.replace('/s/', `/s/downloadPdf?pwd=${req.sharecode}&authCode=`).replace('\\', '')
+                this.eticket_src = 'https://qnjtkf.cn:7400' + req.fileUrl.replace('d:\\qianNengInvoiceFile', '/Download')
               } else if (req && req.status !== '开票中') {
                 clearInterval(interval)
                 // TODO 失败后保存发票详情

package/src/filiale/rizhao/otherinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex" style="height: 90%;overflow-y: scroll">
-    <mix-price-info :data="data" v-if="data.f_price_type === '固定气价'"></mix-price-info>
-    <stairinfo :data="data" v-if="data.f_price_type === '阶梯气价'"></stairinfo>
+    <mix-price-info :data="data" v-if="data.f_meter_type && data.f_price_type === '固定气价'"></mix-price-info>
+    <stairinfo :data="data" v-if="data.f_meter_type && data.f_price_type === '阶梯气价'"></stairinfo>
     <valueaddinfo :data="data" v-ref:valueaddinfo></valueaddinfo>
     <safe-check :data="data"></safe-check>
     <service-repair :data="data" v-if="name==='维修情况查询'"></service-repair>

package/src/filiale/rongcheng/FileAddressManage.vue

@@ -3,7 +3,7 @@
     <div :class="{'basic-main':!useraddressShow,'binary-left':useraddressShow}" v-show="isSelect">
       <file-address-list @select-changed="selected" v-ref:addresslist :style="style" :select=select :company=company :f_filialeids.sync="f_filialeids"></file-address-list>
     </div>
-    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}">
+    <div v-show="useraddressShow"  :class="{'basic-main':!isSelect, 'binary-right': isSelect}" style="width:60%">
       <div class="flex">
         <file-user-address :f_filialeids.sync="f_filialeids" :is_pecial="isSpecial" :isedit="isSelect" :row="row" v-ref:fileuseraddress></file-user-address>
 

package/src/filiale/shanxian/components/FilesManage/FileAddressList.vue

@@ -5,14 +5,14 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
 
           <div class="row">
-            <div class="col-sm-4 form-group">
+            <div class="col-sm-6 form-group">
               <label class="font_normal_body">地址信息</label>
               <input  type="text" class="input_search" style="width:60%" v-model="model.f_address"
                       condition="f_address like '%{}%'" placeholder="地址信息"
                       @keyup.enter.stop="search()"
                       :size="model.f_address ? model.f_address.length*2 : 8"/>
             </div>
-            <div class="col-sm-4 form-group button-range" >
+            <div class="col-sm-6 form-group button-range" >
               <button class="button_search button_spacing" @click="search()" >查询</button>
               <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用地址</button>
               <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>