npm - telephone-clients - Versions diffs - 3.0.104-75 → 3.0.104-77 - Mend

telephone-clients 3.0.104-75 → 3.0.104-77

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/package.json +1 -1
package/src/filiale/wenxi/android/PhoneUpUserinfo.vue +102 -119
package/src/filiale/yuncheng/android/RightTree.vue +218 -217
package/src/main.js +22 -22

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "telephone-clients",
-  "version": "3.0.104-75",
+  "version": "3.0.104-77",
   "description": "呼叫模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -11,15 +11,15 @@
       <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 />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_userinfo_code" readonly/>
         </div>
         <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_user_name" readonly />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_user_name" readonly/>
         </div>
         <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_idnumber" />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_idnumber"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">用户状态:</labe>
@@ -27,37 +27,38 @@
           <!--                    :width="'60%'"-->
           <!--                    v-model="userinfo.baseinfo.base.f_user_state"-->
           <!--                    :options='userTypes' placeholder='用户状态' close-on-select clear-button value-single></v-select>-->
-          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_user_state" readonly />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_user_state" readonly/>
         </div>
         <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_user_phone" />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_user_phone"/>
         </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="[]" :format="'yyyy-MM-dd 00:00:00'"
+                      v-model="userinfo.baseinfo.base.f_contractdate" :disabled-days-of-Week="[]"
+                      :format="'yyyy-MM-dd 00:00:00'"
                       :show-reset-button="reset" readonly="readonly">
           </datepicker>
           <!--          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_contractdate"  />-->
         </div>
         <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_rent_name" />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_rent_name"/>
         </div>
         <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_zuhu_phone" />
+          <input type="text" class="form-control rightipt" v-model="userinfo.baseinfo.base.f_zuhu_phone"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">地址类型:</labe>
           <div class="rightipt" style="display: flex;justify-content: space-around;margin-top: 5px">
             <div><input type="radio" v-model="addressType" name="addressType" @change="changeAddressType"
-                        id="phone_addressType1" value="普通地址" /><label style="font-weight: normal;padding-left: 2px"
-                                                                      for="phone_addressType1">普通地址</label></div>
+                        id="phone_addressType1" value="普通地址"/><label style="font-weight: normal;padding-left: 2px"
+                                                                     for="phone_addressType1">普通地址</label></div>
             <div><input type="radio" v-model="addressType" name="addressType" @change="changeAddressType"
-                        id="phone_addressType2" value="特殊地址" /><label style="font-weight: normal;padding-left: 2px"
-                                                                      for="phone_addressType2">特殊地址</label></div>
+                        id="phone_addressType2" value="特殊地址"/><label style="font-weight: normal;padding-left: 2px"
+                                                                     for="phone_addressType2">特殊地址</label></div>
           </div>
           <!--<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"  />-->
@@ -69,7 +70,7 @@
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">地区类型:</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_iscity" />
+          <input type="text" class="form-control rightipt" readonly v-model="userinfo.addressinfo.f_iscity"/>
           <!--<v-select :value.sync="userinfo.addressinfo.f_iscity" class="input-font" style="margin-left: 5%;"
                     :width="'60%'"
                     :disabled="true"
@@ -80,7 +81,8 @@
           <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-model="selectPcd"
+          <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>
         </div>
@@ -88,7 +90,8 @@
           <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-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">
@@ -110,26 +113,26 @@
         <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" />
+                 v-model="userinfo.addressinfo.f_building"/>
         </div>
         <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" />
+                 v-model="userinfo.addressinfo.f_unit"/>
         </div>
         <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" />
+                 v-model="userinfo.addressinfo.f_floor"/>
         </div>
         <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" />
+                 v-model="userinfo.addressinfo.f_room"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">详细地址:</labe>
-          <input type="text" class="form-control rightipt" v-model="userinfo_old.addressinfo.f_address" />
+          <input type="text" class="form-control rightipt" v-model="userinfo_old.addressinfo.f_address"/>
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">新&ensp;地&ensp;址:</labe>
@@ -156,7 +159,7 @@
         <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"
-                 style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber" />
+                 style="width: 45%" v-model="userinfo.meterinfo[0].f_meternumber"/>
           <button type="button" :disabled="userinfo.meterinfo[0].f_table_state != '待开通'" name="button"
                   class="btn btn-primary" style="width: 15%" @click="scan">扫码
           </button>
@@ -182,18 +185,20 @@
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">表&ensp;封&ensp;号:</labe>
           <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_metertitles"
-                 :readonly="userinfo.meterinfo[0].f_table_state != '待开通'" />
+                 :readonly="userinfo.meterinfo[0].f_table_state != '待开通'"/>
         </div>
         <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 :options="wz_types"
+                    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 :options="gasbrands"
+                    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 == '待开通'">
@@ -204,18 +209,20 @@
         </div>
         <div class="row auto" style="margin: 5px 0">
           <labe class="righttxt">初始底数:</labe>
-          <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_base" />
+          <input type="text" class="form-control rightipt" v-model="userinfo.meterinfo[0].f_meter_base"/>
         </div>
         <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 :options="aroundmeters"
+                    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 :disabled="true"
+                    v-model="userinfo.meterinfo[0].f_meter_classify" placeholder='请选择' :width='wid' readonly
+                    :disabled="true"
                     :options="meter_classifys" close-on-select value-single></v-select>
         </div>
         <div class="row auto" style="margin: 5px 0">
@@ -242,41 +249,44 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">设备品牌:</labe>
-            <input type="text" class="form-control rightipt" v-model="row.f_brand" />
+            <input type="text" class="form-control rightipt" v-model="row.f_brand"/>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">设备型号:</labe>
-            <input type="text" class="form-control rightipt" v-model="row.f_devices_model" />
+            <input type="text" class="form-control rightipt" v-model="row.f_devices_model"/>
           </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">
+                        :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>
-            <input type="number" class="form-control rightipt" v-model="row.f_service_life" />
+            <input type="number" class="form-control rightipt" v-model="row.f_service_life"/>
           </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">
+                        :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">安&ensp;装&ensp;人:</labe>
-            <input type="text" class="form-control rightipt" v-model="row.f_input_person" />
+            <input type="text" class="form-control rightipt" v-model="row.f_input_person"/>
           </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">
+                        :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>
-            <input type="number" class="form-control rightipt" v-model="row.f_devices_num" />
+            <input type="number" class="form-control rightipt" v-model="row.f_devices_num"/>
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">有无不锈钢波纹管:</labe>
@@ -285,18 +295,20 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">波纹管数量:</labe>
-            <input type="text" class="form-control rightipt" v-model="row.f_pipe_num" />
+            <input type="text" class="form-control rightipt" v-model="row.f_pipe_num"/>
           </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">
+                        :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">
+                        :disabled-days-of-Week="[]" :format="'yyyy-MM-dd'" :show-reset-button="reset"
+                        readonly="readonly">
             </datepicker>
           </div>
           <div class="row auto" style="margin: 5px 0">
@@ -306,7 +318,7 @@
           </div>
           <div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">自闭阀数量:</labe>
-            <input type="text" class="form-control rightipt" v-model="row.f_zibifa_num" />
+            <input type="text" class="form-control rightipt" v-model="row.f_zibifa_num"/>
           </div>
           <!--<div class="row auto" style="margin: 5px 0">
             <labe class="righttxt">管道类型:</labe><input type="text" class="form-control rightipt" readonly  v-model="row.f_pipe_type"  />
@@ -338,7 +350,7 @@
 </template>
 <script>
-  import { HttpResetClass } from 'vue-client'
+  import {HttpResetClass} from 'vue-client'
   import * as Util from "../../../components/Util";
   import Vue from 'vue'
@@ -359,9 +371,9 @@
         gasmodel: [],
         meter_classifys: this.$appdata.getParam('气表类型'),
         pipe_types: this.$appdata.getParam('管道类型'),
-        pipetypes: [{ label: '有', value: '不锈钢波纹管' }, { label: '无', value: '' }],
+        pipetypes: [{label: '有', value: '不锈钢波纹管'}, {label: '无', value: ''}],
         wz_types: [],
-        cityTypes: [{ label: '市区', value: '市区' }, { label: '城镇', value: '城镇' }],
+        cityTypes: [{label: '市区', value: '市区'}, {label: '城镇', value: '城镇'}],
         aroundmeters: this.$appdata.getParam('左右表'),
         is_zibifa: this.$appdata.getParam('有无自闭阀'),
         pcds: [],
@@ -373,9 +385,9 @@
         area: [],
         enable: false,
         f_meterno_path: Vue.nopic,
-        selectArea: { id: '' },
-        selectPcd: { id: '' },
-        selectStreet: { id: '' },
+        selectArea: {id: ''},
+        selectPcd: {id: ''},
+        selectStreet: {id: ''},
         changemeterno: false,//是否修改了机表表号
         approveChange: false,//是否需要进行信息变更审核
         newAddress: '',
@@ -413,69 +425,35 @@
     methods: {
       scan() {
         HostApp.__this__ = this,
-          HostApp.scanCode({ callback: "javascript:HostApp.__this__.getCode();" })
+          HostApp.scanCode({callback: "javascript:HostApp.__this__.getCode();"})
       },
       getCode() {
         var datapa = HostApp.getCode().data;
         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) {
@@ -487,11 +465,11 @@
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
             }
-          }, { resolveMsg: null, rejectMsg: null }).then((res) => {
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if (res.data.length > 0) {
               this.area = []
               res.data.forEach((result) => {
-                this.area.push({ label: result.f_residential_area, value: result })
+                this.area.push({label: result.f_residential_area, value: result})
               })
             }
           })
@@ -534,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
         }
@@ -578,12 +561,12 @@
                   f_address: this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
                 }
               }
-            }, { resolveMsg: null, rejectMsg: null }).then((res1) => {
+            }, {resolveMsg: null, rejectMsg: null}).then((res1) => {
               if (res1.data.status == 200) {
                 let data = this.userinfo.addressinfo
                 data.f_address = this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
                 data.f_operator = Vue.user.name
-                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, { data: data }).then((res2) => {
+                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
                   this.$showMessage("修改用户地址信息成功！")
                 }).catch(error => {
                   this.$showMessage("修改用户地址信息！")
@@ -631,7 +614,7 @@
           this.userinfo.addressinfo.f_residential_area = ''
           this.userinfo.addressinfo.f_residential_area_id = ''
           this.userinfo.addressinfo.f_slice_area = ''
-          this.selectArea = { id: '' }
+          this.selectArea = {id: ''}
           this.area = []
           let pcdText = ` and f_street_id=${this.selectStreet.id}`
           let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
@@ -641,9 +624,9 @@
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText} `
             }
-          }, { resolveMsg: null, rejectMsg: null })
+          }, {resolveMsg: null, rejectMsg: null})
           res.data.forEach((result) => {
-            this.area.push({ label: result.f_residential_area, value: result })
+            this.area.push({label: result.f_residential_area, value: result})
           })
         } else {
           this.area = []
@@ -654,11 +637,11 @@
         if (this.selectPcd.id) {
           this.userinfo.addressinfo.f_pcd = this.selectPcd.f_pcd
           this.userinfo.addressinfo.f_pcd_id = this.selectPcd.id
-          this.selectStreet = { id: '' }
+          this.selectStreet = {id: ''}
           this.userinfo.addressinfo.f_street = ''
           this.userinfo.addressinfo.f_street_id = ''
           this.userinfo.addressinfo.f_iscity = ''
-          this.selectArea = { id: '' }
+          this.selectArea = {id: ''}
           this.userinfo.addressinfo.f_residential_area = ''
           this.userinfo.addressinfo.f_residential_area_id = ''
           this.userinfo.addressinfo.f_slice_area = ''
@@ -671,9 +654,9 @@
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
             }
-          }, { resolveMsg: null, rejectMsg: null })
+          }, {resolveMsg: null, rejectMsg: null})
           streetlist.data.forEach((result) => {
-            this.streets.push({ label: result.f_street, value: result })
+            this.streets.push({label: result.f_street, value: result})
           })
         } else {
           this.streets = []
@@ -707,7 +690,7 @@
             f_zones: Vue.user.zones
           }
           new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/entity/t_disable`,
-            data, { resolveMsg: null, rejectMsg: null }).then((row) => {
+            data, {resolveMsg: null, rejectMsg: null}).then((row) => {
             this.$showMessage('已成功关阀停气！')
             this.userinfo.meterinfo[0].f_table_state = '停用'
           })
@@ -737,7 +720,7 @@
           "f_brand": null,
           "f_devices_model": null,
           "f_devices_no": null,
-          "img": { "content": null, "filename": null }
+          "img": {"content": null, "filename": null}
         }
         this.model.push(obj)
       },
@@ -759,9 +742,9 @@
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
             }
-          }, { resolveMsg: null, rejectMsg: null })
+          }, {resolveMsg: null, rejectMsg: null})
           res.data.forEach((result) => {
-            this.area.push({ label: result.f_residential_area, value: result })
+            this.area.push({label: result.f_residential_area, value: result})
           })
           this.area.push({
             label: this.userinfo.addressinfo.f_residential_area,
@@ -785,12 +768,12 @@
               orderitem: "id",
               condition: `f_orgid = '${Vue.user.orgid}' ${pcdText}`
             }
-          }, { resolveMsg: null, rejectMsg: null })
+          }, {resolveMsg: null, rejectMsg: null})
           streetlist.data.forEach((result) => {
             if (this.selectStreet.id && this.selectStreet.id == result.id) {
               this.userinfo.addressinfo.f_iscity = result.f_iscity
             }
-            this.streets.push({ label: result.f_street, value: result })
+            this.streets.push({label: result.f_street, value: result})
           })
         } else {
           this.streets = []
@@ -840,10 +823,10 @@
             orderitem: "1",
             condition: ` f_gasbrand_id = '${this.userinfo.meterinfo[0].f_gasbrand_id}'`
           }
-        }, { resolveMsg: null, rejectMsg: null }).then(response => {
+        }, {resolveMsg: null, rejectMsg: null}).then(response => {
           this.gasmodel = response.data
           response.data.forEach(item => {
-            this.gasmodels.push({ label: item.f_meter_style, value: item.f_meter_style })
+            this.gasmodels.push({label: item.f_meter_style, value: item.f_meter_style})
           })
         })
       },
@@ -871,7 +854,7 @@
             orderitem: "id",
             condition: `f_orgid = '${Vue.user.orgid}'`
           }
-        }, { resolveMsg: null, rejectMsg: null })
+        }, {resolveMsg: null, rejectMsg: null})
         let gasbrand = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
           data: {
@@ -880,17 +863,17 @@
             orderitem: "1",
             condition: ` 1=1`
           }
-        }, { resolveMsg: null, rejectMsg: null })
+        }, {resolveMsg: null, rejectMsg: null})
         this.gasbrand = gasbrand.data
         gasbrand.data.forEach(item => {
-          this.gasbrands.push({ label: item.f_meter_brand, value: item.f_meter_brand })
+          this.gasbrands.push({label: item.f_meter_brand, value: item.f_meter_brand})
         })
         pcdlist.data.forEach((result) => {
-          this.pcds.push({ label: result.f_pcd, value: result })
+          this.pcds.push({label: result.f_pcd, value: result})
         })
         let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
           f_userinfo_id: this.f_userinfo_id
-        }, { resolveMsg: null, rejectMsg: null })
+        }, {resolveMsg: null, rejectMsg: null})
         this.userinfo = res.data
         this.userinfo_old = JSON.parse(JSON.stringify(res.data))
         this.model = this.userinfo.meterinfo[0].devicesinfo

package/src/filiale/yuncheng/android/RightTree.vue CHANGED Viewed

@@ -1,217 +1,218 @@
-<template>
-  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
-    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
-      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ resname }}</span>
-      <span class="caret"></span>
-    </button>
-    <tree :model='model' :is-click="false" slot="dropdown-menu" class="dropdown-menu auto" role="menu">
-        <span  partial>
-          <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
-          <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
-          <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
-          <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
-          <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
-        </span>
-    </tree>
-  </dropdown>
-  <v-select v-if="islist"
-            placeholder='请选择'
-            :options='childrenOptions'
-            @change="selectclick"
-            :value-single="true"
-            close-on-select></v-select>
-</template>
-<script>
-  import * as ldapHelper from './LdapHelper'
-  import Vue from 'vue'
-  export default {
-    title: '资源树',
-    props: {
-      source: {
-        type: String,
-        require: true,
-        default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
-      },
-      resid: {
-      },
-      islist: {
-        type: Boolean,
-        default: false
-      },
-      //是否有查看上级的权限
-      Url:{
-        type: String,
-        default:''
-      }
-    },
-    data () {
-      return {
-        width:'100%',
-        resobj:{res:Vue.user.orgs, resids:Vue.user.orgid},
-        userid: Vue.user.id,
-        resname:[Vue.user.orgs],
-        orgnames : [Vue.user.orgs],
-        orgids : [Vue.user.orgid],
-        orgobj:[],
-        model: [
-        ],
-        childrenOptions: []
-      }
-    },
-    methods: {
-      selectRes () {
-        let newobj={
-          "res": [this.resname],
-          "resids": [this.orgids],
-        }
-        this.$emit('re-res', newobj)
-      },
-      //点击资源的方法
-      selectclick (row) {
-        if(this.orgids.includes(row.id)){
-          this.orgnames=[]
-          this.orgids=[]
-          this.removeResChild(row)
-          this.orgnames.push(row.name)
-          this.orgids.push(row.id)
-          this.orgobj.push(row)
-        }else{
-          this.orgnames=[]
-          this.orgids=[]
-          this.orgobj=[]
-          this.addResChild(row)
-        }
-        console.log(this.orgnames.join(','))
-        this.resname = this.orgnames.length > 0 ? this.orgnames.join(','):'请选择'
-        let newobj={
-          "res": this.orgnames,
-          "resids": this.orgids,
-          "orgobj": this.orgobj,
-        }
-        this.$emit('re-res', newobj)
-      },
-      addResChild(val){
-        // if(this.orgids.includes(val.id)){
-        //   this.orgnames.splice(this.orgnames.indexOf(val.name),1)
-        //   this.orgids.splice(this.orgids.indexOf(val.id),1)
-        // }
-        this.orgnames.push(val.name)
-        this.orgids.push(val.id)
-        this.orgobj.push(val)
-        if(val.children && val.children.length>0){
-          Object.keys(val.children).forEach((key) => {
-            this.addResChild(val.children[key])
-          })
-        }
-      },
-      removeResChild(val){
-        this.orgnames.splice(this.orgnames.indexOf(val.name),1)
-        this.orgids.splice(this.orgids.indexOf(val.id),1)
-        this.orgobj.splice(this.orgids.indexOf(val),1)
-        if(val.children && val.children.length>0){
-          Object.keys(val.children).forEach((key) => {
-            this.removeResChild(val.children[key])
-          })
-        }
-      },
-      //检查是否显示对勾
-      isSelect(val) {
-        if(this.orgids.includes(val)){
-          return true
-        }else{
-          return false
-        }
-      },
-      //树形结构变成list
-      treetoList(val) {
-        for (let value of val) {
-          this.ergodicList(value)
-        }
-      },
-      //找到跟节点
-      ergodicList (val) {
-        val.children.length > 0 ? this.treetoList(val.children) : ((val.name == '永济客服部' || val.name == '话务中心') ? this.childrenOptions.push({label: val.name, value: val}) : '')
-      },
-      //处理显示默认值
-      dealResObj (val) {
-        try{
-          var arr=val.res.split(".")
-          //截取最后一个分公司名字
-          this.resname=arr[arr.length-1].toString()
-          this.resid = val.resids
-        }catch (e){
-          this.resname='请选择组织'
-        }
-      },
-      judgBoundary(){
-        //判断是否超出边界，超出移动
-        if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
-          this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
-        }
-      }
-    },
-    events: {
-    },
-    ready () {
-      console.log('righttree   ready')
-      if(this.$els.dropdown){
-        console.log('righttree1')
-        this.width = this.$els.dropdown.clientWidth * 0.7 +'px'
-      }
-      console.log('righttree2')
-      this.dealResObj (this.resobj)
-      console.log('righttree3')
-      var data = {
-        source: this.source,
-        userid: this.userid
-      }
-      console.log('向资源服务发送请求')
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, data,{
-        resolveMsg : null ,
-        rejectMsg : null,
-      }).then((ret) => {
-        console.log('向资源服务请求结束')
-        // 去掉前面的两层节点
-        ret.data[0].children[0].children.forEach((item) => {
-          this.model.push(item)
-        })
-        // 给资源添加父关系
-        ldapHelper.procParent(this.model)
-        if (this.islist) {
-          this.treetoList(this.model)
-        }
-        this.selectRes()
-      })
-    },
-    watch: {
-    }
-  }
-</script>
-<style lang="less">
-  #res-tree {
-    .list-group-item {
-      background-color: #FFF;
-      color: #000;
-      padding: 5px 10px;
-      border:0px;
-      white-space: nowrap;
-    }
-  }
-  #res-tree .list-group {
-    width: auto;
-    min-width: 100%;
-  }
-  .hide-text-overflow{
-    overflow: hidden;
-    text-overflow: ellipsis
-  }
-  .select-style {
-    border: 0px;
-    /*border-bottom: 2px solid #C9CCCF;*/
-    border: 1px solid #93B2D3;
-    border-radius: 0px;
-    color: #555;
-  }
-</style>
+<template>
+  <dropdown :model='model' class="auto" id="res-tree" v-if="!islist" v-el:dropdown :style="{width:width}">
+    <button type="button" class="btn btn-default dropdown-toggle select-style" data-toggle="dropdown">
+      <span class='btn-content' :style="{textOverflow:'ellipsis',overflow: 'hidden'}">{{ resname }}</span>
+      <span class="caret"></span>
+    </button>
+    <tree :model='model' :is-click="false" slot="dropdown-menu" class="dropdown-menu auto" role="menu">
+        <span  partial>
+          <span class="glyphicon glyphicon-chevron-down" v-show="row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="glyphicon glyphicon-chevron-right" v-show="!row.open&&row.data.children.length>0" style="color:balck;"></span>
+          <span class="RightTreeCanSelect" v-if="row.data.hasright" @click.stop="$parent.$parent.$parent.selectclick(row.data)">{{row.data.name}}</span>
+          <span class="RightTreeCanNotSelect" v-else>{{row.data.name}}</span>
+          <span class="glyphicon glyphicon-ok " v-if="$parent.$parent.$parent.isSelect(row.data.id)" style="color:balck;"></span>
+        </span>
+    </tree>
+  </dropdown>
+  <v-select v-if="islist"
+            placeholder='请选择'
+            :options='childrenOptions'
+            @change="selectclick"
+            :width="'100%'"
+            :value-single="true"
+            close-on-select></v-select>
+</template>
+<script>
+  import * as ldapHelper from './LdapHelper'
+  import Vue from 'vue'
+  export default {
+    title: '资源树',
+    props: {
+      source: {
+        type: String,
+        require: true,
+        default:`tool.getFullTree(this.getRights().where(row.getType() == $organization$))`
+      },
+      resid: {
+      },
+      islist: {
+        type: Boolean,
+        default: false
+      },
+      //是否有查看上级的权限
+      Url:{
+        type: String,
+        default:''
+      }
+    },
+    data () {
+      return {
+        width:'100%',
+        resobj:{res:Vue.user.orgs, resids:Vue.user.orgid},
+        userid: Vue.user.id,
+        resname:[Vue.user.orgs],
+        orgnames : [Vue.user.orgs],
+        orgids : [Vue.user.orgid],
+        orgobj:[],
+        model: [
+        ],
+        childrenOptions: []
+      }
+    },
+    methods: {
+      selectRes () {
+        let newobj={
+          "res": [this.resname],
+          "resids": [this.orgids],
+        }
+        this.$emit('re-res', newobj)
+      },
+      //点击资源的方法
+      selectclick (row) {
+        if(this.orgids.includes(row.id)){
+          this.orgnames=[]
+          this.orgids=[]
+          this.removeResChild(row)
+          this.orgnames.push(row.name)
+          this.orgids.push(row.id)
+          this.orgobj.push(row)
+        }else{
+          this.orgnames=[]
+          this.orgids=[]
+          this.orgobj=[]
+          this.addResChild(row)
+        }
+        console.log(this.orgnames.join(','))
+        this.resname = this.orgnames.length > 0 ? this.orgnames.join(','):'请选择'
+        let newobj={
+          "res": this.orgnames,
+          "resids": this.orgids,
+          "orgobj": this.orgobj,
+        }
+        this.$emit('re-res', newobj)
+      },
+      addResChild(val){
+        // if(this.orgids.includes(val.id)){
+        //   this.orgnames.splice(this.orgnames.indexOf(val.name),1)
+        //   this.orgids.splice(this.orgids.indexOf(val.id),1)
+        // }
+        this.orgnames.push(val.name)
+        this.orgids.push(val.id)
+        this.orgobj.push(val)
+        if(val.children && val.children.length>0){
+          Object.keys(val.children).forEach((key) => {
+            this.addResChild(val.children[key])
+          })
+        }
+      },
+      removeResChild(val){
+        this.orgnames.splice(this.orgnames.indexOf(val.name),1)
+        this.orgids.splice(this.orgids.indexOf(val.id),1)
+        this.orgobj.splice(this.orgids.indexOf(val),1)
+        if(val.children && val.children.length>0){
+          Object.keys(val.children).forEach((key) => {
+            this.removeResChild(val.children[key])
+          })
+        }
+      },
+      //检查是否显示对勾
+      isSelect(val) {
+        if(this.orgids.includes(val)){
+          return true
+        }else{
+          return false
+        }
+      },
+      //树形结构变成list
+      treetoList(val) {
+        for (let value of val) {
+          this.ergodicList(value)
+        }
+      },
+      //找到跟节点
+      ergodicList (val) {
+        val.children.length > 0 ? this.treetoList(val.children) : ((val.name == '永济客服部' || val.name == '话务中心') ? this.childrenOptions.push({label: val.name, value: val}) : '')
+      },
+      //处理显示默认值
+      dealResObj (val) {
+        try{
+          var arr=val.res.split(".")
+          //截取最后一个分公司名字
+          this.resname=arr[arr.length-1].toString()
+          this.resid = val.resids
+        }catch (e){
+          this.resname='请选择组织'
+        }
+      },
+      judgBoundary(){
+        //判断是否超出边界，超出移动
+        if(document.documentElement.offsetWidth< this.$els.dropdown.getBoundingClientRect().right){
+          this.left = document.documentElement.offsetWidth - this.$els.dropdown.getBoundingClientRect().right - 25
+        }
+      }
+    },
+    events: {
+    },
+    ready () {
+      console.log('righttree   ready')
+      if(this.$els.dropdown){
+        console.log('righttree1')
+        this.width = this.$els.dropdown.clientWidth * 0.7 +'px'
+      }
+      console.log('righttree2')
+      this.dealResObj (this.resobj)
+      console.log('righttree3')
+      var data = {
+        source: this.source,
+        userid: this.userid
+      }
+      console.log('向资源服务发送请求')
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, data,{
+        resolveMsg : null ,
+        rejectMsg : null,
+      }).then((ret) => {
+        console.log('向资源服务请求结束')
+        // 去掉前面的两层节点
+        ret.data[0].children[0].children.forEach((item) => {
+          this.model.push(item)
+        })
+        // 给资源添加父关系
+        ldapHelper.procParent(this.model)
+        if (this.islist) {
+          this.treetoList(this.model)
+        }
+        this.selectRes()
+      })
+    },
+    watch: {
+    }
+  }
+</script>
+<style lang="less">
+  #res-tree {
+    .list-group-item {
+      background-color: #FFF;
+      color: #000;
+      padding: 5px 10px;
+      border:0px;
+      white-space: nowrap;
+    }
+  }
+  #res-tree .list-group {
+    width: auto;
+    min-width: 100%;
+  }
+  .hide-text-overflow{
+    overflow: hidden;
+    text-overflow: ellipsis
+  }
+  .select-style {
+    border: 0px;
+    /*border-bottom: 2px solid #C9CCCF;*/
+    border: 1px solid #93B2D3;
+    border-radius: 0px;
+    color: #555;
+  }
+</style>

package/src/main.js CHANGED Viewed

@@ -1,22 +1,22 @@
-import Vue from 'vue'
-import App from './App'
-import all  from 'vue-client/src/all'
-import system from 'system-clients/src/system'
-import telephone from './telephone'
-import echarts from 'echarts'
-Vue.prototype.$echarts = echarts
-/** **************************通用组件******************************/
-all()
-system(false)
-telephone('rizhao')
-require('./expandcss.less')
-require('system-clients/src/styles/less/bootstrap.less')
-require('./telephoneanaly.less')
-// 测试
-Vue.component('test', (resolve) => { require(['./components/Test'], resolve) })
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import all  from 'vue-client/src/all'
+import system from 'system-clients/src/system'
+import telephone from './telephone'
+import echarts from 'echarts'
+Vue.prototype.$echarts = echarts
+/** **************************通用组件******************************/
+all()
+system(false)
+telephone()
+require('./expandcss.less')
+require('system-clients/src/styles/less/bootstrap.less')
+require('./telephoneanaly.less')
+// 测试
+Vue.component('test', (resolve) => { require(['./components/Test'], resolve) })
+new Vue({
+  el: 'body',
+  components: { App }
+})