apply-clients 4.1.76 → 4.1.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.76",
+  "version": "4.1.77",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Process/Processes/InstallationDetails.vue

@@ -279,6 +279,15 @@ export default {
     },
     // 保存档案
     async saveUserFile() {
+      console.log("当前表具信息",this.userinfo.userfiles[0])
+      if ((this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋集中器' ||
+          this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋4G物联网表' ||
+          this.userinfo.userfiles[0].gasbrand.f_meter_brand === '先锋NB物联网表') &&
+        !/^[a-zA-Z0-9]{10}$/.test(this.userinfo.userfiles[0].f_meternumber))
+      {
+        this.$showAlert('请输入10位表号！！！', 'warning', 2000)
+        return
+      }
       let data = {
         user: this.$login.f,
         useradders: this.useradders,
@@ -295,7 +304,15 @@ export default {
     async meternumberValidate(i) {
       if (!this.userinfo.userfiles[i].f_gasbrand_id) {
         this.userinfo.userfiles[i].f_meternumber = ''
-        this.$showAlert('请先选择气表品牌！！！', 'warning', 3000)
+        this.$showAlert('请先选择气表品牌！！！', 'warning', 2000)
+        return
+      }
+      if ((this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋集中器' ||
+        this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋4G物联网表' ||
+        this.userinfo.userfiles[i].gasbrand.f_meter_brand === '先锋NB物联网表') &&
+        !/^[a-zA-Z0-9]{10}$/.test(this.userinfo.userfiles[i].f_meternumber))
+      {
+        this.$showAlert('请输入10位表号！！！', 'warning', 2000)
         return
       }
       if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {

package/src/components/product/Process/Processes/addressAndUserinfoManagement.vue

@@ -39,6 +39,13 @@
           <th v-if="$parent.$parent.showremark" class="textNoLineBreak">退回理由</th>
           <th v-if="$parent.$parent.signReason" class="textNoLineBreak">标记原因</th>
           <th  class="textNoLineBreak">
+            <button
+              type="button"
+              class="btn btn-info head-but"
+              v-if="$parent.$parent.selectdata.defname === '报建登记' && $parent.$parent.mark !== 1"
+              @click="$parent.$parent.openModal()"
+              :disabled="$parent.$parent.mark === 1"
+            >添加</button>
             <button  v-if="$parent.$parent.showback && $parent.$parent.mark !== 1 "type="button" class="btn btn-info head-but"
                      @click="$parent.$parent.unpass()">退回</button>
             <button  v-if="$parent.$parent.void && $parent.$parent.mark !== 1"type="button" class="btn btn-info head-but"
@@ -652,7 +659,194 @@
     </footer>
   </modal>
 
-
+  <validator name="v">
+  <modal v-if="showModal" :show.sync = "showModal" v-ref:modal :backdrop = "false" title="添加用户">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeUserModal"><span>&times;</span></button>
+      <h4 class="modal-title">添加用户</h4>
+    </header>
+    <acticle slot="modal-body" class="modal-body">
+      <!-- 基本信息 -->
+      <div class="form-group col-sm-12 panel panel-info" >
+        <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+          <div class="col-sm-6 text-left">用户信息</div>
+        </div>
+        <div class="form-group col-sm-6" :class="[$v.f_user_name.required ? 'has-error' : '']">
+          <label class="col-sm-4 control-label">用户名称：</label>
+          <div class="col-sm-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"
+                   :readonly="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+                   placeholder="客户名称"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-6" :class="[$v.f_user_phone.required ? 'has-error' : '']">
+          <label class="col-sm-4 control-label">用户电话：</label>
+          <div class="col-sm-7">
+            <input class="form-control input_view" style=""
+                   v-validate:f_user_phone = "['required']"
+                   v-model="userinfo.f_user_phone"
+                   :value.sync="userinfo.f_user_phone"
+                   :readonly="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+                   placeholder="客户电话"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">证件类型：</label>
+          <div class="col-sm-7">
+            <input-select
+              class="select select_list"
+              :value.sync="'身份证'"
+              v-model="userinfo.f_credentials"
+              :options="credentialsList"
+              :disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常' || $parent.$parent.selectdata.f_apply_type === '散户报建'"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">用户类型：</label>
+          <div class="col-sm-7">
+            <input-select
+              class="select select_list"
+              :value.sync="userinfo.f_user_nature"
+              v-model="userinfo.f_user_nature"
+              :options="getUserType"
+              :disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">证件号码：</label>
+          <div class="col-sm-7">
+            <input class="form-control input_view" style=""
+                   placeholder="证件号码"
+                   v-model="userinfo.f_idnumber"
+                   :value="userinfo.f_idnumber"
+                   :readonly="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"/>
+          </div>
+        </div>
+      </div>
+      <!-- 地址信息 -->
+      <div class="form-group col-sm-12 panel panel-info" >
+        <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+          <div class="col-sm-6 text-left">地址信息</div>
+        </div>
+        <div class="form-group col-sm-6" :class="[$v.f_address_type.required ? 'has-error' : '']">
+          <label class="col-sm-4 control-label">地址类型：</label>
+          <div class="col-sm-7">
+            <input type="text" v-show="false" v-model="userinfo.useradders.f_address_type" :value.sync="userinfo.useradders.f_address_type" v-validate:f_address_type = "['required']" >
+            <input-select
+              class="select select_list"
+              :value.sync="userinfo.useradders.f_address_type"
+              v-model="userinfo.useradders.f_address_type"
+              :options="addressType"
+              @change="addressTypeChange()"
+              :disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-6" :class="[$v.f_pcd.required ? 'has-error' : '']">
+          <label class="col-sm-4 control-label">区&emsp;&emsp;域：</label>
+          <div class="col-sm-7">
+            <input type="text" v-show="false" v-model="userinfo.useradders.f_pcd" :value.sync="userinfo.useradders.f_pcd" v-validate:f_pcd = "['required']" >
+            <input-select
+              class="select select_list"
+              :value.sync="userinfo.useradders.f_pcd"
+              v-model="userinfo.useradders.f_pcd"
+              :options="pcdList"
+              @change="addressSplicing(), getStreet()"
+              :disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-6" :class="[$v.f_street.required ? 'has-error' : '']">
+          <label class="col-sm-4 control-label">街&emsp;&emsp;道：</label>
+          <div class="col-sm-7">
+            <input type="text" v-show="false" v-model="userinfo.useradders.f_street" :value.sync="userinfo.useradders.f_street" v-validate:f_street = "['required']" >
+            <input-select
+              class="select select_list"
+              :value.sync="userinfo.useradders.f_street"
+              v-model="userinfo.useradders.f_street"
+              :options="streetList"
+              @change="addressSplicing(), getResidentialArea()"
+              :disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">小&emsp;&emsp;区：</label>
+          <div class="col-sm-7">
+            <input-select
+              class="select select_list"
+              :value.sync="userinfo.useradders.f_residential_area"
+              v-model="userinfo.useradders.f_residential_area"
+              :options="areaList"
+              @change="addressSplicing()"
+              :disable="$parent.$parent.mark === 1 || userinfo.f_user_state === '正常'"
+              :valueSingle="true"></input-select>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">楼&emsp;&emsp;号：</label>
+          <div class="col-sm-7">
+            <input class="form-control input_view" placeholder="楼号"
+                   v-model="userinfo.useradders.f_building"
+                   :value="userinfo.useradders.f_building"
+                   @change="addressSplicing"
+                   :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">单&emsp;&emsp;元：</label>
+          <div class="col-sm-7">
+            <input class="form-control input_view" placeholder="单元"
+                   v-model="userinfo.useradders.f_unit"
+                   :value="userinfo.useradders.f_unit"
+                   @change="addressSplicing"
+                   :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-6">
+          <label class="col-sm-4 control-label">楼&emsp;&emsp;层：</label>
+          <div class="col-sm-7">
+            <input class="form-control input_view" placeholder="楼层"
+                   v-model="userinfo.useradders.f_floor"
+                   :value="userinfo.useradders.f_floor"
+                   @change="addressSplicing"
+                   :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-6" >
+          <label class="col-sm-4 control-label">门&ensp;牌&ensp;号：</label>
+          <div class="col-sm-7">
+            <input class="form-control input_view" placeholder="门牌号"
+                   v-model="userinfo.useradders.f_room"
+                   :value="userinfo.useradders.f_room"
+                   @change="addressSplicing"
+                   :readonly="mark === 1 || userinfo.f_user_state === '正常'"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-12">
+          <label class="col-sm-2 control-label">地&emsp;&emsp;址：</label>
+          <div class="col-sm-9">
+            <input class="form-control input_view"
+                   placeholder="地址"
+                   v-model="userinfo.useradders.f_address"
+                   :value.sync="userinfo.useradders.f_address"
+                   />
+          </div>
+        </div>
+      </div>
+    </acticle>
+    <footer slot="modal-footer" class="modal-footer">
+      <template v-if="mark !== 1 && userinfo.f_user_state !== '正常'">
+        <button type="button" class="btn btn-primary" @click="saveUser" :disabled="!$v.valid">确认</button>
+      </template>
+    </footer>
+  </modal>
+  </validator>
   <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
     <header slot="modal-header" class="modal-header">
       <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
@@ -668,6 +862,7 @@
 
 </template>
 <script>
+import Vue from 'vue'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 import {isEmpty} from "../../../Util";
@@ -712,6 +907,12 @@ export default {
       record:'',
       all:[],
       remark:'',
+      showModal: false,
+      addressType:[{label: "民用地址", value: "民用地址"}, {label: "特殊地址", value: "特殊地址"}],
+      addressDis:true,
+      pcdList:[],
+      streetList:[],
+      areaList:[],
       getfield: {
         "f_pcd": "省市区",
         "f_street": "街道",
@@ -767,6 +968,7 @@ export default {
     {
       this.showcover=true
     }
+    this.getPcd()
     this.search()
   },
   methods: {
@@ -1123,6 +1325,10 @@ export default {
       this.search()
       console.log("145")
     },
+    closeUserModal(){
+      this.userinfo = null
+      this.showModal = false
+    },
     async saveUserFile() {
       this.showUserFile = false
       console.log("987")
@@ -1148,7 +1354,7 @@ export default {
         this.$showAlert(e.data, 'danger', 3000)
       }
       this.search()
-      // this.$dispatch('breakControl', this.selectdata)
+      this.$dispatch('breakControl', this.selectdata)
     },
     recoverupload(row) {
       this.record=row
@@ -1181,6 +1387,113 @@ export default {
       this.$dispatch('unpass',this.selectedData)
       this.$dispatch('breakControl', this.selectdata)
     },
+    openModal(){
+      this.showModal = true
+    },
+    //地址类型变化
+    addressTypeChange(){
+      if (this.userinfo.useradders.f_apply_type === '民用地址'){
+        this.addressDis = true
+      }else {
+        this.addressDis = false
+      }
+    },
+    // 获取区县
+    async getPcd() {
+      let data = {
+        tablename: 't_pcd',
+        condition: `f_filialeid = '${this.$login.f.orgid}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '区县查询失败！！！'}
+      )
+
+      this.pcdList =  res.data.map(item => {
+        return {
+          label: item.f_pcd,
+          value: item.f_pcd
+        }
+      })
+      console.log("区县",this.pcdList)
+    },
+    //获取街道
+    async getStreet() {
+      let data = {
+        tablename: 't_street',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_pcd = '${this.userinfo.useradders.f_pcd}'`
+      }
+
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '街道查询失败！！！'}
+      )
+
+      this.streetList = res.data.map(item => {
+        return {
+          label: item.f_street,
+          value: item.f_street
+        }
+      })
+    },
+    //获取小区
+    async getResidentialArea() {
+
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${this.$login.f.orgid}' and f_street = '${this.userinfo.useradders.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+      )
+
+     this.areaList = res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      })
+    },
+    // 地址拼接
+    addressSplicing () {
+      let f_pcd = this.userinfo.useradders.f_pcd || ''
+      let f_area = this.userinfo.useradders.f_area || ''
+      let f_slice_area = this.userinfo.useradders.f_slice_area || ''
+      let f_street = this.userinfo.useradders.f_street || ''
+      let f_residential_area = this.userinfo.useradders.f_residential_area || ''
+      let f_building = this.userinfo.useradders.f_building || ''
+      let f_building_suffix = f_building ? '号楼' : ''
+      let f_unit = this.userinfo.useradders.f_unit || ''
+      let f_unit_suffix = f_unit ? '单元' : ''
+      let f_floor = this.userinfo.useradders.f_floor || ''
+      let f_floor_suffix = f_floor ? '层' : ''
+      let f_room = this.userinfo.useradders.f_room || ''
+      let f_room_suffix = f_room ? '室' : ''
+
+      Vue.set(this.userinfo.useradders, 'f_address', f_pcd + f_area + f_slice_area + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix)
+    },
+    async saveUser () {
+      let data = {
+        user: this.$login.f,
+        userinfo: this.userinfo,
+        selectdata: this.selectdata
+      }
+      let res = await this.$resetpost('rs/logic/applyAddUserinfo', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '用户档案添加失败！！！'
+      })
+      this.$dispatch('breakControl', res.data)
+    }
   },
   events: {
     async 'onFileUpload'(file, result) {
@@ -1216,6 +1529,13 @@ export default {
         f_process_id: this.selectdata.f_process_id,
       }
       return data
+    },
+    // 证件类型
+    credentialsList() {
+      return this.$appdata.getParam('证件类型')
+    },
+    getUserType(){
+      return this.$appdata.getParam('用户类型')
     }
   },
   watch: {

package/src/components/product/Process/Service/ServiceControl.vue

@@ -1,7 +1,7 @@
 <template>
 
   <div class="auto clearfix">
-    <show-back-reason :selectdata="show_data"></show-back-reason>
+    <show-back-reason :selectdata="selectdata"></show-back-reason>
     <stop-install :data="show_data"  v-if="stope_view"></stop-install>
   </div>
 

package/src/components/product/Process/ShowBackReason.vue

@@ -1,32 +1,33 @@
-<template>
-  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
-      <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">    请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
-  </div>
-</template>
-<script>
-  import {HttpResetClass} from 'vue-client'
-
-  export default {
-    title: '退回原因展示',
-    props: ['selectdata'],
-    data () {
-      return {
-        data: null
-      }
-    },
-    async created () {
-      if (this.selectdata) {
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_backcause',
-          condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: null
-        })
-        this.data = res.data[0]
-      }
-    }
-  }
-</script>
+<template>
+  <div style="height: auto;text-align: center" class="col-sm-12" v-if="data != null">
+      <span style="color: red;font-family: 微软雅黑;font-weight: bold;font-size: 18px">    请注意被退回原因为:{{data.f_back_reason}} 退回时间：{{data.f_date}}</span>
+  </div>
+</template>
+<script>
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '退回原因展示',
+    props: ['selectdata'],
+    data () {
+      return {
+        data: null
+      }
+    },
+    async created () {
+      if (this.selectdata) {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_backcause',
+          condition: `actid = '${this.selectdata.actid}' and f_process_id='${this.selectdata.f_process_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        this.data = res.data[0]
+        console.log("ce",this.data)
+      }
+    }
+  }
+</script>