apply-clients 3.2.36 → 3.2.49

package/src/components/product/{Function → Apply/Function}/functions/StopInstall.vue

@@ -2,12 +2,12 @@
   <div class="col-sm-12 auto">
     <validator name="v">
       <form class="form-horizontal">
-        <div class="form-group col-sm-12" style="margin: 100px 0px">
+        <div :class="f_stop_reason ? 'form-group col-sm-12' : 'form-group col-sm-12 has-error'" style="margin: 100px 0px">
           <div class="col-sm-2">
             <label class="control-label col-sm-12">终止原因：</label>
           </div>
           <div class="col-sm-10">
-            <textarea class="form-control" rows="3" v-model="model.f_stop_remarks"></textarea>
+            <textarea class="form-control" rows="3" v-model="f_stop_reason"></textarea>
           </div>
         </div>
         <div class="col-sm-12 form-group text-center">
@@ -47,7 +47,7 @@
 
     <div class="from-group col-sm-12">
       <center>
-        <button type="button" @click="confirm()" :disabled="disabled" class="btn btn-primary" style="width: 100px">
+        <button type="button" @click="confirm()" :disabled="!f_stop_reason" class="btn btn-primary" style="width: 100px">
           保存
         </button>
       </center>
@@ -55,7 +55,7 @@
   </div>
 </template>
 <script>
-  import * as Util from '../../../Util'
+  import * as Util from '../../../../Util'
   import {HttpResetClass} from 'vue-client'
   export default {
     title: '终止报建',
@@ -66,39 +66,25 @@
           f_date: Util.toStandardTimeString(),
           f_department: this.$login.f.f_department_name,
           f_operator: this.$login.f.name,
-          f_filiale: this.$login.f.orgs,
-          f_stop_remarks: null
+          f_filiale: this.$login.f.orgs
         },
-        disabled: true // 是否禁用确认按钮
+        f_stop_reason: null
       }
     },
     methods: {
       // 点击确认提交
-      confirm () {
-        this.disabled = true
+      async confirm () {
         let http = new HttpResetClass()
         let data = {
-          loginUser: this.$login.f,
+          user: this.$login.f,
           selectdata: this.data,
-          model: this.model
+          f_stop_reason: this.f_stop_reason
         }
-        http.load('POST', 'rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
-          .then(res => {
-            if (res.data === 200) {
-              this.$dispatch('search')
-            } else {
-              this.$showMessage('终止报建失败')
-            }
-          })
+        await http.load('POST', 'rs/logic/stopApply', {data: data}, {resolveMsg: null,rejectMsg: '删除失败'})
+        this.$dispatch('search')
       }
     },
     watch: {
-      // 监控确认按钮
-      'model.f_stop_remarks' (val) {
-        if (val != null || val !== '') {
-          this.disabled = false
-        }
-      }
     }
   }
 </script>

package/src/components/product/{Process → Apply/Process}/ExplorationSelect.vue

@@ -17,7 +17,7 @@
               </div>
               <div class="form-group col-sm-5 button-range">
                 <button class="button_new button_spacing" style="width: max-content"
-                        v-if="this.$login.f.rolesnames.indexOf('市场部报装') !== -1 || this.$login.f.rolesnames.indexOf('工程部报装') !== -1"
+                        v-if="this.$login.f.rolesnames.indexOf('市场部报装') !== -1"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
@@ -79,7 +79,7 @@
                             style="width: 60%!important;"
                             v-model="model.startDate"
                             :value.sync="model.startDate"
-                            :format="'yyyy-MM-dd 00:00:00'"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
                             :show-reset-button="true"
                             condition="f_apply_date >= '{}'">
                 </datepicker>
@@ -90,7 +90,7 @@
                             style="width: 60%!important;"
                             v-model="model.endDate"
                             :value.sync="model.endDate"
-                            :format="'yyyy-MM-dd 23:59:59'"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
                             :show-reset-button="true"
                             condition="f_apply_date <= '{}'">
                 </datepicker>
@@ -194,7 +194,7 @@
 <script>
   import {PagedList} from 'vue-client'
   import {HttpResetClass} from 'vue-client'
-  import {isEmpty} from '../../Util'
+  import {isEmpty} from '../../../Util'
   export default {
     title: '工程列表',
     props: ['showData'],
@@ -221,7 +221,7 @@
     methods: {
       clear () {
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = []
+          this.$refs.cp.$refs.cri.model[key] = null
         })
       },
       // 查询
@@ -275,9 +275,6 @@
         } else if (this.f_apply_type === '开发商集体报建') {
           val.defname = '用户受理'
           val.processname = '开发商集体报建流程'
-        } else if (this.f_apply_type === '煤改气报建') {
-          val.defname = '用户受理'
-          val.processname = '散户集体报建流程'
         } else {
           this.$showMessage('暂无此类报装')
           return

package/src/components/product/{Process → Apply/Process}/ExplorationUser.vue

@@ -4,19 +4,18 @@
       <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
         <exploration-select v-ref:query :show-data="showData"></exploration-select>
       </div>
-      <div v-if="showtotal" style="height: 89%">
+      <div v-if="showtotal">
         <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.defname'>
+          <tab :header='selectdata.defname' style="background-color :#ffffff!important;overflow: auto;">
             <service-control  v-ref:service :selectdata="selectdata"></service-control>
           </tab>
-          <tab header='附件'>
+          <tab header='附件' style="background-color :#ffffff!important;overflow: auto;">
             <apply-upload :blodid="selectdata.f_process_id"
                           :isupload = "true"
                           :isdelete="true"
                           :isusetype="true"
                           :isremark = "true"
                           :takeimg="false"
-                          :issearch="true"
                           :defname="selectdata.defname">
             </apply-upload>
           </tab>

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

@@ -0,0 +1,478 @@
+<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>序号</th>
+            <th>客户编号</th>
+            <th>客户名称</th>
+            <th>客户电话</th>
+            <th>地址信息</th>
+            <th>表具数量</th>
+            <th v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建'">单价（户）</th>
+            <th v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建'">累计缴费</th>
+            <th>
+              <button type="button" class="btn btn-info head-but"
+                      :disabled="$parent.$parent.mark === 1"
+                      @click="$parent.$parent.showFile = !$parent.$parent.showFile">导入</button>
+              <a type="button" class="btn btn-info head-but"
+                 href="/apply/download/excel/安装明细.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_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_address}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userfiles_num === null ? 0 : row.f_userfiles_num}}</nobr>
+            </td>
+            <td style="text-align: center;"
+              v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建'"
+            >
+              <nobr>{{$parent.$parent.selectdata.f_price}}</nobr>
+            </td>
+            <td style="text-align: center;"
+              v-if="$parent.$parent.selectdata.f_apply_type === '散户集体报建'"
+            >
+              <nobr>{{row.f_cumulative_payment_money}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>
+                <button
+                  type="button"
+                  name="button"
+                  class="btn btn-link"
+                  :disabled="(row.f_cumulative_payment_money < $parent.$parent.selectdata.f_price && $parent.$parent.selectdata.f_apply_type === '散户集体报建') || $parent.$parent.mark === 1"
+                   @click="$parent.$parent.showUserFileModal(row)">
+                  {{row.f_userfiles_num > 0 ? '修正' : '添加'}}
+                </button>
+              </nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+  </div>
+  <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" 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>
+
+  <modal v-if="showUserFile" :show.sync="showUserFile" v-ref:modal :large="true" :backdrop="false" title="安装明细">
+    <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 col-sm-12">
+        <label class="col-sm-2 control-label">地址信息：</label>
+        <div class="col-sm-10">
+          <input class="form-control input_view" style=""
+                 v-model="useradders.f_address"
+                 :value="useradders.f_address"
+                 :readonly="true"/>
+        </div>
+      </div>
+
+      <div v-for="(i, item) in userinfo.userfiles" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-heading head" style="background-color: #e8f4ff;margin-bottom: 10px">表具{{$index+1}}信息</div>
+          <div class="form-group col-sm-6" :class="item.f_gasbrand_id ? '':'has-error'">
+            <label class="col-sm-4 control-label">气表品牌：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.gasbrand"
+                v-model="item.gasbrand"
+                :options="meterbrands"
+                @change="gasbrandChange(i)"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="item.f_gasmodel_id ? '':'has-error'">
+            <label class="col-sm-4 control-label">气表型号：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.gasmodel"
+                v-model="item.gasmodel"
+                :options="item.gasbrand.gasmodel"
+                @change="gasmodelChange(i)"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="item.f_meternumber ? '':'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_meternumber"
+                     :value="item.f_meternumber"
+                     @change="meternumberValidate(i)"
+                     :readonly="false"/>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <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">
+            <label class="col-sm-4 control-label">表读数：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     type="number"
+                     placeholder="表读数"
+                     v-model="item.f_meter_base"
+                     :value="item.f_meter_base"
+                     :readonly="false"/>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">初始底数：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     type="number"
+                     v-model="item.f_initial_base"
+                     :value="item.f_initial_base"
+                     placeholder="初始底数"
+                     :readonly="false"/>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">表向：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_aroundmeter"
+                v-model="item.f_aroundmeter"
+                :options="aroundmeters"
+                :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-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_position"
+                v-model="item.f_position"
+                :options="positions"
+                :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-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.f_install_person"
+                v-model="item.f_install_person"
+                :options="installperson"
+                :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-8">
+              <datepicker
+                placeholder="安装日期"
+                :value.sync="item.f_install_date"
+                v-model="item.f_install_date"
+                format="yyyy-MM-dd HH:mm:ss"
+                :show-reset-button="reset">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-primary" @click="addUserFile">添加表具</button>
+      <button type="button" class="btn btn-primary" @click="saveUserFile">确认</button>
+    </footer>
+  </modal>
+</template>
+<script>
+import Vue from 'vue'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from '../../../../Util'
+
+export default {
+  title: '安装明细',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showFile: false,
+      showUserFile: false,
+      model: {
+        data: null
+      },
+      meterbrands: [],      // 气表品牌
+      useradders: null,
+      userinfo: {}
+    }
+  },
+  ready () {
+    this.search()
+    this.getMeterbrands()
+  },
+  methods: {
+    // 保存档案
+    async saveUserFile() {
+      // 检查必填项
+      for (let i = 0; i < this.userinfo.userfiles.length; i++) {
+        let userfile = this.userinfo.userfiles[i]
+        if (userfile.f_gasbrand_id === null || userfile.f_gasbrand_id === '') {
+          this.$showAlert(`表具${i+1}气表品牌没有选择！！！`, 'warning', 3000)
+          return
+        }
+        if (userfile.f_gasmodel_id === null || userfile.f_gasmodel_id === '') {
+          this.$showAlert(`表具${i+1}气表型号没有选择！！！`, 'warning', 3000)
+          return
+        }
+        if (userfile.f_meternumber === null || userfile.f_meternumber === '') {
+          this.$showAlert(`表具${i+1}表号没有填写！！！`, 'warning', 3000)
+          return
+        }
+      }
+      let data = {
+        user: this.$login.f,
+        useradders: this.useradders,
+        userinfo: this.userinfo,
+        selectdata: this.selectdata
+      }
+      let res = await this.$resetpost('rs/logic/addInstallationDetails', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '表具添加失败！！！'
+      })
+      this.$dispatch('breakControl', this.selectdata)
+    },
+    // 检查表号是否存在
+    async meternumberValidate(i) {
+      if (!this.userinfo.userfiles[i].f_gasbrand_id) {
+        this.userinfo.userfiles[i].f_meternumber = ''
+        this.$showAlert('请先选择气表品牌！！！', 'warning', 3000)
+        return
+      }
+      if (this.userinfo.userfiles[i].f_gasbrand_id && this.userinfo.userfiles[i].f_meternumber) {
+        let data = {
+          f_meternumber: this.userinfo.userfiles[i].f_meternumber,
+          f_gasbrand_id: this.userinfo.userfiles[i].f_gasbrand_id
+        }
+        if (this.userinfo.userfiles[i].f_userfiles_id) {
+          data.f_userfiles_id = this.userinfo.userfiles[i].f_userfiles_id
+        }
+        let res = await this.$resetpost('rs/logic/meterbrandsNumberValidate', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '表号验证失败！！'
+        })
+        if (res.data) {
+          this.userinfo.userfiles[i].f_meternumber = ''
+          this.$showAlert('表号已存在！！', 'warning', 3000)
+        }
+      }
+    },
+    // 选择气表型号
+    gasmodelChange(i) {
+      if (this.userinfo.userfiles[i].gasmodel) {
+        this.userinfo.userfiles[i].f_gasmodel_id = this.userinfo.userfiles[i].gasmodel.id
+      }
+    },
+    // 选择气表品牌
+    gasbrandChange(i) {
+      // 清空已保存的气表型号
+      this.userinfo.userfiles[i].f_gasmodel_id = null
+      this.userinfo.userfiles[i].gasmodel = null
+      if (this.userinfo.userfiles[i].gasbrand) {
+        // 气表品牌id
+        this.userinfo.userfiles[i].f_gasbrand_id = this.userinfo.userfiles[i].gasbrand.id
+        // 气表分类
+        this.userinfo.userfiles[i].f_meter_classify = this.userinfo.userfiles[i].gasbrand.f_meter_type
+      }
+    },
+    // 追加表具
+    addUserFile() {
+      this.userinfo.userfiles.push({})
+    },
+    // 打开安装明细
+    async showUserFileModal (row) {
+      this.useradders = row
+
+      let http = new HttpResetClass()
+      let data = {
+        condition: `f_userinfo_id='${row.f_userinfo_id}'`
+      }
+      let res = await http.load('POST', 'rs/logic/getUserinfoAndUserfiles', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+
+      this.userinfo = res.data
+
+      // 已有表具的 气表信息补充
+      for (const userfile of this.userinfo.userfiles) {
+        for (const item of this.meterbrands) {
+          if (item.value.id === userfile.f_gasbrand_id) {
+            userfile.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
+            }
+          }
+        }
+      }
+
+      this.showUserFile = true
+    },
+    // 获取气表品牌
+    async getMeterbrands() {
+      let http = new HttpResetClass()
+      let data = {
+        f_filialeid: this.$login.f.orgid
+      }
+      let res = await http.load('POST', 'rs/logic/getMeterbrands', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      this.meterbrands = res.data
+    },
+    // 查询
+    async search () {
+      let http = new HttpResetClass()
+      let data = {
+        condition: " 1=1",
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', 'rs/sql/getAddresAndUserinfoAndUserfilesAmount', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      this.model.data = res.data
+      if (this.selectdata.f_apply_type === '开发商集体报建' || this.selectdata.f_apply_type === '散户集体报建') {
+        let f_installed_households = 0
+        for (const item of res.data) {
+          if (item.f_userfiles_num > 0) {
+            f_installed_households++
+          }
+        }
+        let f_uninstalled_households = this.selectdata.f_apply_count - f_installed_households
+        for (const item of this.selectdata.fields) {
+          if (item.label === '已安装户数') {
+            item.value = f_installed_households
+          }
+          if (item.label === '未安装户数') {
+            item.value = f_uninstalled_households
+          }
+        }
+      }
+    },
+    // 关闭安装明细
+    closeUserFile() {
+      this.showUserFile = false
+      this.useradders = null
+      this.userinfo = null
+      this.search()
+    },
+    // 关闭文件上传对话框
+    closeFile() {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.search()
+    }
+  },
+  events: {
+    async 'onFileUpload'(file, result) {
+      let data = {
+        selectdata: this.selectdata,
+        filepath: result.f_downloadpath,
+        user: this.$login.f
+      }
+      let res = await this.$resetpost(`rs/logic/importAddInstallationDetails`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
+      if(res.data.type === "success"){
+        this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
+      }else{
+        this.$showMessage(res.data.msg);
+      }
+      this.$dispatch('breakControl', this.selectdata)
+    }
+  },
+  computed: {
+    // 安装人
+    installperson() {
+      return this.$login.f.f_installman.map(item => {
+        return {
+          label: item.name,
+          value: item.name
+        }
+      })
+    },
+    // 表向
+    aroundmeters() {
+      return this.$appdata.getParam('左右表')
+    },
+    // 安装位置
+    positions() {
+      return this.$appdata.getParam('安装位置')
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+  .head-but{
+    margin-left: 5px;
+    height: 34px;
+    /*background-color: #6aa6e2;*/
+    border-radius: 4px;
+    font-family: PingFang;
+    color: #ffffff;
+  }
+  /*清除model中的浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>

package/src/components/product/{Process → Apply/Process}/Processes/addressAndUserinfoManagement.vue

@@ -141,16 +141,11 @@ export default {
         rejectMsg: null
       })
       this.model.data = res.data
-
-      // 去除户数自动
-      if (this.selectdata.f_apply_type !== '开发商集体报建') {
-        for (let i = 0; i < this.selectdata.fields.length; i++) {
-          if (this.selectdata.fields[i].label === '户数') {
-            this.selectdata.fields[i].value = res.data.length
-          }
+      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() {