apply-clients 3.3.29 → 3.3.33

package/src/components/android/Supervisory/AppProcessSupervisory.vue

@@ -157,6 +157,10 @@
               <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
             </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>施工备注：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_construction_remarks }}</p>
+            </div>
 
             <div class="col-xs-12 text-right">
               <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看</button>

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -389,6 +389,11 @@
           {resolveMsg: null, rejectMsg: '删除失败！！！'}
         )
 
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       },
       async 'onetomanyupdate' (index, rowIndex) {
@@ -402,11 +407,21 @@
           data
         )
 
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       },
       async 'onetomanyadd' (index) {
         let data = {
-          f_process_id : this.show_data.f_process_id
+          f_process_id : this.show_data.f_process_id,
+          f_operator_id: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs
         }
         this.show_data.onetomany[index].fields.forEach(item => {
           data[item.field] = item.value
@@ -415,6 +430,12 @@
           `rs/entity/${this.show_data.onetomany[index].tables[0]}`,
           data
         )
+
+        res = await this.$resetpost(
+          'rs/entity/t_apply',
+          this.show_data
+        )
+
         this.$dispatch('breakControl', this.show_data)
       }
     },

package/src/components/product/Material/MaterialDetailed.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+          <div class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">组织机构：</label>
+                <res-select
+                  restype='organization'
+                  :initresid='$parent.$parent.curorgid'
+                  @res-select="$parent.$parent.getorg"
+                  is-mul="false"
+                ></res-select>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">工程编号：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="a.f_apply_num = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">操作人：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='操作人' v-model="model.f_operator"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_operator like '%{}%'">
+              </div>
+              <div class="form-group col-sm-3 button-range">
+                <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>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="applyGetMaterial"
+                              template-name='材料明细导出'
+                              :choose-col="true"></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">材料名称：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='材料名称' v-model="model.f_material_name"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_name = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">材料型号：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='材料型号' v-model="model.f_material_style"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_style = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">材料单位：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='材料单位' v-model="model.f_material_unit"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_unit = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">材料数量：</label>
+                <input type="text" style="width: 60%" class="input_search" placeholder='材料数量' v-model="model.f_material_number"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="ma.f_material_number = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label  for="startDate" class="font_normal_body">开始时间：</label>
+                <datepicker id="startDate" placeholder="开始日期"
+                            style="width: 60%!important;"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            :show-reset-button="true"
+                            condition="ma.f_operation_date >= '{}'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-3">
+                <label for="endDate" class="font_normal_body">结束时间：</label>
+                <datepicker id="endDate" placeholder="结束日期"
+                            style="width: 60%!important;"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            :show-reset-button="true"
+                            condition="ma.f_operation_date <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>工程编号</th>
+              <th>材料名称</th>
+              <th>材料型号</th>
+              <th>材料单位</th>
+              <th>材料数量</th>
+              <th>操作人</th>
+              <th>操作时间</th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr >
+              <td style="text-align: center;">
+                <nobr><font>{{$index+1}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_apply_num}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_name}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_style}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_unit}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_material_number}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operator}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_operation_date}}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '报建收费列表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/applyGetMaterial', 30, null),
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      chargeStatus: [
+        {label: '全部', value: ''},
+        {label: '有效', value: '有效'},
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
+      ],
+      criteriaShow: false,
+      chargeAll: {
+        count: 0,
+        sum: 0
+      },
+      getfield: {
+        'f_apply_num': '工程编号',
+        'f_material_name': '材料名称',
+        'f_material_style': '材料型号',
+        'f_material_unit': '材料单位',
+        'f_material_number': '材料数量',
+        'f_operator': '操作人',
+        'f_operation_date': '操作时间'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = ''
+      })
+    },
+    searchCondition (args) {
+      args.condition = args.condition + ` and ma.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/components/product/OldApply/Handle/HandleApply.vue

@@ -39,6 +39,12 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户编号：</label>
+                <input type="text" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_code"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_userinfo_code = '{}'">
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">联系电话：</label>
                 <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
@@ -175,8 +181,8 @@
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
                     <li>
-                      <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
-                      <a href="#" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1 || (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 && row.f_sub_state === '待点火')" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
+                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
                     </li>
                   </ul>
                 </dropdown>
@@ -235,7 +241,18 @@ export default {
       this.$dispatch('openApply', row, 'handle')
     },
     searchCondition (args) {
-      args.condition = args.condition + ` and f_orgid = '${this.curorgid[0]}' and f_sub_state != '完工' and f_sub_state != '终止'`
+      args.condition = args.condition + ` and f_orgid = '${this.curorgid[0]}'`
+
+      if (this.$login.f.rolesnames.indexOf('工程部派工') !== -1 && this.$login.f.rolesnames.indexOf('运营部派工') !== -1) {
+        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '待点火')`
+      } else if (this.$login.f.rolesnames.indexOf('工程部派工') !== -1) {
+        args.condition = args.condition + ` and f_sub_state = '待安装'`
+      } else if (this.$login.f.rolesnames.indexOf('运营部派工') !== -1) {
+        args.condition = args.condition + ` and f_sub_state = '待点火'`
+      } else {
+        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '待点火')`
+      }
+
       this.model.search(args.condition, args.model)
     },
     search () {

package/src/components/product/OldApply/Monitor/MonitorApply.vue

@@ -39,6 +39,12 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户编号：</label>
+                <input type="text" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_code"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_userinfo_code = '{}'">
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">联系电话：</label>
                 <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"

package/src/components/product/OldApply/OldApply.vue

@@ -1,6 +1,6 @@
 <template>
   <tab-button v-ref:list>
-    <tabs header="数据处理">
+    <tabs header="数据处理" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1 || this.$login.f.rolesnames.indexOf('营业厅报装') !== -1">
       <handle-old-apply v-ref:handle></handle-old-apply>
     </tabs>
     <tabs header="数据查看">

package/src/components/product/Onetomany.vue

@@ -4,13 +4,35 @@
       <template partial='head'>
         <tr>
           <th style="white-space: nowrap;">序号</th>
-          <th v-for="field in $parent.model.fields" v-if="!field.displayPosition || field.displayPosition === 'list'">
+          <th v-for="field in $parent.$parent.onetomany.fields" v-if="!field.displayPosition || field.displayPosition === 'list'">
             <nobr>{{field.label}}</nobr>
           </th>
-          <th v-if="!$parent.model.hiddenOperate">
-            <button class="button_new" @click.prevent="$parent.$parent.openAdd()" v-if="!$parent.model.addHidden">
-              <span :style="$parent.model.addStyle">{{ $parent.model.addText ? $parent.model.addText : '添加' }}</span>
+          <th v-if="!$parent.$parent.onetomany.hiddenOperate">
+            <button :style="$parent.$parent.onetomany.add.style"
+                    :class="$parent.$parent.onetomany.add.class ? $parent.$parent.onetomany.add.class + ' button_spacing' : 'button_new button_spacing'"
+                    v-if="!$parent.$parent.onetomany.add.hidden"
+                    @click.prevent="$parent.$parent.openAdd()" >
+              {{ $parent.$parent.onetomany.add.text || '添加' }}
             </button>
+            <button :style="$parent.$parent.onetomany.import.style"
+                    :class="$parent.$parent.onetomany.import.class ? $parent.$parent.onetomany.import.class + ' button_spacing' : 'button_export button_spacing'"
+                    v-if="!$parent.$parent.onetomany.import.hidden"
+                    @click.prevent="$parent.$parent.showFile = !$parent.$parent.showFile" >
+              {{ $parent.$parent.onetomany.import.text || '导入' }}
+            </button>
+            <a type="button" style="text-decoration: none"
+               class="button_export button_spacing"
+               v-if="$parent.$parent.onetomany.import.templateUrl"
+               :href="$parent.$parent.onetomany.import.templateUrl" download>模板下载</a>
+            <export-excel
+                          v-if="!$parent.$parent.onetomany.export.hidden"
+                          :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getField"
+                          sqlurl="rs/logic/applyExportfile"
+                          :sql-name="$parent.$parent.onetomany.export.sqlName || 'singleTable'"
+                          :template-name="$parent.$parent.onetomany.export.templateName || '导出明细'"
+                          :btn-name="$parent.$parent.onetomany.export.butName || '导出'"
+                          :choose-col="true"></export-excel>
           </th>
         </tr>
       </template>
@@ -19,15 +41,21 @@
           <td style="text-align: center">
             <nobr><font>{{$index+1}}</font></nobr>
           </td>
-          <td class="text-center" style="text-align: center" v-for="key in $parent.model.fields"  v-if="!key.displayPosition || key.displayPosition === 'list'">
+          <td class="text-center" style="text-align: center" v-for="key in $parent.$parent.onetomany.fields"  v-if="!key.displayPosition || key.displayPosition === 'list'">
             {{row[key.field]}}
           </td>
-          <td style="text-align: center" v-if="!$parent.model.hiddenOperate">
-            <button class="button_search button_spacing" @click.prevent="$parent.$parent.openUpdate($index)" v-if="!$parent.model.updateHidden">
-              <span :style="$parent.model.updateStyle">{{ $parent.model.updateText ? $parent.model.updateText : '修改' }}</span>
+          <td style="text-align: center" v-if="!$parent.$parent.onetomany.hiddenOperate">
+            <button :style="$parent.$parent.onetomany.update.style"
+                    :class="$parent.$parent.onetomany.update.class ? $parent.$parent.onetomany.update.class + ' button_spacing' : 'button_search button_spacing'"
+                    v-if="!$parent.$parent.onetomany.update.hidden"
+                    @click.prevent="$parent.$parent.openUpdate($index)" >
+              {{ $parent.$parent.onetomany.update.text || '修改' }}
             </button>
-            <button class="button_delete button_spacing" @click.prevent="$parent.$parent.openDelete($index)" v-if="!$parent.model.deleteHidden">
-              <span :style="$parent.model.deleteStyle">{{ $parent.model.deleteText ? $parent.model.deleteText : '删除' }}</span>
+            <button :style="$parent.$parent.onetomany.delete.style"
+                    :class="$parent.$parent.onetomany.delete.class ? $parent.$parent.onetomany.delete.class + ' button_spacing' : 'button_delete button_spacing'"
+                    v-if="!$parent.$parent.onetomany.delete.hidden"
+                    @click.prevent="$parent.$parent.openDelete($index)" >
+              {{ $parent.$parent.onetomany.delete.text || '删除' }}
             </button>
           </td>
         </tr>
@@ -137,6 +165,19 @@
         </button>
       </footer>
     </modal>
+
+    <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" action="rs/file/uploadFile" tagname="确定" v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
   </div>
 </template>
 
@@ -146,6 +187,9 @@ import Vue from 'vue'
 export default {
   title: 'onetomany',
   props: {
+    selectdata: {
+      type: Object
+    },
     onetomany: {
       type: Object
     },
@@ -158,7 +202,8 @@ export default {
       disableButton: false,
       showModal: false,
       modelTitle: null,
-      rowIndex: null
+      rowIndex: null,
+      showFile: false
     }
   },
   ready () {
@@ -166,15 +211,15 @@ export default {
   methods: {
     confirmModal () {
       if (this.modelTitle === '新增') {
-        if (this.onetomany.addEvent) {
-          this.$dispatch(this.onetomany.addEvent, this.index)
+        if (this.onetomany.add.event) {
+          this.$dispatch(this.onetomany.add.event, this.index)
         } else {
           this.$dispatch('onetomanyadd', this.index)
         }
       }
       if (this.modelTitle === '修改') {
-        if (this.onetomany.updateEvent) {
-          this.$dispatch(this.onetomany.updateEvent, this.index, this.rowIndex)
+        if (this.onetomany.update.event) {
+          this.$dispatch(this.onetomany.update.event, this.index, this.rowIndex)
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
@@ -207,10 +252,10 @@ export default {
       }
     },
     openDelete (rowIndex) {
-      this.$showMessage(this.onetomany.deleteMessage ? this.onetomany.deleteMessage : '您确定要删除这条记录吗？', ['confirm']).then((res) => {
+      this.$showMessage(this.onetomany.delete.message ? this.onetomany.delete.message : '您确定要删除这条记录吗？', ['confirm']).then((res) => {
         if (res === 'confirm') {
-          if (this.onetomany.deleteEvent) {
-            this.$dispatch(this.onetomany.deleteEvent, this.index, rowIndex)
+          if (this.onetomany.delete.event) {
+            this.$dispatch(this.onetomany.delete.event, this.index, rowIndex)
           } else {
             this.$dispatch('onetomanydelete', this.index, rowIndex)
           }
@@ -229,8 +274,8 @@ export default {
       this.modelTitle = '修改'
       this.rowIndex = rowIndex
 
-      if (this.onetomany.openUpdateEvent) {
-        this.$dispatch(this.onetomany.openUpdateEvent, this.index, this.rowIndex)
+      if (this.onetomany.update.openEvent) {
+        this.$dispatch(this.onetomany.update.openEvent, this.index, this.rowIndex)
       }
       this.$dispatch('openUpdateModel', this.index, this.rowIndex)
 
@@ -241,8 +286,8 @@ export default {
       this.disableModalButton()
       this.modelTitle = '新增'
 
-      if (this.onetomany.openAddEvent) {
-        this.$dispatch(this.onetomany.openAddEvent, this.index)
+      if (this.onetomany.add.openEvent) {
+        this.$dispatch(this.onetomany.add.openEvent, this.index)
       }
       this.$dispatch('openAddModel', this.index)
 
@@ -273,11 +318,45 @@ export default {
       }
 
       this.disableButton = flag
+    },
+    // 关闭文件上传对话框
+    closeFile () {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
     }
   },
   computed: {
+    getField () {
+      if (this.onetomany.export.fields) {
+        return this.onetomany.export.fields
+      }
+      let field = {}
+      for (const item of this.onetomany.fields) {
+        if (item.displayPosition === 'form' || !item.displayPosition) {
+          field[item.field] = item.label
+        }
+      }
+      return field
+    },
+    getCondition () {
+      if (this.onetomany.export.condition) {
+        return this.onetomany.export.condition
+      }
+      return {
+        tablename: this.onetomany.tables[0],
+        condition: `f_process_id='${this.selectdata.f_process_id}'`
+      }
+    }
   },
   events: {
+    async 'onFileUpload'(file, result) {
+      if (this.onetomany.import.event) {
+        this.$dispatch(this.onetomany.import.event, this.index, this.onetomany.tables[0], this.onetomany.import.configName, result.f_downloadpath)
+      } else {
+        this.$dispatch('importEvent', this.index, this.onetomany.tables[0], this.onetomany.import.configName, result.f_downloadpath)
+      }
+    }
   }
 }
 </script>

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

@@ -19,12 +19,12 @@
                        v-on:keyup.enter="$parent.$parent.search()"
                        condition="f_apply_num = '{}'">
               </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
-              </div>
               <div class="form-group col-sm-3 button-range">
+                <a type="button" class="button_new button_spacing" v-if="$parent.$parent.projectStart"
+                   href="/apply/download/excel/散户报装模板.xlsx" download>模板下载</a>
+                <button class="button_new button_spacing" style="width: max-content"
+                        v-if="$parent.$parent.projectStart"
+                        @click="$parent.$parent.showFile = !$parent.$parent.showFile">批量散户导入</button>
                 <button class="button_new button_spacing" style="width: max-content"
                         v-if="$parent.$parent.projectStart"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
@@ -39,6 +39,11 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">联系电话：</label>
                 <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
@@ -214,6 +219,19 @@
         </div>
       </div>
     </modal>
+
+    <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" action="rs/file/uploadFile" tagname="确定" v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
   </div>
 </template>
 <script>
@@ -237,7 +255,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
         applyNatures: [{label: '全部', value: ''}], // 报建性质
-        criteriaShow: false
+        criteriaShow: false,
+        showFile: false
       }
     },
     ready () {
@@ -245,6 +264,12 @@ import {HttpResetClass, PagedList} from 'vue-client'
       this.search()
     },
     methods: {
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      },
       // 点击操作
       click (val) {
         this.$dispatch('apply', val)
@@ -377,6 +402,17 @@ import {HttpResetClass, PagedList} from 'vue-client'
           }
         }
       }
+    },
+    events: {
+      async 'onFileUpload'(file, result) {
+        let data = {
+          filepath: result.f_downloadpath,
+          user: this.$login.f
+        }
+        let res = await this.$resetpost(`rs/logic/importApply`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败！！！', silent: true}, 0)
+
+        this.closeFile()
+      }
     }
   }
 </script>

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

@@ -73,7 +73,7 @@
     </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>
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" v-ref:file></file-upload>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer"></footer>