sale-client 3.5.217 → 3.5.219

package/build/dev-server.js

@@ -4,7 +4,7 @@ var path = require('path')
 var webpackDevServer = require('webpack-dev-server')
 var compiler = webpack(config)
 // 自己改了这里不要提交 来回覆盖挺麻烦的
-const [localUrl, serverRul] = ['http://59.48.150.94:8300/', 'http://59.48.150.94:8300/']
+const [localUrl, serverRul] = ['http://59.48.150.94:8300', 'http://59.48.150.94:8300']
 const port = 8089
 
 // eslint-disable-next-line new-cap

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.217",
+  "version": "3.5.219",
   "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/revenue/HandManager/PriceAdjustmentManage.vue

@@ -7,6 +7,9 @@
     <tabs header="卡表调价补差">
       <price-adjustment-card v-if="show[1]" @deal-msg="dealMsg"></price-adjustment-card>
     </tabs>
+    <tabs header="记录调价补差">
+      <price-adjustment-selling @deal-msg="dealMsg"></price-adjustment-selling>
+    </tabs>
   </tab-button>
   <!--  </div>-->
   <!--  <div v-if="!listpage">-->

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

@@ -0,0 +1,377 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_userinfo_code" placeholder='客户编号'
+                         condition="f_userinfo_code = '{}'" >
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_user_name" placeholder='客户名称'
+                         condition="f_user_name like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期"
+                              style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期"
+                              style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="span" style="float:right;">&nbsp;&nbsp;
+                  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  <button class="button_search" @click="search()" v-el:cx>查询</button>
+                  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
+                  <div style="float: right"  class="button_spacing"
+                       :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                       @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_address" placeholder='客户地址'
+                         condition="u3.f_address like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">电&emsp;&emsp;话</label>
+                  <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_phone" placeholder='电话'
+                         condition="f_user_phone like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                         condition="f_meternumber like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">状&emsp;&emsp;态</label>
+                  <v-select id="price_states"
+                            v-model="model.price_states"
+                            placeholder='未调价'
+                            style="width: 60%"
+                            :value.sync="model.price_states"
+                            :options='$parent.$parent.price_states'
+                            condition="f_new_price {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select id="f_user_tye"
+                            v-model="model.f_user_type"
+                            placeholder='用户类型'
+                            style="width: 60%"
+                            @change="$parent.$parent.userTypeChange"
+                            :value.sync="model.f_user_type"
+                            :options='$parent.$parent.userTypes'
+                            condition="u2.f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">气&emsp;&emsp;价</label>
+                  <v-select id="f_price_name"
+                            v-model="model.price_name"
+                            placeholder='气价名称'
+                            style="width: 60%"
+                            :value.sync="model.price_name"
+                            :options='$parent.$parent.price_name'
+                            condition="sp.id = '{}'"
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+            <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>
+                <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'>
+              <td style="text-align: center;">{{$index+1}}</td>
+              <th style="text-align: center;">{{row.f_userinfo_code}}</th>
+              <th style="text-align: center;">{{row.f_meternumber}}</th>
+              <th style="text-align: center;">{{row.f_user_name}}</th>
+              <th style="text-align: center;">{{row.f_user_type}}</th>
+              <th style="text-align: center;">{{row.f_meter_type}}</th>
+              <th style="text-align: center;">{{row.f_price_name}}</th>
+<!--              <th style="text-align: center;">{{row.f_address}}</th>-->
+              <th style="text-align: center;">{{row.f_old_price?row.f_old_price:row.f_price}}</th>
+              <th style="text-align: center;">
+                <div class="form-group" style="margin-bottom:0px;"
+                     v-if="!row.f_new_price>0">
+                  <input type="text" class="form-control" v-model="row.newprice"  @blur="$parent.$parent.$parent.enter(row)"
+                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
+                </div>
+                <div v-else>{{row.f_new_price}}</div>
+                </th>
+              <th style="text-align: center;">{{row.f_change_price}}</th>
+              <th style="text-align: center;">{{row.f_last_tablebase}}</th>
+              <th style="text-align: center;">{{row.f_tablebase}}</th>
+              <th style="text-align: center;">{{row.pregas}}</th>
+              <th style="text-align: center;">{{row.f_surplus_fee}}</th>
+              <th style="text-align: center;">{{row.f_source}}</th>
+              <th style="text-align: center;">{{row.f_input_date}}</th>
+              <th style="text-align: center;">
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_new_price"
+                        @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
+                </button>
+              </th>
+            </template>
+          </data-grid>
+        </criteria-paged>
+        <modal :show.sync="show" >
+          <header slot="modal-header" class="modal-header">
+            <h4 class="modal-title">调 价 补 差</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <div class="form-group">
+              <p>价格：</p>
+              <input type="text" class="form-control" v-model="f_new_price" >
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" @click="priceadjustment">生成调价补差表</button>
+            <button type="button" class="btn btn-default" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <work-busy :is-busy="locking" v-show="locking"></work-busy>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { HttpResetClass } from 'vue-client'
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
+  self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
+  self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    console.log(res.data)
+    let rs = []
+    for (let i = 0; i < res.data.length; i++) {
+      if (res.data[i].f_price_type === '固定气价') {
+        let temp = {
+          label: res.data[i].f_price_name,
+          flage: res.data[i].f_user_type,
+          value: res.data[i].id
+        }
+        rs.push(temp)
+      }
+    }
+    console.log(rs)
+    self.pricers = [{label: '全部', value: '', flage: ''}, ...rs]
+    self.$refs.paged.$refs.criteria.search()
+  })
+}
+
+  export default {
+    title: '调价补差',
+    data () {
+      return {
+        pricechange: true,
+        criteriaShow: false,
+        pricers: [{label: '全部', value: '', flage: ''}],
+        price_name: [{label: '全部', value: ''}],
+        price_states: [{label: '全部', value: ''}, {label: '已调价', value: ' >0'}, {label: '未调价', value: ' <=0'}],
+        source: [{label: '卡表抄表', value: '卡表抄表'}, {label: '机表抄表', value: '机表抄表'}],
+        userTypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        condition: '',
+        locking: false,
+        model: new PagedList('rs/sql/get_UserChargeSelling', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
+        f_new_price: 0.0,
+        show: false,
+        addSelectParam: ''
+        // joinTable:'',
+      }
+    },
+    ready () {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      // 用户类型发生改变
+      userTypeChange () {
+        this.price_name = []
+        if (this.$refs.paged.$refs.criteria.model.f_user_type) {
+          if (this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+            for (let i = 0; i < this.pricers.length; i++) {
+              if (this.pricers[i].flage === this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+                let rs = {
+                  label: this.pricers[i].label,
+                  value: this.pricers[i].value
+                }
+                this.price_name.push(rs)
+              }
+            }
+          }
+        }
+        // 选择全部时就放进去所有的气价
+        if (this.price_name.length === 0) {
+          for (let i = 0; i < this.pricers.length; i++) {
+            let rs = {
+              label: this.pricers[i].label,
+              value: this.pricers[i].value
+            }
+            this.price_name.push(rs)
+          }
+        }
+      },
+      // 冲正
+      delectHand (row) {
+        this.$showMessage('冲正后不可恢复，确定冲正吗？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            row.f_operator = this.$login.f.name
+            row.f_operatorid = this.$login.f.id
+            row.f_orgid = this.$login.f.orgid
+            row.f_orgname = this.$login.f.orgs
+            row.f_depid = this.$login.f.depids
+            row.f_depname = this.$login.f.deps
+            this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
+              // this.$dispatch('refresh', '正在处理', row)
+              this.selfSearch(this.model)
+            })
+          }
+        })
+      },
+      priceshow () {
+        this.show = true
+      },
+      close () {
+        this.show = false
+        this.f_new_price = 0.0
+      },
+      async priceadjustment () {
+        this.$showMessage('确认生成补差记录吗?', ['cancel', 'confirm']).then(
+          (response) => {
+            if (response === 'confirm') {
+              this.show = false
+              this.locking = true
+              this.getAdjustData()
+            }
+          })
+      },
+      async enter (row) {
+        let http2 = new HttpResetClass()
+        let param = {
+          f_state: '有效',
+          f_new_price: parseFloat(row.newprice),
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
+          f_start_date: this.model.model.startDate + ' 00:00:00',
+          f_end_date: this.model.model.endDate + ' 23:59:59',
+          row: row
+        }
+        await http2.load('POST', 'rs/logic/priceAdjustment', {data: param}, {resolveMsg: null, rejectMsg: null})
+        this.selfSearch(this.model)
+      },
+      async getAdjustData () {
+        try {
+          let http = new HttpResetClass()
+          let detail = await http.load('POST', 'rs/sql/get_UserCharge',
+            {data: {condition: this.condition, startDate: this.model.model.startDate, endDate: this.model.model.endDate, addSelectParam: '', price_states: 'not'}}, {resolveMsg: null, rejectMsg: null})
+          console.log(detail.data)
+          let param = {
+            f_state: '有效',
+            f_new_price: parseFloat(this.f_new_price),
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps,
+            f_start_date: this.model.model.startDate + ' 00:00:00',
+            f_end_date: this.model.model.endDate + ' 23:59:59',
+            condition: this.condition
+          }
+          let http2 = new HttpResetClass()
+          for (var i = 0; i < detail.data.length; i++) {
+            param.row = detail.data[i]
+            await http2.load('POST', 'rs/logic/priceAdjustment', {data: param}, {resolveMsg: null, rejectMsg: null})
+          }
+          this.close()
+          this.$showMessage('已生成了' + detail.data.length + '条调价补差记录', ['confirm'])
+          this.$refs.paged.$refs.criteria.search()
+          this.locking = false
+        } catch (error) {
+          this.$showAlert('生成调价补差表失败!!!', 'error', 3)
+          this.locking = false
+        }
+      },
+      search () {
+        this.selfSearch()
+      },
+      selfSearch (args) {
+        args.model.addSelectParam = ''
+        // args.model.joinTable =''
+        if (args.model.price_states.toString() === '') {
+          this.pricechange = false
+          // args.model.addSelectParam = 'u5.f_surplus_fee,u5.id,u5.f_state,u5.f_new_price,u5.f_old_price,u5.f_change_price,u5.f_whether_pay,u5.f_sell_id,'
+          // args.model.joinTable = 'left join t_surplus_detail u5 on u5.f_handplan_id = u1.f_handplan_id'
+        } else {
+          this.pricechange = true
+        }
+        this.condition = `${args.condition} and u2.f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, args.model)
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = ''
+        })
+      }
+    },
+    computed: {
+    },
+    watch: {
+    }
+  }
+</script>
+
+<style >
+</style>

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>

package/src/filiale/wenxi/MeterinfoTest.vue

@@ -17,7 +17,7 @@
             <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='气表型号'
+            <v-select :value.sync="row.gasmodel" :options='gasmodelOptions' placeholder='气表型号'
                       close-on-select
                       v-model='row.gasmodel' :disabled="row.gasbrand.length === 0 || curuser.f_user_state != '预备'" v-ref:model></v-select>
           </div>
@@ -50,9 +50,11 @@
             <input type="number" class="input_search" style="width:60%" v-model="row.f_meter_base" placeholder='表底数'
                    :disabled="!jurisdiction.includes('档案信息查询修改')" :readonly="!row.f_userfiles_id">
           </div>
-          <div class="col-sm-4 form-group" title="涉及权限:【档案信息查询修改】" :class="[$m.f_initial_base.required ? 'has-error' : '']">
-            <label for="f_meter_base" class="font_normal_body">*&ensp;初始底数</label>
-            <input type="number" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
+
+
+          <div title="涉及权限:【档案信息查询修改】" :class="[$m.f_initial_base.required ? 'col-sm-4 form-group has-error' : 'col-sm-4 form-group']">
+            <label for="f_initial_base" class="font_normal_body">*&ensp;气表底数</label>
+            <input type="text" class="input_search" style="width:60%" v-model="row.f_initial_base" placeholder='表底数'
                    v-validate:f_initial_base='{required: true }'
                    :disabled="!jurisdiction.includes('档案信息查询修改')">
           </div>
@@ -181,13 +183,24 @@
                       close-on-select
                       v-el:cc></v-select>
           </div>
-          <div class="col-sm-4 form-group" >
-            <label for="gasmodel" class="font_normal_body">*&ensp;左&ensp;右&ensp;表</label>
-            <input v-show="false" class="input_search" style="width:60%" v-model="row.f_aroundmeter" placeholder='左右表'
-                   v-validate:f_aroundmeter='{required: true }'>
-            <v-select :value.sync="row.f_aroundmeter" :options='aroundmeters' placeholder='左右表' close-on-select
-                      v-model='row.f_aroundmeter'></v-select>
+          <div class="col-sm-4 form-group" :class="[$m.aroundmeter.required ? 'has-error' : '']"   >
+            <label for="f_aroundmeter" class="font_normal_body">*&ensp;左&ensp;右&ensp;表1</label>
+            <input type="text" v-model="row.f_aroundmeter" v-show="false" v-validate:aroundmeter='{required: true }'>
+            <v-select :value.sync="row.f_aroundmeter" v-model="row.f_aroundmeter"
+                      :options='aroundmeters' placeholder='请选择'
+                      close-on-select
+                      v-ref:aroundmeter
+                      ></v-select>
           </div>
+
+          <div class="col-sm-4 form-group" :class="[$m.f_position.required ? 'has-error' : '']">
+            <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;安装位置</label>
+            <input type="text" v-model="row.f_position" v-show="false"  v-validate:f_position='{required: true }'>
+            <v-select :value.sync="row.f_position" v-model="row.f_position"
+                      :options='positions' placeholder='安装位置'
+                      close-on-select></v-select>
+          </div>
+
           <div class="col-sm-4 form-group" >
             <label for="f_bqf_type" class="font_normal_body">表前阀型号</label>
             <input type="text" class="input_search" style="width:60%" v-model="row.f_bqf_type"
@@ -209,8 +222,8 @@
                 close-on-select></v-select> -->
           </div>
           <div class="col-sm-4 form-group" :class="[$m.f_gas_date.required ? 'has-error' : '']">
-            <input type="text" v-model="$refs.f_gas_date.value" v-show="false"  v-validate:f_gas_date='{required: true }'>
             <label for="f_gas_date" class="font_normal_body">&ensp;通气日期</label>
+            <input type="text" v-model="$refs.f_gas_date.value" v-show="false"  v-validate:f_gas_date='{required: true }'>
             <datepicker style="width:60%" placeholder="通气日期"
                         v-model="row.f_gas_date"
                         v-ref:f_gas_date
@@ -220,8 +233,9 @@
             ></datepicker>
           </div>
 
-          <div class="col-sm-4 form-group" >
+          <div class="col-sm-4 form-group" :class="[$m.f_position.required ? 'has-error' : '']">
             <label for="f_position" class="font_normal_body"  title="参数:安装位置">&ensp;安装位置</label>
+            <input type="text" v-model="row.f_position" v-show="false"  v-validate:f_position='{required: true }'>
             <v-select :value.sync="row.f_position" v-model="row.f_position"
                       :options='positions' placeholder='安装位置'
                       close-on-select></v-select>
@@ -246,8 +260,8 @@
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
           </div>
-          <div class="col-sm-4 form-group" v-show="true" :class="[$m.f_install_date.required ? 'has-error' : '']">
-            <input type="text" v-model="$refs.f_install_date.value" v-show="false" v-validate:f_install_date='{required: true }'>
+          <div class="col-sm-4 form-group">
+            <input type="text" v-model="$refs.f_install_date.value" v-show="false" >
             <label for="f_install_date" class="font_normal_body">&ensp;安装日期</label>
             <datepicker style="width:60%" id="startDate" placeholder="安装日期" width='100%'
                         v-model="row.f_install_date"
@@ -474,6 +488,7 @@
   import co from 'co'
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
+  import {color} from 'echarts/lib/export'
 
   let meterBookGen = function * (self) {
     if (self.$login.r.find(value => value == '抄表册建档')) {
@@ -602,6 +617,7 @@
       co(meterBookGen(this))
     },
     methods: {
+      color,
       checkCardId() {
         this.$resetpost('rs/logic/checkCardId', {
           data: {
@@ -727,6 +743,14 @@
         this.show = true
         this.field = field
       },
+      initialBaseValidate (){
+        console.log('initialBaseValidate', this.row.f_initial_base.required)
+        if (this.row.f_initial_base.required) {
+          return ''
+        } else {
+          return 'has-error'
+        }
+      },
       async meternumberValidate () {
         let http1 = new HttpResetClass()
         let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.row.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
@@ -838,6 +862,19 @@
       }
     },
     computed: {
+      // 控制气表型号
+      gasmodelOptions () {
+        let option = []
+        if (this.row.gasbrand.length > 0) {
+          option = this.row.gasbrand[0].gasmodel
+        }
+        option.map((item) => {
+          if (!item.label) return item
+          item.label = item.label.replace(/(家用|非家用|工业)?膜式燃气表|\*\*[\u4e00-\u9fa5]+/g, '')
+          return item
+        })
+        return option
+      },
 
       // 控制用户类型修改
       permissionUserType () {

package/src/filiale/wenxi/UserEssentialInfoTest.vue

@@ -26,7 +26,6 @@
           <div class="col-sm-4 form-group" style="" v-if="true">
             <label for="f_user_state" class="font_normal_body">&ensp;客户状态</label>
             <v-select :value.sync="baseinfo.base.f_user_state"
-                      :disabled="true"
                       :value-single="true"
                       :options='userstates' placeholder='客户状态'
                       close-on-select></v-select>