apply-clients 7.1.36-1 → 7.1.36-yuchuan-1

package/src/components/android/Process/Processes/AppInstallationDetails.vue

@@ -76,7 +76,7 @@
                 <input class="form-control input_view" style=""
                        v-validate:f_user_name = "['required']"
                        v-model="userinfo.f_user_name"
-                       :value.sync="userinfo.f_user_name"
+                       :value.sync="showUserInformation.f_user_name"
                        :readonly="mark === 1"
                        placeholder="客户名称"/>
               </div>
@@ -86,7 +86,7 @@
               <div class="col-xs-8">
                 <input class="form-control input_view" style=""
                        v-model="userinfo.f_user_phone"
-                       :value.sync="userinfo.f_user_phone"
+                       :value.sync="showUserInformation.f_user_phone"
                        :readonly="mark === 1"
                        placeholder="客户电话"/>
               </div>
@@ -96,7 +96,7 @@
               <div class="col-xs-8">
                 <input-select
                   class="select select_list"
-                  :value.sync="userinfo.f_credentials"
+                  :value.sync="showUserInformation.f_credentials"
                   v-model="userinfo.f_credentials"
                   :options="credentialsList"
                   :disable="mark === 1"
@@ -109,7 +109,7 @@
                 <input class="form-control input_view" style=""
                        placeholder="证件号码"
                        v-model="userinfo.f_idnumber"
-                       :value="userinfo.f_idnumber"
+                       :value="showUserInformation.f_idnumber"
                        :readonly="mark === 1"/>
               </div>
             </div>
@@ -257,16 +257,16 @@
                        placeholder="表读数"
                        v-model="userfile.f_meter_base"
                        :value="userfile.f_meter_base"
-                       :readonly="mark === 1"/>
+                       :readonly="false"/>
               </div>
             </div>
-            <div class="form-group row vertical-center">
+            <div class="form-group row vertical-center" v-show="false">
               <label class="col-xs-4 control-label">初始底数：</label>
               <div class="col-xs-8">
                 <input class="form-control input_view" style=""
                        type="number"
                        v-model="userfile.f_initial_base"
-                       :value="userfile.f_initial_base"
+                       :value="userfile.f_meter_base"
                        placeholder="初始底数"
                        :readonly="mark === 1"/>
               </div>
@@ -325,6 +325,29 @@
         </footer>
       </modal>
     </validator>
+    <validator name="x">
+      <modal v-if="showDeleteModel" :show.sync="showDeleteModel" v-ref:modal :large="true" :backdrop="false">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeUserFile"><span>&times;</span></button>
+          <h4 class="modal-title">销户原因</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group row vertical-center" :class="[$v.f_cancel_cause.required ? 'has-error' : '']">
+            <label class="col-xs-2 control-label">销户原因：</label>
+            <div class="col-xs-10">
+              <input class="form-control input_view" style=""
+                     placeholder="销户原因"
+                     v-validate:f_cancel_cause = "['required']"
+                     v-model="userinfo.f_cancel_cause"
+                     :value.sync="userinfo.f_cancel_cause"/>
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" @click="deleteUser" :disabled="!$x.valid">确认</button>
+        </footer>
+      </modal>
+    </validator>
   </div>
 
 </template>
@@ -357,8 +380,10 @@ export default {
       userfile: {},
       meterBrandList: [],
       gasModelList: [],
+      showUserInformation: {},
       scanCodeConfig: null,
-      gasbrandDisable: false
+      gasbrandDisable: false,
+      showDeleteModel: false
     }
   },
   ready () {
@@ -439,8 +464,8 @@ export default {
 
       for (const item of this.meterBrandList) {
         if (item.label === factory) {
-          this.userfile.f_gasbrand_id = item.value
-          this.gasbrandChange()
+          // this.userfile.f_gasbrand_id = item.value
+          // this.gasbrandChange()
           break
         }
       }
@@ -450,12 +475,22 @@ export default {
       this.meternumberValidate()
     },
     async deleteUserinfo (row) {
+      this.userinfo = row
       let res = await this.$showMessage('此操作不可撤回，您确定要删除这条记录吗？')
       if (res === 'cancel') {
         return
       }
+      this.showDeleteModel = !this.showDeleteModel
+    },
+    async deleteUser () {
+      let res = await this.$showMessage('此操作不可撤回，您确定要删除这条记录吗？')
+      if (res === 'cancel') {
+        return
+      }
+
       let data = {
-        userinfo: row,
+        login: Vue.user,
+        userinfo: this.userinfo,
         selectdata: this.selectdata
       }
       res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/applyDeleteUserinfo`, {data:data}, {
@@ -467,7 +502,13 @@ export default {
     },
     // 保存档案
     async saveUserFile() {
-      this.meternumberValidate()
+      if (this.selectdata.defname === '工程施工') {
+        this.meternumberValidate()
+        if (this.userfile.f_meter_base - 0 === 0 || this.userfile.f_meter_base - 0 > 1.5) {
+          this.$showAlert('表读数必须大于0小于或等于1.5！', 'warning', 3000)
+          throw '表读数必须大于0小于或等于1.5！'
+        }
+      }
       let data = {
         user: Vue.user,
         userinfo: this.userinfo,
@@ -481,7 +522,7 @@ export default {
       this.$dispatch('breakControl', this.selectdata)
     },
     ifDisable() {
-      if (this.selectdata.f_apply_type === '非民用报建' && this.selectdata.defname === '工程施工') {
+      if ( this.selectdata.defname === '工程施工') {
         this.gasbrandDisable = true
       }
     },
@@ -637,14 +678,10 @@ export default {
           this.gasModelList = res.data
         }
       }
-      if (!row && this.selectdata.f_apply_type === '民用报建' && this.selectdata.f_apply_nature === '小区') {
-        if (!this.selectdata.f_residential_area_id){
-          this.$showAlert('请选择小区/巷道后添加用户', 'warning', 3000)
-          return
-        }
+      if (this.selectdata.f_residential_area_id) {
         let data = {
           tablename: 't_area_address',
-          condition: `id = ${this.selectdata.f_residential_area_id}`
+          condition: `id = '${this.selectdata.f_residential_area_id}'`
         }
         let http = new HttpResetClass()
         let res = await http.load(
@@ -653,13 +690,24 @@ export default {
           {data: data},
           {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
         )
+
         this.area = res.data[0]
         this.selectArea(this.area.f_residential_area)
         this.changeArea()
         this.addressSplicing()
       }
 
-
+      // 档案回填定位信息
+      this.userinfo.f_lng = this.selectdata.f_lng
+      this.userinfo.f_lat = this.selectdata.f_lat
+      this.userinfo.f_location_address = this.selectdata.f_order_address
+      if(!row){
+        // 档案回填用户信息
+        this.showUserInformation.f_user_name = this.selectdata.f_user_name
+        this.showUserInformation.f_user_phone = this.selectdata.f_phone
+        this.showUserInformation.f_credentials = this.selectdata.f_credentials
+        this.showUserInformation.f_idnumber = this.selectdata.f_idnumber
+      }
       this.showModal = true
     },
     // 获取气表品牌
@@ -745,6 +793,7 @@ export default {
       this.userinfo = {}
       this.userfile = {}
       this.gasModelList = {}
+      this.showDeleteModel = false
       this.search()
     }
   },

package/src/components/android/Process/Processes/newAppDevicesManagement.vue

@@ -2,7 +2,7 @@
 
   <div>
     <div class="col-xs-12 col-xs-12 form-group app-btn">
-      <button class="btn btn-info" @click.prevent="openDevicesModal()" :disabled="mark === 1">添加</button>
+<!--      <button class="btn btn-info" @click.prevent="openDevicesModal()" :disabled="mark === 1">添加</button>-->
     </div>
     <div class="col-xs-12 col-xs-12">
       <list :model="model" partial='list'>
@@ -206,6 +206,7 @@ export default {
         return
       }
       let data = {
+        login: Vue.user,
         userinfo: row,
         selectdata: this.selectdata
       }

package/src/components/android/Process/Processes/newAppInstallationDetails.vue

@@ -406,8 +406,8 @@ export default {
 
       for (const item of this.meterBrandList) {
         if (item.label === factory) {
-          this.userfile.f_gasbrand_id = item.value
-          this.gasbrandChange()
+          // this.userfile.f_gasbrand_id = item.value
+          // this.gasbrandChange()
           break
         }
       }
@@ -443,10 +443,10 @@ export default {
         this.$showAlert('请先选择气表品牌！！！', 'warning', 3000)
         return
       }
-      if (this.newUserfile.f_gasbrand_id && this.newUserfile.f_meternumber) {
+      if (this.newUserfile.f_new_gasbrand_id && this.newUserfile.f_new_meternumber) {
         let data = {
-          f_meternumber: this.newUserfile.f_meternumber,
-          f_gasbrand_id: this.newUserfile.f_gasbrand_id
+          f_meternumber: this.newUserfile.f_new_meternumber,
+          f_gasbrand_id: this.newUserfile.f_new_gasbrand_id
         }
         if (this.newUserfile.f_user_id) {
           data.f_user_id = this.newUserfile.f_user_id