sale-client 3.5.167 → 3.5.169

package/package.json

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

package/src/components/FilesManage/FileUserFiles.vue

@@ -119,10 +119,10 @@
                   <div
                     :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                     class="form-group">
-                    <label class="font_normal_body">用户类型</label>
+                    <label class="font_normal_body">客户类型</label>
                     <v-select :options='$parent.$parent.user_type' :value.sync="model.f_user_type"
                               close-on-select condition="f_user_type='{}'"
-                              placeholder='用户类型' v-model="model.f_user_type"></v-select>
+                              placeholder='客户类型' v-model="model.f_user_type"></v-select>
                   </div>
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
@@ -239,11 +239,11 @@
                   <div
                           :class="{'col-sm-2':!$parent.$parent.createFile,'col-sm-4':$parent.$parent.createFile}"
                           class="form-group" >
-                    <label class="font_normal_body">用户等级</label>
+                    <label class="font_normal_body">客户等级</label>
                     <v-select :options='$parent.$parent.userlevel' :search='true'
                               :value.sync="model.userlevel"
                               close-on-select
-                              condition="f_user_level = '{}'" placeholder='用户等级'
+                              condition="f_user_level = '{}'" placeholder='客户等级'
                               v-model='model.userlevel'></v-select>
                   </div>
                   <div
@@ -308,10 +308,10 @@
                     <nobr>客户电话</nobr>
                   </th>
                   <th  v-if="!$parent.$parent.$parent.isOper">
-                    <nobr>地址信息</nobr>
+                    <nobr>客户地址</nobr>
                   </th>
                   <th>
-                    <nobr>用户类型</nobr>
+                    <nobr>客户类型</nobr>
                   </th>
                   <th>
                     <nobr>用气性质</nobr>
@@ -332,7 +332,7 @@
                     <nobr>状态</nobr>
                   </th>
                   <th >
-                    <nobr>用户等级</nobr>
+                    <nobr>客户等级</nobr>
                   </th>
                   <!--<th>-->
                   <!--<nobr v-if="this.$login.r.includes('通知单打印')||this.$login.r.includes('流程表打印') ">下载</nobr>-->

package/src/components/FilesManage/MeterinfoTest.vue

@@ -6,6 +6,22 @@
           <a style="font-size: 16px;font-weight: 500;">表具信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
         </div>
         <div class="row" >
+          <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error' : '']">
+            <label for="gasbrand" class="font_normal_body">气表品牌</label>
+            <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
+                   v-validate:brand='{required: true }'>
+            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
+          </div>
+          <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
+            <label for="gasmodel" class="font_normal_body">气表型号</label>
+            <input type="text" v-show="false" v-model="$refs.model.selectedItems"
+                   v-validate:model='{required: true }'>
+            <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
+                      close-on-select
+                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
+          </div>
+
           <div class="col-sm-4 form-group" v-if="isiot" :class="[$m.f_meternumber.required ? 'has-error' : '']">
             <label for="f_meternumber" class="font_normal_body">&ensp;表&emsp;&emsp;号</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_meternumber"
@@ -38,21 +54,6 @@
                    :disabled="!jurisdiction.includes('档案信息查询修改')">
           </div>
 
-          <div class="col-sm-4 form-group" :class="[$m.brand.required ? 'has-error' : '']">
-            <label for="gasbrand" class="font_normal_body">气表品牌</label>
-            <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems"
-                   v-validate:brand='{required: true }'>
-            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="curuser.f_user_state != '预备'" v-ref:brand></v-select>
-          </div>
-          <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
-            <label for="gasmodel" class="font_normal_body">气表型号</label>
-            <input type="text" v-show="false" v-model="$refs.model.selectedItems"
-                   v-validate:model='{required: true }'>
-            <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
-                      close-on-select
-                      v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
-          </div>
           <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
             <input type="number" class="input_search" style="width:60%" v-model="row.f_total_gas" placeholder='累购气量'

package/src/components/FilesManageNew/FileUserFiles.vue

@@ -225,7 +225,7 @@
                     <nobr>客户电话</nobr>
                   </th>
                   <th  v-if="!$parent.$parent.$parent.isOper">
-                    <nobr>地址信息</nobr>
+                    <nobr>客户地址</nobr>
                   </th>
                   <th>
                     <nobr>状态</nobr>

package/src/components/UserFiles/UserPriceChangeManage.vue

@@ -88,7 +88,7 @@
                     <nobr>卡号</nobr>
                   </th>
                   <th>
-                    <nobr>地址信息</nobr>
+                    <nobr>客户地址</nobr>
                   </th>
                   <th>
                     <nobr>气价名称</nobr>

package/src/components/charge/ChargeList.vue

@@ -90,9 +90,9 @@
                           close-on-select style="width: 60%"></v-select>
               </div>
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">用户等级</label>
+                <label class="font_normal_body">客户等级</label>
                 <v-select v-model="model.f_user_level"
-                          placeholder='用户等级'
+                          placeholder='客户等级'
                           :value.sync="model.f_user_level"
                           :options='$parent.$parent.userlevel'
                           condition="i.f_user_level = '{}'"

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

@@ -105,7 +105,7 @@
                 <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>-->

package/src/components/revenue/base/leftview/Userinfo.vue

@@ -44,7 +44,7 @@
           <span class = "col-sm-7">{{data?data.f_rent_phone:dafault.f_rent_phone}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;用户状态</label>
+          <label class = "col-sm-5 " >&emsp;客户状态</label>
           <span class = "col-sm-7">{{data?data.f_user_state:dafault.f_user_state}}</span>
         </div>
         <div class="row">
@@ -68,7 +68,7 @@
           <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_people_num:dafault.f_people_num}}</span>
         </div>
         <div class="row">
-          <label class = "col-sm-5 " >&emsp;用户等级</label>
+          <label class = "col-sm-5 " >&emsp;客户等级</label>
           <span class = "col-sm-7" style="word-break: break-all">{{data?data.f_user_level:dafault.f_people_num}}</span>
         </div>
         <div class="row">

package/src/components/revenue/changeInsurance/InsuranceChargesDetails.vue

@@ -7,14 +7,14 @@
             <div novalidate class="form-inline auto" novalidate partial>
               <div class="row">
                   <div class="col-sm-2  form-group">
-                    <label class="font_normal_body" for="f_userinfo_code">用户编号</label>
+                    <label class="font_normal_body" for="f_userinfo_code">客户编号</label>
                     <input id="f_userinfo_code" type="text" class="input_search" style="width: 60%" v-model="model.f_userinfo_code"
-                           condition="f_userinfo_code = '{}'" placeholder='请输入要查询的用户编号'>
+                           condition="f_userinfo_code = '{}'" placeholder='请输入要查询的客户编号'>
                   </div>
                 <div class="col-sm-2  form-group">
-                  <label class="font_normal_body" for="f_user_name">用户姓名</label>
+                  <label class="font_normal_body" for="f_user_name">客户姓名</label>
                   <input id="f_user_name" type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
-                         condition="f_user_name like '{}'" placeholder='请输入要查询的用户姓名'>
+                         condition="f_user_name like '{}'" placeholder='请输入要查询的客户姓名'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" for="f_insurance_type">险&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种</label>
@@ -63,10 +63,10 @@
                   <nobr>序号</nobr>
                 </th>
                 <th>
-                  <nobr>用户编号</nobr>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
-                  <nobr>用户姓名</nobr>
+                  <nobr>客户姓名</nobr>
                 </th>
                 <th>
                   <nobr>身份证号</nobr>

package/src/components/revenue/changeInsurance/InsuranceList.vue

@@ -69,13 +69,13 @@
                   <nobr>序号</nobr>
                 </th>
                 <th>
-                  <nobr>用户编号</nobr>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
-                  <nobr>用户姓名</nobr>
+                  <nobr>客户姓名</nobr>
                 </th>
                 <th>
-                  <nobr>用户地址</nobr>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>截止日期</nobr>

package/src/components/revenue/comprehen/insurance/insuranceGuanL.vue

@@ -60,13 +60,13 @@
               <nobr>客户编号</nobr>
             </th>
             <th>
-              <nobr>用户姓名</nobr>
+              <nobr>客户姓名</nobr>
             </th>
             <th>
-              <nobr>用户电话</nobr>
+              <nobr>客户电话</nobr>
             </th>
             <th>
-              <nobr>用户地址</nobr>
+              <nobr>客户地址</nobr>
             </th>
             <!--<th>-->
               <!--<nobr>保险编号</nobr>-->
@@ -149,7 +149,7 @@
     <modal :backdrop="false" :show.sync="show" v-if="show" >
       <header class="modal-header" slot="modal-header">
         <button @click="show=!show" class="close" type="button"><span>&times;</span></button>
-        <h4 class="modal-title">修改用户保险信息</h4>
+        <h4 class="modal-title">修改客户保险信息</h4>
       </header>
       <article class="modal-body"  slot="modal-body"  style="height:100%;width:100%"  >
         <div class="row">

package/src/filiale/gehua/HighMeterIdCard.vue

@@ -350,11 +350,7 @@
 
           this.isopen = true
           this.iswaiting = false
-          if(capID==2){
-            this.SetAutoCutOff()
-          }else{
-            this.SetAutoCutOn()
-          }
+          this.SetAutoCutOff()
         })
       },
       //关闭视频

package/src/filiale/gehua/sale.js

@@ -38,9 +38,6 @@ let specialComp = {
   'file-meter-info': (resolve) => { require(['./MeterinfoTest'], resolve) },
   'file-user-files': (resolve) => { require(['./FileUserFiles'], resolve) },
   // 用户基本信息
-  'user-base-info-new': (resolve) => { require(['./UserBaseInfoNew'], resolve) },
-  // 档案管理新(预备户建档)
-  'file-user-files-new':  (resolve) => { require(['./FileUserFiles'], resolve) }
-
+  'user-base-info-new': (resolve) => { require(['./UserBaseInfoNew'], resolve) }
 }
 exports.specialComp = specialComp

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

@@ -0,0 +1,141 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <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="col-sm-4 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" >
+              <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>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy"  v-ref:grid>
+        <template partial='head'>
+          <tr>
+            <th><nobr>地址信息</nobr></th>
+            <th><nobr>选择</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align:center"><nobr>{{row.f_address}}</nobr></td>
+            <td style="text-align:center">
+              <button type="button" name="button" class="button_export"
+                      @click.stop="$parent.$parent.$parent.confirmaddress(row)">确认选择</button>
+            </td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="showFile" v-ref:modal backdrop="true">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer"></footer>
+  </modal>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    data () {
+      return {
+        criteriaShow: false,
+        model: new PagedList('rs/sql/address_getAddress', 20, {}),
+        addflag: false,
+        addtitle: '',
+
+        // 公司下拉
+        curorgid: [this.$login.f.orgid],
+        f_orgid: '',
+
+        // 文件上传弹框
+        showFile: false
+      }
+    },
+    title: '地址列表',
+    props: {
+      f_filialeids: {
+        type: String
+      },
+      company: {
+        type: String,
+        default: ''
+      }
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      // 添加方法
+      add (val) {
+        if (this.f_filialeids) {
+          this.$refs.paged.$refs.grid.selectStore.selected = null
+          this.$dispatch('add', val)
+        } else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      // 修改
+      modify (val) {
+        this.$refs.paged.$refs.grid.selectStore.selected = null
+        this.$dispatch('modify', val)
+      },
+      confirmaddress (row) {
+        this.$refs.paged.$refs.cri.search()
+        this.$dispatch('confirmaddress', row)
+      },
+      search () {
+        this.$refs.paged.$refs.cri.search()
+      },
+
+      selfSearch (args) {
+        if (!this.f_orgid) {
+          this.getorg([this.$login.f.orgid])
+        }
+        args.condition = `${args.condition} and a.f_userinfo_id is null and a.f_filialeid = '${this.f_filialeids}'`
+        this.model.search(args.condition, args.model)
+      },
+
+      // 清空
+      clear () {
+        this.$refs.paged.$refs.cri.model = {}
+      },
+      getorg (val) {
+        this.f_orgid = this.$login.convertToIn(val)
+        this.f_filialeids = val[0]
+      }
+    },
+    watch: {
+      'company' (val) {
+        this.f_orgid = val
+        this.f_filialeids = val
+      }
+    }
+
+  }
+</script>