apply-clients 3.5.4-21 → 3.5.4-23

package/package.json

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

package/src/apply.js

@@ -17,6 +17,7 @@ export default function (filiale) {
   Vue.component('service-control', (resolve) => { require(['./components/product/Process/Service/ServiceControl'], resolve) })
   // 公共业务显示(view层)页
   Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
+  Vue.component('app-check-take-pic', (resolve) => { require(['./components/android/AppCheckTakePic'], resolve) })
   Vue.component('onetomany', (resolve) => { require(['./components/product/Onetomany'], resolve) })
   // 显示退回理由tab页
   Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/ShowBackReason'], resolve) })
@@ -122,9 +123,7 @@ export default function (filiale) {
   Vue.component('gongjian-apply-list', (resolve) => { require(['./components/product/GongJianPush/ApplyPushList'], resolve) })
   // 报建数据详情
   Vue.component('gongjian-apply-dispose', (resolve) => { require(['./components/product/GongJianPush/ApplyPushDispose'], resolve) })
-
-
-
+  Vue.component('apply-zhihuan-management', (resolve) => { require(['./components/product/PcZhihuanManagement'], resolve) })
   Vue.component('apply-material-display', (resolve) => { require(['./components/product/MaterialsManage/MaterialsList'], resolve) })
   Vue.component('apply-material-manage', (resolve) => { require(['./components/product/MaterialsManage/MaterialsManage'], resolve) })
   Vue.component('apply-materials-base', (resolve) => { require(['./components/product/MaterialsManage/MaterialsBase'], resolve) })

package/src/applyAndroid.js

@@ -19,6 +19,7 @@ export default function (filiale) {
 
   Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
   Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
+  Vue.component('app-check-take-pic', (resolve) => { require(['./components/android/AppCheckTakePic'], resolve) })
   Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
   Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
 

package/src/components/android/AppCheckTakePic.vue

@@ -0,0 +1,168 @@
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
+          <img-self :src="$androidUtil.getProxyUrl()+'/rs/image/file/'+file.f_filename" :width="120" :height="170"></img-self>
+          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
+        </div>
+      </div>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic1(type)">相册</button>
+      </div>
+    </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import {guid, toStandardTimeString} from '../Util'
+import Vue from 'vue'
+export default {
+  title: '附件',
+  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic','flag'],
+  data () {
+    return {
+      fileList: []
+    }
+  },
+  ready () {
+    this.getFiles()
+  },
+  methods: {
+    async getFiles () {
+      console.log('----------------开始查询图片----------------')
+      this.fileList = []
+
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' and fremarks='${this.flag}' order by f_uploaddate desc `
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/apply_singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------')
+        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      }
+
+      this.fileList = res.data
+    },
+    delfile (file, index) {
+      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid", file.id)
+        this.getFiles()
+      })
+    },
+    cameraCallBack (fileName, fileUrl) {
+      console.log('-----------cameraCallBack-----------------')
+      let data = {
+        blodid: HostApp.__this__.blobid,
+        type: HostApp.__this__.type,
+        defname: HostApp.__this__.defname,
+        username: Vue.user.name,
+        fremarks: this.flag,
+        fileName: fileName,
+        fileUrl: fileUrl
+      }
+      console.log('-----------bzLogic-----------------')
+      let  res=HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles()
+      console.log('----------------查询回调结束-------------------')
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    },
+    takePic (title) {
+      // 拍照成功回调
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName = guid() + '.jpg'
+      // 打开相机
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 200,
+          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
+          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
+        }
+      })
+    },
+    cameraCallBack1 (fileName, fileUrl) {
+        if(fileUrl instanceof Array){
+          fileUrl.forEach((row)=>{
+            console.log('照片名字',row.match(/[^\/]+$/)[0])
+            let data = {
+              blodid: HostApp.__this__.blobid,
+              type: HostApp.__this__.type,
+              defname: HostApp.__this__.defname,
+              username: Vue.user.name,
+              fremarks: this.flag,
+              fileName: row.match(/[^\/]+$/)[0],
+              fileUrl: row
+            }
+            console.log('-----------bzLogic-----------------')
+            let  res=HostApp.bzLogic({
+              'logic': 'appFileUpload',
+              'data': data
+            })
+          })
+          HostApp.__this__.getFiles()
+          HostApp.__callback__ = null
+          HostApp.__this__ = null
+      }
+    },
+    takePic1(title) {
+      HostApp.__callback__ = this.cameraCallBack1
+      HostApp.__this__ = this
+      let idx = 'aofeng'
+      let fileName = guid() + '.jpg'
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.ActionMultiplePickActivity',
+        param: {
+          file: fileName,
+          requestCode: 200,
+          callback: 'javascript:HostApp.__callback__("' + fileName + '", %s);',
+          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
+        }
+      })
+    },
+
+  },
+  computed: {
+    typeList () {
+      if (this.typelabel) {
+        return this.$appdata.getParam(this.typelabel)
+      }
+      return this.$appdata.getParam('使用类型')
+    }
+  },
+  events: {
+  }
+}
+</script>
+
+<style lang="less">
+.fileType {
+  float: left;
+  .select-style {
+    background: #f8f8f8;
+    border: 0px;
+  }
+  input {
+    border-left: none;
+    width: 100%;
+  }
+}
+</style>

package/src/components/android/Process/AppServiceControl.vue

@@ -630,7 +630,6 @@ export default {
       this.$nextTick(() => {
         this.showview = true
       })
-      this.getServicPeo()
     },
     signClean () {
       this.selectdata.f_construction_sign = null

package/src/components/product/PcZhihuanManagement.vue

@@ -0,0 +1,160 @@
+<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>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;" >
+            <nobr>{{row.f_check_list}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_check_value}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showModal(row)"
+              >查看照片</button>
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <validator name="v">
+      <modal v-if="showCheckModel" :show.sync="showCheckModel" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">检查明细照片</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div :class="bootstraped ? bootstraped + ' showData' : 'col-sm-6 showData'" v-for="row in fileInfoData">
+            <div class="col-sm-12 item">
+              <div class="left col-sm-5">
+                <a href="#" class="thumbnail" style="width: 100%;height: 100%">
+                  <img  :src="row" alt="..."/>
+                </a>
+              </div>
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+        </footer>
+      </modal>
+    </validator>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+import {isEmpty} from "../Util";
+
+export default {
+  title: '检查项管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+  },
+  data () {
+    return {
+      model: {
+        data: null
+      },
+      flag:0,
+      showCheckModel: false,
+      checkList:{},
+      item: [{label: '是', value: '是'},{label: '否', value: '否'}],
+      hasList:false,
+      savelist:[],
+      fileInfoData:[]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    showModal(row){
+      this.load(row)
+      this.showCheckModel=true
+    },
+    closeModal() {
+      this.showCheckModel=false
+    },
+    //查询
+    async search() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply_check',
+        condition: `f_process_id= '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '开发商档案查询失败！！！'
+      })
+      if(res.data.length>0){
+        this.model.data=res.data
+      }
+    },
+    async load(row) {
+      this.fileInfoData=[]
+      let condition = ''
+      condition = `f_blobid= '${this.selectdata.f_process_id}' and  fremarks='${this.selectdata.f_apply_num+row.id}' `
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: condition + ` order by f_uploaddate desc `
+      }
+      let getFile = await http.load('POST', 'rs/sql/apply_singleTable', {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+      for (var i = 0; i < getFile.data.length; i++) {
+        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
+          getFile.data.splice(i,1)
+          i--
+          continue
+        }
+        let temp = getFile.data[i].f_filename
+        let  src = "http://" + location.host + "/rs/image/file/" + temp
+        this.fileInfoData.push(src)
+      }
+    },
+  },
+  events: {
+  },
+  computed: {
+    CheckItems() {
+      return this.$appdata.getParam("报建检查项目")
+    }
+  },
+  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>

package/src/filiale/fugou/android/AppServiceControl.vue

@@ -52,6 +52,10 @@ export default {
     this.refurbish()
   },
   methods: {
+    /*获取服务人*/
+    getServicPeo(){
+      this.setLabelValue("服务人",Vue.user.name)
+    },
     async buttonCommit() {
       if(this.show_data.button.button_name){
         this.$refs.serviceview.disablebtu()
@@ -639,6 +643,7 @@ export default {
       this.$nextTick(() => {
         this.showview = true
       })
+      this.getServicPeo()
     },
     signClean () {
       this.selectdata.f_construction_sign = null
@@ -1596,7 +1601,7 @@ export default {
       let f_address_type = this.show_data.fields[index].value
       for (const item of this.show_data.fields) {
         if (f_address_type === '民用市区') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号' || item.label === '小区') {
+          if ( item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号' || item.label === '小区') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1612,7 +1617,7 @@ export default {
           }
         }
         if (f_address_type === '民用乡镇') {
-          if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
+          if (  item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号'|| item.label === '小区') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1633,7 +1638,7 @@ export default {
           }
         }
         if (f_address_type === '特殊地址') {
-          if (item.label === '区/县' || item.label === '街道/乡镇') {
+          if ( item.label === '街道/乡镇') {
             item.hidden = false
             item.required = true
             item.value = null
@@ -1717,7 +1722,19 @@ export default {
         this.electiveLabels('片区', '地址类型',)
       }
     },
-    'onblur' (index) {},
+    'onblur' (index) {
+      if(this.show_data.fields[index].label==="优惠金额"){
+        let contract=this.getLableValue('合同金额')
+        let add=this.getLableValue('追加款')
+        let money = this.getLableValue('优惠金额')
+        //转为数字，然后contract减去money，保留两位小数
+        let money_num = parseFloat(money)
+        let add_num = parseFloat(add)
+        let contract_num = parseFloat(contract)
+        let new_contract = contract_num+add_num - money_num
+        this.setLabelValue('应交金额', new_contract.toFixed(2))
+      }
+    },
     'oninput' (index) {},
     'initializtionView' () {},
     async 'onchangeModal' (index, fieldIndex) {

package/src/filiale/fugou/android/AppZhihuanManagement.vue

@@ -0,0 +1,191 @@
+<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>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;" >
+            <nobr>{{row.f_check_list}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_check_value}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showModal(row)"
+              >修改</button>
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <validator name="v">
+      <modal v-if="showCheckModel" :show.sync="showCheckModel" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><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">
+              <textarea width="100%" rows="3" v-model="checkList.f_check_list"></textarea>
+            </div>
+
+          </div>
+          <div class="form-group col-sm-12" >
+            <label class="col-sm-2 control-label">检查结果：</label>
+            <div class="col-sm-10">
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="checkList.f_check_value"
+                :value.sync="checkList.f_check_value"
+                :options='item'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <app-check-take-pic
+            :blobid="selectdata.f_process_id"
+            :flag="flag"
+            :defname="selectdata.defname"
+            :isdelete="true"
+            :istakepic="true"
+            :istype="true">
+          </app-check-take-pic>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="save()">保存</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '检查项管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+  },
+  data () {
+    return {
+      model: {
+        data: null
+      },
+      flag:0,
+      showCheckModel: false,
+      checkList:{},
+      item: [{label: '是', value: '是'},{label: '否', value: '否'}],
+      hasList:false,
+      savelist:[]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    async save(){
+      let res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/apply/rs/entity/t_apply_check`,
+        this.checkList,
+        {resolveMsg: null, rejectMsg: '数据保存失败！！！'}
+      )
+      if(res){
+        this.showCheckModel=false
+        this.search()
+      }
+    },
+    showModal(row){
+      this.checkList=row
+      this.flag=this.selectdata.f_apply_num+row.id
+      this.showCheckModel=true
+    },
+    closeModal() {
+      this.showCheckModel=false
+    },
+    //如果是第一次，则新保存检查想到数据库
+    async saveCheck() {
+      if (this.hasList === false) {
+        this.savelist = []
+        let checkList = this.$appdata.getParam("报建检查项目")
+        //遍历数组,获取数组中的每一个对象，并获取对象的value
+        for (let i = 0; i < checkList.length; i++) {
+          let obj = checkList[i]
+          let value = obj.value
+          this.savelist.push(value)
+        }
+        //保存到数据库
+        let http = new HttpResetClass()
+        let data = {
+          apply: this.selectdata,
+          user: Vue.user,
+          check:this.savelist
+        }
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addApplyCheck`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '添加失败！！！'
+        })
+      }
+    },
+    //查询
+    async search() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply_check',
+        condition: `f_process_id= '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '开发商档案查询失败！！！'
+      })
+      if(res.data.length>0){
+        this.model.data=res.data
+      }else{
+        this.saveCheck()
+      }
+    }
+  },
+  events: {
+  },
+  computed: {
+    CheckItems() {
+      return this.$appdata.getParam("报建检查项目")
+    }
+  },
+  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>

package/src/filiale/fugou/android.js

@@ -4,6 +4,7 @@ let specialComp = {
   'app-service-view': (resolve) => { require(['./android/AppServiceView'], resolve) },
   'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) },
   'app-service-control': (resolve) => { require(['./android/AppServiceControl'], resolve) },
+  'app-zhihuan-management': (resolve) => { require(['./android/AppZhihuanManagement'], resolve) },
   'app-charge-management': (resolve) => { require(['./android/AppChargeManagement'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/fugou/pc/ExplorationSelect.vue

@@ -0,0 +1,502 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate 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>
+              <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>
+              <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="u.f_apply_num = '{}'">-->
+            <!--              </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>
+              <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
+              <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+              <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" 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_userinfo_code"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="ui.f_userinfo_code like '%{}%'">
+            </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="u.f_apply_num like '%{}%'">
+            </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_contract_money"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="u.f_contract_money like '%{}%'">
+            </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"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_phone like '%{}%'">
+            </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_contract_number"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_contract_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="f_apply_type = '{}'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">办理环节：</label>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="act.defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-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_address"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_address like '%{}%'">
+            </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="f_apply_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="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">稍后处理：</label>
+              <v-select
+                v-model="model.f_no_valid"
+                placeholder='稍后处理'
+                condition="lp.f_no_valid = '{}'"
+                :value.sync="model.f_no_valid"
+                :options='$parent.$parent.laterList'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </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.act_sender"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="act.sender like '%{}%'" placeholder='节点发起人'>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
+        <template partial='head'>
+          <tr>
+            <th style="white-space: nowrap;">序号</th>
+            <th style="white-space: nowrap;">工程编号</th>
+            <th style="white-space: nowrap;">客户名称</th>
+            <th style="white-space: nowrap;">合同编号</th>
+            <th style="white-space: nowrap;">电话</th>
+            <th style="white-space: nowrap;">地址</th>
+            <th style="white-space: nowrap;">来源</th>
+            <th style="white-space: nowrap;">报建类型</th>
+            <th style="white-space: nowrap;">办理环节</th>
+            <th style="white-space: nowrap;">流程状态</th>
+            <th style="white-space: nowrap;">报建日期</th>
+            <th style="white-space: nowrap;">室内</th>
+            <th style="white-space: nowrap;">地埋</th>
+            <th style="white-space: nowrap;">操作</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr class="back-style">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':'', row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{$index+1}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_apply_num}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_user_name}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_contract_number}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_phone}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_apply_source}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_apply_type}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.defname}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_sub_state}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_apply_date}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_no_indoors}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <nobr><font>{{row.f_no_buried}}</font></nobr>
+            </td>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+              <dropdown>
+                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+                  <li>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">{{row.defname}}</a>
+                    <a href="#" @click="$parent.$parent.$parent.openLater(row)" v-if="row.f_no_valid !== '有效'">稍后处理</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+
+    <modal
+      v-if="showModal"
+      :show.sync="showModal"
+      backdrop="false"
+      title="工程类型"
+      cancel-text="取消"
+      ok-text="确认"
+      :callback="apply"
+    >
+      <div class="form-horizontal" slot="modal-body">
+        <div class="form-group" style="margin: 10px auto">
+          <label class="col-sm-3 control-label">报建类型：</label>
+          <div class="col-sm-9">
+            <v-select
+              v-model="applyType"
+              placeholder='请选择需要发起的工程类型'
+              :value.sync="applyType"
+              :options='$appdata.getParam("报建类型")'
+              :value-single="true"
+              class="select select_list"
+              :search="false"
+              close-on-select ></v-select>
+          </div>
+        </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>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import {isEmpty} from '../../../components/Util'
+
+  export default {
+    title: '工程列表',
+    props: ['showData'],
+    data () {
+      return {
+        model: new PagedList('rs/sql/checkuser', 20, {
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }),
+        showModal: false, // 控制发起类型选择
+        applyType: '',  // 报建类型
+        curorgid: [this.$login.f.orgid],
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        defnames: [{label: '全部', value: ''}], // 流程节点
+        applyNatures: [{label: '全部', value: ''}], // 报建性质
+        criteriaShow: false,
+        showFile: false,
+        laterList: [
+          {label: '全部', value: ''},
+          {label: '有效', value: '有效'}
+        ]
+      }
+    },
+    ready () {
+      // 调用查询
+      this.search()
+    },
+    methods: {
+      openLater (row) {
+        this.$dispatch('openLater', row)
+      },
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      },
+      // 点击操作
+      click (val) {
+        this.$dispatch('apply', val)
+      },
+      // 获取流程id
+      async getProcessId(processname) {
+        let data = {
+          workname: processname
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          'rs/logic/getProcessId',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '流程标识获取失败！！！'}
+        )
+
+        return res.data
+      },
+      // 报装申请
+      async apply () {
+        if (this.applyType === '' || this.applyType === null) {
+          this.$showAlert('请选择需要发起的类型', 'warning', 3000)
+          return
+        }
+        let data = {
+          f_apply_type: this.applyType
+        }
+        if (this.applyType === '散户报建') {
+          data.processname = '散户报建流程'
+          data.defname = '报装申请'
+        } else if (this.applyType === '工商户报建') {
+          data.processname = '工商户报建流程'
+          data.defname = '报装申请'
+        } else if (this.applyType === '改管报建') {
+          data.processname = '改管报建流程'
+          data.defname = '报装申请'
+        } else if (this.applyType === '增容报建') {
+          data.processname = '增容报建流程'
+          data.defname = '报装申请'
+        } else if (this.applyType === '团购报建') {
+          data.processname = '团购报建流程'
+          data.defname = '报装申请'
+        } else if (this.applyType === '退款报建') {
+          data.processname = '退款报建流程'
+          data.defname = '终止报建'
+        } else if (this.applyType === '团购转散户') {
+          data.processname = '团购转散户报建流程'
+          data.defname = '信息确认'
+        }else if (this.applyType === '报警器报建') {
+          data.processname = '报警器报建流程'
+          data.defname = '报装申请'
+        }else if (this.applyType === '工商业报警器报建') {
+          data.processname = '工商业报警器报建流程'
+          data.defname = '报装申请'
+        }else if (this.applyType === '集体报建') {
+          data.processname = '集体报建流程'
+          data.defname = '报装申请'
+        } else if (this.applyType === '工商业报建') {
+          data.processname = '工商业报建流程'
+          data.defname = '报装申请'
+        } else {
+          this.$showMessage('暂无此类报装')
+          return
+        }
+
+        data.f_sub_state = "新增"
+        data.f_apply_source = "线下发起"
+        data.f_process_id = await this.getProcessId(data.processname)
+
+        // 调用ExplorationUser事件
+        this.$dispatch('apply', data)
+
+        this.applyType = null
+        this.showModal = false
+      },
+      loadPage () {
+        this.$dispatch('loadPage')
+      },
+      search () {
+        this.$dispatch('search')
+      },
+      async applyTypeChange () {
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          let res = await this.$resetpost('rs/logic/getDefnameByType',
+            { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+            {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+          )
+
+          this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+        } else {
+          this.defnames = [{label: '全部', value: ''}]
+
+          this.applyNatures = [{label: '全部', value: ''}]
+        }
+      },
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = null
+        })
+      },
+      getorg (val) {
+        if (val.length <= 0) {
+          return
+        }
+        this.model.params.data.orgid = val[0]
+      }
+    },
+    computed: {
+      projectStart () {
+        return this.$login.r.includes('报建发起')
+      }
+    },
+    watch: {
+      'model.rows': {
+        handler: function () {
+          let isover = []           // 过期(超时)数据
+          let isbeforeover = []     // 未过期 提前提醒
+          for (let i = 0; i < this.model.rows.length; i++) {
+            let item = this.model.rows[i]
+            if (item.isover === '过期') {
+              isover.push(i + 1)
+            }
+            if (item.isbeforeover === '预期提醒') {
+              isbeforeover.push(i + 1)
+            }
+          }
+          let msg = null
+          if (isover.length > 0) {
+            msg = `第${isover.toString()}条数据已过期`
+            this.$showAlert(msg, 'warning', 3000)
+          }
+
+          if (isbeforeover.length > 0) {
+            msg = `第${isbeforeover.toString()}条数据即将过期`
+            if (isover.length > 0) {
+              setTimeout(() => {
+                this.$showAlert(msg, 'warning', 3000)
+              }, 4000)
+            } else {
+              this.$showAlert(msg, 'warning', 3000)
+            }
+          }
+        }
+      }
+    },
+    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>
+<style scoped>
+  .back-style{
+    background-color: #ffa726;
+  }
+  .p1 {
+    color: #dc0b12;
+    font-weight:bold
+  }
+  .p {
+    color: #ffaf4f;
+  }
+</style>

package/src/filiale/fugou/pc.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 
 let specialComp = {
   'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
+  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
   'installation-details': (resolve) => { require(['./pc/InstallationDetails'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/shexian/android/AppServiceControl.vue

@@ -243,10 +243,11 @@ export default {
       }
       if(this.show_data.button.button_name != '返回'){
         this.excessive=true
-        let res1 = HostApp.bzLogic({
-          'logic': 'appFileUpload',
+        let param = {
+          'logic': 'appFileUploads',
           'data': this.selectdata
-        })
+        }
+        let res1 = HostApp.bzLogic(param)
         let res = await this.$resetpost(
           // `rs/logic/ApplyProductService`,
           `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,

package/src/filiale/shexian/android/AppTakePic.vue

@@ -37,6 +37,7 @@ export default {
   },
   ready () {
     this.selectdata.files = []
+    this.selectdata.username = Vue.user.name
   },
   methods: {
     delfile (file, index) {
@@ -75,6 +76,11 @@ export default {
     }
   },
   events: {
+  },
+  watch: {
+    'type' () {
+      this.selectdata.type = this.type
+    }
   }
 }
 </script>