telephone-clients 3.0.104-10 → 3.0.104-100

package/src/filiale/wenxi/android/PhoneUpUserinfo.vue

@@ -8,7 +8,7 @@
           <img class="butt3" :src="imgback('基本信息')">
         </span>
       </div>
-      <div class="panel-body " id="upuserinfo_sel" v-show="headername=='基本信息'">
+      <div class="panel-body " id="upuserinfo_sel" v-show="headername == '基本信息'">
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">用户编号:</labe>
           <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_userinfo_code" readonly/>
@@ -35,13 +35,10 @@
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">合同日期:</labe>
-          <datepicker class="rightipt"
-                      :value.sync="userinfo.baseinfo.base.f_contractdate"
-                      v-model="userinfo.baseinfo.base.f_contractdate"
-                      :disabled-days-of-Week="[]"
+          <datepicker class="rightipt" :value.sync="userinfo.baseinfo.base.f_contractdate"
+                      v-model="userinfo.baseinfo.base.f_contractdate" :disabled-days-of-Week="[]"
                       :format="'yyyy-MM-dd 00:00:00'"
-                      :show-reset-button="reset" readonly="readonly"
-          >
+                      :show-reset-button="reset" readonly="readonly">
           </datepicker>
           <!--          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_contractdate"  />-->
         </div>
@@ -84,8 +81,7 @@
           <labe class="righttxt">省&ensp;市&ensp;区:</labe>
           <!--<input type="text" style="width: 75%;float:right" class="form-control"  v-model="row.f_devices_type"  />-->
           <!--<input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_pcd"  />-->
-          <v-select :value.sync="selectPcd" class="input-font" style="margin-left: 5%;"
-                    :width="'60%'"
+          <v-select :value.sync="selectPcd" class="input-font" style="margin-left: 5%;" :width="'60%'"
                     v-model="selectPcd"
                     :options='pcds' placeholder='请选择省市区' close-on-select clear-button value-single
                     @change="pcd_change()"></v-select>
@@ -93,48 +89,43 @@
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">街道名称:</labe>
           <!--<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_street"  />-->
-          <v-select :value.sync="selectStreet" class="input-font" style="margin-left: 5%;"
-                    :width="'60%'"
-                    v-model="selectStreet"
-                    :options='streets' placeholder='请选择街道' close-on-select clear-button value-single
+          <v-select :value.sync="selectStreet" class="input-font" style="margin-left: 5%;" :width="'60%'"
+                    v-model="selectStreet" :options='streets' placeholder='请选择街道' close-on-select clear-button
+                    value-single
                     @change="street_change()"></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
-          <labe class="righttxt">集收单位:</labe>
-          <input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area"/>
-          <!--          <v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"-->
-          <!--                    :width="'60%'"-->
-          <!--                    v-model="selectArea"-->
-          <!--                    :timeout="500"-->
-          <!--                    @select-search="select_search"-->
-          <!--                    readonly-->
-          <!--                    :options='area' placeholder='请选择集收单位'  close-on-select clear-button value-single @change="area_change()"></v-select>-->
+          <labe class="righttxt">小&ensp;&ensp;&ensp;&ensp;区:</labe>
+          <!--          <input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area"/>-->
+          <v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;" :width="'60%'"
+                    v-model="selectArea" :timeout="500" @select-search="select_search" readonly :options='area'
+                    placeholder='请选择小区' close-on-select clear-button value-single @change="area_change()"></v-select>
         </div>
         <!--<div class="row auto" style="margin: 5px 0"  v-show="addressType=='特殊地址'">
-          <labe class="righttxt">集收单位:</labe>
+          <labe class="righttxt">小&ensp;&ensp;&ensp;&ensp;区:</labe>
           &lt;!&ndash;<input type="text" readonly class="form-control rightipt" v-model="userinfo.addressinfo.f_residential_area"  />&ndash;&gt;
           <v-select :value.sync="selectArea" class="input-font" style="margin-left: 5%;"
                     :width="'60%'"
                     v-model="selectArea"
                     @select-search="select_search"
-                    :options='area' placeholder='请选择集收单位'  close-on-select clear-button value-single @change="area_changeTC()"></v-select>
+                    :options='area' placeholder='请选择小区'  close-on-select clear-button value-single @change="area_changeTC()"></v-select>
         </div>-->
-        <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
+        <div class="row auto" style="margin: 5px 0" v-show="addressType == '普通地址'">
           <labe class="righttxt">楼&ensp;&ensp;&ensp;&ensp;号:</labe>
           <input type="text" @change="changeNewAddress" class="form-control rightipt"
                  v-model="userinfo.addressinfo.f_building"/>
         </div>
-        <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
+        <div class="row auto" style="margin: 5px 0" v-show="addressType == '普通地址'">
           <labe class="righttxt">单&ensp;&ensp;&ensp;&ensp;元:</labe>
           <input type="text" @change="changeNewAddress" class="form-control rightipt"
                  v-model="userinfo.addressinfo.f_unit"/>
         </div>
-        <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
+        <div class="row auto" style="margin: 5px 0" v-show="addressType == '普通地址'">
           <labe class="righttxt">楼&ensp;&ensp;&ensp;&ensp;层:</labe>
           <input type="text" @change="changeNewAddress" class="form-control rightipt"
                  v-model="userinfo.addressinfo.f_floor"/>
         </div>
-        <div class="row auto" style="margin: 5px 0" v-show="addressType=='普通地址' ">
+        <div class="row auto" style="margin: 5px 0" v-show="addressType == '普通地址'">
           <labe class="righttxt">门&ensp;牌&ensp;号:</labe>
           <input type="text" @change="changeNewAddress" class="form-control rightipt"
                  v-model="userinfo.addressinfo.f_room"/>
@@ -164,16 +155,12 @@
           <img class="butt3" :src="imgback('表具信息')">
         </span>
       </div>
-      <div class="panel-body " v-show="headername=='表具信息'">
+      <div class="panel-body " v-show="headername == '表具信息'">
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">表&ensp;&ensp;&ensp;&ensp;号:</labe>
-          <input type="text"
-                 :readonly="userinfo.meterinfo[0].f_table_state != '待开通'"
-                 class="form-control rightipt"
+          <input type="text" :readonly="userinfo.meterinfo[0].f_table_state != '待开通'" class="form-control rightipt"
                  style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber"/>
-          <button type="button"
-                  :disabled="userinfo.meterinfo[0].f_table_state != '待开通'"
-                  name="button"
+          <button type="button" :disabled="userinfo.meterinfo[0].f_table_state != '待开通'" name="button"
                   class="btn btn-primary" style="width: 15%" @click="scan">扫码
           </button>
         </div>
@@ -203,33 +190,22 @@
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">表&ensp;位&ensp;置:</labe>
           <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_position"
-                    v-model="userinfo.meterinfo[0].f_position"
-                    placeholder='请选择'
-                    :width='wid'
-                    readonly
+                    v-model="userinfo.meterinfo[0].f_position" placeholder='请选择' :width='wid' readonly
                     :options="wz_types"
                     close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_table_state == '待开通'">
           <labe class="righttxt">表&ensp;品&ensp;牌:</labe>
           <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_gasbrand"
-                    v-model="userinfo.meterinfo[0].f_gasbrand"
-                    placeholder='请选择'
-                    :width='wid'
-                    readonly
+                    v-model="userinfo.meterinfo[0].f_gasbrand" placeholder='请选择' :width='wid' readonly
                     :options="gasbrands"
                     close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0" v-if="userinfo.meterinfo[0].f_table_state == '待开通'">
           <labe class="righttxt">气表型号:</labe>
           <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_gasmodel"
-                    v-model="userinfo.meterinfo[0].f_gasmodel"
-                    placeholder='请选择'
-                    :width='wid'
-                    readonly
-                    :disabled="gasmodels.length == 0"
-                    :options="gasmodels"
-                    close-on-select value-single></v-select>
+                    v-model="userinfo.meterinfo[0].f_gasmodel" placeholder='请选择' :width='wid' readonly
+                    :disabled="gasmodels.length == 0" :options="gasmodels" close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">初始底数:</labe>
@@ -238,27 +214,20 @@
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">左&ensp;右&ensp;表:</labe>
           <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_aroundmeter"
-                    v-model="userinfo.meterinfo[0].f_aroundmeter"
-                    placeholder='请选择'
-                    :width='wid'
-                    readonly
+                    v-model="userinfo.meterinfo[0].f_aroundmeter" placeholder='请选择' :width='wid' readonly
                     :options="aroundmeters"
                     close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">气表类型:</labe>
           <v-select class="rightipt" :value.sync="userinfo.meterinfo[0].f_meter_classify"
-                    v-model="userinfo.meterinfo[0].f_meter_classify"
-                    placeholder='请选择'
-                    :width='wid'
-                    readonly
+                    v-model="userinfo.meterinfo[0].f_meter_classify" placeholder='请选择' :width='wid' readonly
                     :disabled="true"
-                    :options="meter_classifys"
-                    close-on-select value-single></v-select>
+                    :options="meter_classifys" close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <div style="display: flex;justify-content: center;">
-            <button v-if="userinfo.meterinfo[0].f_meter_classify=='机表'" class="col-sm-3 btn btn-primary"
+            <button v-if="userinfo.meterinfo[0].f_meter_classify == '机表'" class="col-sm-3 btn btn-primary"
                     @click="upUserState()">机表关阀停用
             </button>
           </div>
@@ -270,18 +239,13 @@
         <span class="spanboder"><img src="../../../assets/list.png" style="width: 22px;margin-right: 8px;">设备信息<img
           class="butt3" :src="imgback('设备信息')"></span>
       </div>
-      <div class="panel-body" v-show="headername=='设备信息'">
+      <div class="panel-body" v-show="headername == '设备信息'">
         <div class="row" v-for="row in model"
              style="border:2px solid #A2C2EB; border-top:10px solid #A2C2EB; box-shadow: #00b3ee;margin-bottom: 10px">
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">设备类型:</labe>
-            <v-select class="rightipt" :value.sync="row.f_devices_type"
-                      v-model="row.f_devices_type"
-                      placeholder='请选择'
-                      :width='wid'
-                      readonly
-                      :options="devices_types"
-                      close-on-select value-single></v-select>
+            <v-select class="rightipt" :value.sync="row.f_devices_type" v-model="row.f_devices_type" placeholder='请选择'
+                      :width='wid' readonly :options="devices_types" close-on-select value-single></v-select>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">设备品牌:</labe>
@@ -293,12 +257,9 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">生产日期:</labe>
-            <datepicker class="rightipt"
-                        :value.sync="row.f_make_date"
-                        v-model="row.f_make_date"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="reset" readonly="readonly">
+            <datepicker class="rightipt" :value.sync="row.f_make_date" v-model="row.f_make_date"
+                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
+                        readonly="readonly">
             </datepicker>
           </div>
           <div class="row auto" style="margin: 5px 0">
@@ -307,12 +268,9 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">到期日期:</labe>
-            <datepicker class="rightipt"
-                        :value.sync="row.f_expire_date"
-                        v-model="row.f_expire_date"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="reset" readonly="readonly">
+            <datepicker class="rightipt" :value.sync="row.f_expire_date" v-model="row.f_expire_date"
+                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
+                        readonly="readonly">
             </datepicker>
           </div>
           <div class="row auto" style="margin: 5px 0">
@@ -321,12 +279,9 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">安装日期:</labe>
-            <datepicker class="rightipt"
-                        :value.sync="row.f_input_date"
-                        v-model="row.f_input_date"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="reset" readonly="readonly">
+            <datepicker class="rightipt" :value.sync="row.f_input_date" v-model="row.f_input_date"
+                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
+                        readonly="readonly">
             </datepicker>
           </div>
           <div class="row auto" style="margin: 5px 0">
@@ -335,13 +290,8 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">有无不锈钢波纹管:</labe>
-            <v-select class="rightipt" :value.sync="row.f_pipe_type"
-                      v-model="row.f_pipe_type"
-                      placeholder='请选择'
-                      :width='wid'
-                      readonly
-                      :options="pipetypes"
-                      close-on-select value-single></v-select>
+            <v-select class="rightipt" :value.sync="row.f_pipe_type" v-model="row.f_pipe_type" placeholder='请选择'
+                      :width='wid' readonly :options="pipetypes" close-on-select value-single></v-select>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">波纹管数量:</labe>
@@ -349,32 +299,22 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">管道安装日期:</labe>
-            <datepicker class="rightipt"
-                        :value.sync="row.f_pipeinstall_date"
-                        v-model="row.f_pipeinstall_date"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="reset" readonly="readonly">
+            <datepicker class="rightipt" :value.sync="row.f_pipeinstall_date" v-model="row.f_pipeinstall_date"
+                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
+                        readonly="readonly">
             </datepicker>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">管道到期日期:</labe>
-            <datepicker class="rightipt"
-                        :value.sync="row.f_pipeexpire_date"
-                        v-model="row.f_pipeexpire_date"
-                        :disabled-days-of-Week="[]"
-                        :format="'yyyy-MM-dd'"
-                        :show-reset-button="reset" readonly="readonly">
+            <datepicker class="rightipt" :value.sync="row.f_pipeexpire_date" v-model="row.f_pipeexpire_date"
+                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
+                        readonly="readonly">
             </datepicker>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">有无自闭阀:</labe>
-            <v-select class="rightipt" :value.sync="row.f_is_zibifa"
-                      v-model="row.f_is_zibifa"
-                      placeholder='请选择'
-                      :width='wid'
-                      :options="is_zibifa"
-                      close-on-select value-single></v-select>
+            <v-select class="rightipt" :value.sync="row.f_is_zibifa" v-model="row.f_is_zibifa" placeholder='请选择'
+                      :width='wid' :options="is_zibifa" close-on-select value-single></v-select>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">自闭阀数量:</labe>
@@ -390,7 +330,7 @@
             <labe class="righttxt">购买方式:</labe><input type="text" class="form-control rightipt" readonly  v-model="row.watchpurchase"  />
           </div>-->
           <div style="display: flex;justify-content: center;margin-bottom: 3px"
-               v-if="$index>this.userinfo_old.devicesinfo.length-1 || this.userinfo_old.devicesinfo.length==0">
+               v-if="$index > this.userinfo_old.devicesinfo.length - 1 || this.userinfo_old.devicesinfo.length == 0">
             <button class="btn btn-warning" @click="delDevices($index)">删除设备</button>
           </div>
         </div>
@@ -492,62 +432,28 @@
         this.userinfo.meterinfo[0].f_meternumber = datapa
       },
       checkVal() {
-        this.approveChange = false
-        this.changemeterno = false
-        let checked = {ischeck: true, msg: ''}
-        if (!this.userinfo.baseinfo.base.f_user_name) {
-          checked = {ischeck: false, msg: '请输入用户名称！'}
+        if (!this.userinfo.baseinfo.base.f_contractdate) {
+          return '合同日期未填写'
         }
-        if (!this.selectPcd.id) {
-          checked = {ischeck: false, msg: '请选择省市区！'}
+        if (!this.userinfo.meterinfo[0].f_meternumber) {
+          return '表号未填写'
         }
-        if (!this.selectStreet.id) {
-          checked = {ischeck: false, msg: '请选择街道！'}
+        if (!this.userinfo.meterinfo[0].f_metertitles) {
+          return '表封号未填写'
         }
-        if (!this.userinfo.addressinfo.f_address) {
-          checked = {ischeck: false, msg: '新地址不能为空！'}
+        if (!this.userinfo.meterinfo[0].f_position) {
+          return '表位置未填写'
         }
-        if (this.addressType == '普通地址') {
-          if (!this.selectArea.id) {
-            checked = {ischeck: false, msg: '请选择集收单位！'}
-          }
-          if (!this.userinfo.addressinfo.f_room) {
-            checked = {ischeck: false, msg: '新输入门牌号！'}
-          }
+        if (!this.userinfo.meterinfo[0].f_gasbrand) {
+          return '表品牌未填写'
         }
-        if (this.userinfo.meterinfo[0].f_meter_classify == '机表' && this.userinfo_old.meterinfo[0].f_meternumber) {
-          if (this.userinfo.meterinfo[0].f_meternumber) {
-            if (this.userinfo.meterinfo[0].f_meternumber != this.userinfo_old.meterinfo[0].f_meternumber) {
-              if (!this.f_meterno_path || this.f_meterno_path == Vue.nopic) {
-                checked = {ischeck: false, msg: '请拍摄表号照片！'}
-              } else {
-                this.changemeterno = true
-              }
-            }
-          } else {
-            checked = {ischeck: false, msg: '请输入表号！'}
-          }
+        if (!this.userinfo.meterinfo[0].f_meter_base) {
+          return '初始底数未填写'
         }
-        for (let check in this.checkField) {
-          if (typeof check != 'function') {
-            for (let i = 0; i < this.checkField[check].length; i++) {
-              if (check == 'checkUserinfoField') {
-                if (this.userinfo.baseinfo.base[this.checkField[check][i]] != this.userinfo_old.baseinfo.base[this.checkField[check][i]]) {
-                  this.approveChange = true
-                }
-              } else if (check == 'checkUserFilesField') {
-                if (this.userinfo.meterinfo[0][this.checkField[check][i]] != this.userinfo_old.meterinfo[0][this.checkField[check][i]]) {
-                  this.approveChange = true
-                }
-              } else if (check == 'checkAddressField') {
-                if (this.userinfo.addressinfo[this.checkField[check][i]] != this.userinfo_old.addressinfo[this.checkField[check][i]]) {
-                  this.approveChange = true
-                }
-              }
-            }
-          }
+        if (!this.userinfo.meterinfo[0].f_aroundmeter) {
+          return '左右表未填写'
         }
-        return checked
+        return false
       },
       select_search(text) {
         if (this.selectStreet.id) {
@@ -606,6 +512,11 @@
         }
       },
       editUserInfo() {
+        const msg = this.checkVal()
+        if (msg && this.userinfo.meterinfo[0].f_table_state == '待开通') {
+          this.$showMessage(msg)
+          return
+        }
         for (let i = 0; i < this.model.length; i++) {
           this.model[i].f_user_id = this.userinfo.meterinfo[0].f_user_id
         }

package/src/filiale/wenxi/android/RepairOrderV.vue

@@ -37,7 +37,7 @@
   import RepairDetails from '../../../components/workorder/RepairDetails'
   import RepairUserInfo from './RepairUserInfo'
   import Outlay from '../../../components/workorder/Outlay'
-  import FaultAll from '../../../components/workorder/FaultAll'
+  import FaultAll from './FaultAll'
   import { HttpResetClass } from 'vue-client'
   import co from 'co'
   import * as Util from "../../../components/Util";