apply-clients 7.1.34 → 7.1.37

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

@@ -1,6 +1,6 @@
 <template>
   <div class="flex-row">
-    <div class="basic-main">
+    <div class="basic-main" style="overflow: auto;width: 100%">
       <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
         <exploration-select v-ref:query :show-data="showData"></exploration-select>
       </div>

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

@@ -134,7 +134,17 @@
                    :readonly="false"/>
           </div>
         </div>
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-6" v-if="$parent.$parent.selectdata.defname === '点火通气'" :class="item.f_metertitles ? '':'has-error'">
+          <label class="col-sm-4 control-label">表封号：</label>
+          <div class="col-sm-8">
+            <input class="form-control input_view" style=""
+                   placeholder="表封号"
+                   v-model="item.f_metertitles"
+                   :value="item.f_metertitles"
+                   :readonly="false"/>
+          </div>
+        </div>
+        <div class="form-group col-sm-6" v-if="$parent.$parent.selectdata.defname !== '点火通气'">
           <label class="col-sm-4 control-label">表封号：</label>
           <div class="col-sm-8">
             <input class="form-control input_view" style=""
@@ -166,7 +176,7 @@
                    :readonly="false"/>
           </div>
         </div>
-        <div class="form-group col-sm-6">
+        <div class="form-group col-sm-6"  :class="item.f_aroundmeter ? '':'has-error'">
           <label class="col-sm-4 control-label">表向：</label>
           <div class="col-sm-8">
             <input-select
@@ -188,6 +198,16 @@
               :valueSingle="true"></input-select>
           </div>
         </div>
+        <div class="form-group col-sm-6" :class="$parent.$parent.userinfo.f_room ? '':'has-error'" v-if="$parent.$parent.selectdata.defname === '点火通气'">
+          <label class="col-sm-4 control-label">门牌号：</label>
+          <div class="col-sm-8">
+            <input class="form-control input_view" style=""
+                   placeholder="门牌号"
+                   v-model="$parent.$parent.userinfo.f_room"
+                   :value="$parent.$parent.userinfo.f_room"
+                   :readonly="false"/>
+          </div>
+        </div>
         <div class="form-group col-sm-6">
           <label class="col-sm-4 control-label">安装人：</label>
           <div class="col-sm-8">
@@ -276,6 +296,20 @@ export default {
           this.$showAlert(`表具${i+1}表号没有填写！！！`, 'warning', 3000)
           return
         }
+        if (userfile.f_aroundmeter === null || userfile.f_aroundmeter === '') {
+          this.$showAlert(`表具${i+1}表向没有填写！！！`, 'warning', 3000)
+          return
+        }
+        if (this.selectdata.defname === '通气下发'){
+          if (userfile.f_metertitles === null || userfile.f_metertitles === '') {
+            this.$showAlert(`表具${i+1}表封号没有填写！！！`, 'warning', 3000)
+            return
+          }
+          if (this.userinfo.f_room === null || this.userinfo.f_room === '') {
+            this.$showAlert(`表具${i+1}门牌号没有填写！！！`, 'warning', 3000)
+            return
+          }
+        }
       }
       let data = {
         user: this.$login.f,
@@ -352,16 +386,18 @@ export default {
       this.userinfo = res.data
 
       // 已有表具的 气表信息补充
-      for (const userfile of this.userinfo.userfiles) {
+      for (let i = 0; i < this.userinfo.userfiles.length; i++) {
         for (const item of this.meterbrands) {
-          if (item.value.id === userfile.f_gasbrand_id) {
-            userfile.gasbrand = item.value
+          if (item.value.id === this.userinfo.userfiles[i].f_gasbrand_id) {
+            // this.userinfo.userfiles[i].gasbrand = item.value // 防止双向绑定失败
+            Vue.set(this.userinfo.userfiles[i], 'gasbrand', item.value)
           }
         }
-        if (userfile.gasbrand) {
-          for (const item of userfile.gasbrand.gasmodel) {
-            if (item.value.id === userfile.f_gasmodel_id) {
-              userfile.gasmodel = item.value
+        if (this.userinfo.userfiles[i].gasbrand) {
+          for (const item of this.userinfo.userfiles[i].gasbrand.gasmodel) {
+            if (item.value.id === this.userinfo.userfiles[i].f_gasmodel_id) {
+              // this.userinfo.userfiles[i].gasmodel = item.value
+              Vue.set(this.userinfo.userfiles[i], 'gasmodel', item.value)
             }
           }
         }

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

@@ -1,249 +1,261 @@
-<template>
-  <div class="col-sm-12" style="margin: 20px 0px;">
-      <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
-        <template partial='head'>
-          <tr>
-            <th class="textNoLineBreak">序号</th>
-            <th class="textNoLineBreak">区/县</th>
-            <th class="textNoLineBreak">片区</th>
-            <th class="textNoLineBreak">街道</th>
-            <th class="textNoLineBreak">小区</th>
-            <th class="textNoLineBreak">详细地址</th>
-            <th class="textNoLineBreak">用户状态</th>
-            <th class="textNoLineBreak">客户编号</th>
-            <th class="textNoLineBreak">用户姓名</th>
-            <th class="textNoLineBreak">电话</th>
-            <th class="textNoLineBreak">证件类型</th>
-            <th class="textNoLineBreak">证件号码</th>
-            <th class="textNoLineBreak">时间</th>
-            <th class="textNoLineBreak">
-              <button type="button" class="btn btn-info head-but"
-                      @click="$parent.$parent.showFileModal()">导入</button>
-              <a type="button" class="btn btn-info head-but"
-                      href="/applyinstall/Excel/v3报装地址批量导入.xlsx" download>模板下载</a>
-            </th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_slice_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_street}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_residential_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_state}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_userinfo_code}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_name}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_phone}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_credentials}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_idnumber}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_createfile_date}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.updateState(row.f_userinfo_id,0)"
-                >操作</button>
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.updateState(row.f_userinfo_id,1)"
-                >撤销</button>
-              </nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-  </div>
-  <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>
-      <h4 class="modal-title">选择文件</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer"></footer>
-  </modal>
-
-</template>
-<script>
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '地址管理',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0        // 0：正常  1：禁用 2：追加用户
-    }
-  },
-  data () {
-    return {
-      showFile: false,
-      model: {
-        data: null
-      }
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    showFileModal() {
-      for (let i = 0; i < this.selectdata.fields.length; i++) {
-        let item = this.selectdata.fields[i]
-        if (item.label === '街道' && !item.value) {
-          this.$showAlert('街道地址不能为空！！！', 'warning', 3000)
-          return
-        }
-        // if (item.label === '小区' && !item.value) {
-        //   this.$showAlert('小区不能为空！！！', 'warning', 3000)
-        //   return
-        // }
-      }
-      this.showFile = !this.showFile
-    },
-    async search () {
-      let http = new HttpResetClass()
-      let data = {
-        condition: " 1=1",
-        f_filialeid: this.$login.f.f_orgids,
-        f_process_id: this.selectdata.f_process_id
-      }
-      let res = await http.load('POST', 'rs/sql/getAddressAanUserinfo', {data:data}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
-      this.model.data = res.data
-      for (let i = 0; i < this.selectdata.fields.length; i++) {
-        if (this.selectdata.fields[i].label === '户数') {
-          this.selectdata.fields[i].value = res.data.length
-        }
-      }
-    },
-    // 关闭文件上传对话框
-    closeFile() {
-      this.showFile = false
-      // 将选的文件清空
-      this.$refs.file.$el.querySelector('input').value = ''
-      this.search()
-    },
-    updateState(f_userinfo_id,num) {
-      let http = new HttpResetClass()
-      let data = {
-        f_userinfo_id: f_userinfo_id,
-        num: num
-      }
-      if (num == 0) {
-        this.$showMessage('确定要修改用户状态为不符合吗！！！', ['confirm']).then(async (res) => {
-          if (res === 'confirm') {
-            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
-              resolveMsg: null,
-              rejectMsg: null
-            })
-
-            this.$showMessage("修改成功！")
-            this.search()
-
-          }
-        })
-      }else {
-        this.$showMessage('确定要撤销用户状态为正常吗！！！', ['confirm']).then(async (res) => {
-          if (res === 'confirm') {
-            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
-              resolveMsg: null,
-              rejectMsg: null
-            })
-
-            this.$showMessage("修改成功！")
-            this.search()
-
-          }
-        })
-      }
-
-
-    }
-  },
-  events: {
-    async 'onFileUpload'(file, result) {
-      let data = {
-        selectdata: this.selectdata,
-        filepath: result.f_downloadpath,
-        user: this.$login.f,
-        mark: this.mark
-      }
-      let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
-
-      if(res.data){
-        let mm = '';
-        for(var i=0;i<res.data.msg.length;i++){
-          mm+=`${res.data.msg[i].msg}` + "   "
-        }
-        let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
-        this.$showMessage(msg)
-      }else {
-        this.$showAlert('导入出错,请检查导入文件模板格式!','danger',2000);
-      }
-      if (this.mark !== 0) {
-        this.$dispatch('breakControl', this.selectdata)
-      }
-      this.closeFile()
-    }
-  },
-  computed: {
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped>
-  .textNoLineBreak {
-    white-space: nowrap;
-  }
-  .head-but{
-    margin-left: 5px;
-    height: 34px;
-    /*background-color: #6aa6e2;*/
-    border-radius: 4px;
-    font-family: PingFang;
-    color: #ffffff;
-  }
-</style>
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+      <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+        <template partial='head'>
+          <tr>
+            <th class="textNoLineBreak">序号</th>
+            <th class="textNoLineBreak">区/县</th>
+            <th class="textNoLineBreak">片区</th>
+            <th class="textNoLineBreak">街道</th>
+            <th class="textNoLineBreak">小区</th>
+            <th class="textNoLineBreak">详细地址</th>
+            <th class="textNoLineBreak">用户状态</th>
+            <th class="textNoLineBreak">客户编号</th>
+            <th class="textNoLineBreak">用户姓名</th>
+            <th class="textNoLineBreak">电话</th>
+            <th class="textNoLineBreak">证件类型</th>
+            <th class="textNoLineBreak">证件号码</th>
+            <th class="textNoLineBreak">时间</th>
+            <th class="textNoLineBreak">
+              <button type="button" class="btn btn-info head-but"
+                      @click="$parent.$parent.showFileModal()">导入</button>
+              <a type="button" class="btn btn-info head-but"
+                      href="/applyinstall/Excel/v3报装地址批量导入.xlsx" download>模板下载</a>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_slice_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_street}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_residential_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_address}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_state}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userinfo_code}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_phone}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_credentials}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_idnumber}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_createfile_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  @click="$parent.$parent.updateState(row.f_userinfo_id,0)"
+                >操作</button>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  @click="$parent.$parent.updateState(row.f_userinfo_id,1)"
+                >撤销</button>
+              </nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+  </div>
+  <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>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer"></footer>
+  </modal>
+
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '地址管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0        // 0：正常  1：禁用 2：追加用户
+    }
+  },
+  data () {
+    return {
+      showFile: false,
+      model: {
+        data: null
+      }
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    async queryUserPrice() {
+      let http = new HttpResetClass()
+      let data = {
+        condition: "f_process_id = '" + this.selectdata.f_process_id + "'",
+        tablename: "t_one_price"
+      }
+      let res = await http.load('POST', 'rs/sql/apply_singleTable', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      this.model.data = res.data
+    },
+    showFileModal() {
+      for (let i = 0; i < this.selectdata.fields.length; i++) {
+        let item = this.selectdata.fields[i]
+        if (item.label === '街道' && !item.value) {
+          this.$showAlert('街道地址不能为空！！！', 'warning', 3000)
+          return
+        }
+        // if (item.label === '小区' && !item.value) {
+        //   this.$showAlert('小区不能为空！！！', 'warning', 3000)
+        //   return
+        // }
+      }
+      this.showFile = !this.showFile
+    },
+    async search () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: " 1=1",
+        f_filialeid: this.$login.f.f_orgids,
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', 'rs/sql/getAddressAanUserinfo', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      this.model.data = res.data
+      for (let i = 0; i < this.selectdata.fields.length; i++) {
+        if (this.selectdata.fields[i].label === '户数') {
+          this.selectdata.fields[i].value = res.data.length
+        }
+      }
+    },
+    // 关闭文件上传对话框
+    closeFile() {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.search()
+    },
+    updateState(f_userinfo_id,num) {
+      let http = new HttpResetClass()
+      let data = {
+        f_userinfo_id: f_userinfo_id,
+        num: num
+      }
+      if (num == 0) {
+        this.$showMessage('确定要修改用户状态为不符合吗！！！', ['confirm']).then(async (res) => {
+          if (res === 'confirm') {
+            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+
+            this.$showMessage("修改成功！")
+            this.search()
+
+          }
+        })
+      }else {
+        this.$showMessage('确定要撤销用户状态为正常吗！！！', ['confirm']).then(async (res) => {
+          if (res === 'confirm') {
+            let res = await http.load('POST', 'rs/logic/updateUserinfoState', {data:data}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+
+            this.$showMessage("修改成功！")
+            this.search()
+
+          }
+        })
+      }
+
+
+    }
+  },
+  events: {
+    async 'onFileUpload'(file, result) {
+      let data = {
+        selectdata: this.selectdata,
+        filepath: result.f_downloadpath,
+        user: this.$login.f,
+        mark: this.mark
+      }
+      let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
+
+      if(res.data){
+        let mm = '';
+        for(var i=0;i<res.data.msg.length;i++){
+          mm+=`${res.data.msg[i].msg}` + "   "
+        }
+        let msg = `共导入${res.data.alllength}条,失败${res.data.errorlen}条,失败信息:${mm}`
+        this.$showMessage(msg)
+      }else {
+        this.$showAlert('导入出错,请检查导入文件模板格式!','danger',2000);
+      }
+      if (this.mark !== 0) {
+        this.$dispatch('breakControl', this.selectdata)
+      }
+      this.closeFile()
+    }
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+  .textNoLineBreak {
+    white-space: nowrap;
+  }
+  .head-but{
+    margin-left: 5px;
+    height: 34px;
+    /*background-color: #6aa6e2;*/
+    border-radius: 4px;
+    font-family: PingFang;
+    color: #ffffff;
+  }
+</style>