apply-clients 3.3.204 → 3.3.208

package/package.json

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

package/src/App.vue

@@ -1,20 +1,20 @@
-<template>
-  <div>
-    <app-base class="bg">
-      <div class='flex'>
-        <article>
-          <route :comp="{name: 'login'}"></route>
-        </article>
-      </div>
-    </app-base>
-  </div>
-</template>
-
-<script>
-
-
-  export default {
-
-
-  }
-</script>
+<template>
+  <div>
+    <app-base class="bg">
+      <div class='flex'>
+        <article>
+          <route :comp="{name: 'login'}"></route>
+        </article>
+      </div>
+    </app-base>
+  </div>
+</template>
+
+<script>
+
+
+  export default {
+
+
+  }
+</script>

package/src/apply.js

@@ -1,89 +1,90 @@
-import Vue from 'vue'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function (filiale) {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-  /** ***************************报建模块*********************************/
-  /**  报建流程业务 **/
-  // 报建流程业务总入口
-  Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
-  // 报建流程业务总入口页面list布局
-  Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
-  // 业务tab(control层)页
-  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('onetomany', (resolve) => { require(['./components/product/Onetomany'], resolve) })
-  // 显示退回理由tab页
-  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/ShowBackReason'], resolve) })
-
-  /** 报建监控业务 **/
-  // 流程监控入口页
-  Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
-  // 流程监控列表页
-  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
-  // 业务tab(control层)页
-  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
-  // 流程列表页
-  Vue.component('supervisory-chart', (resolve) => { require(['./components/product/Supervisory/SupervisoryhCart'], resolve) })
-
-  /** 报建功能业务 **/
-  // 报建功能业务总入口
-  Vue.component('install-function', (resolve) => { require(['./components/product/Function/InstallFunction'], resolve) })
-  // 报建功能工程列表
-  Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
-  // 报建菜单页面控制层
-  Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
-  // 调研表打印单
-  Vue.component('market_survey', (resolve) => { require(['./components/product/Function/MarketSurvey'], resolve) })
-  // 安装标准告知单
-  Vue.component('inform', (resolve) => { require(['./components/product/Function/Inform'], resolve) })
-
-  /** 预约报建 **/
-  // 报建功能业务总入口
-  Vue.component('order-apply', (resolve) => { require(['./components/product/Order/OrderApply'], resolve) })
-  Vue.component('order-apply-list', (resolve) => { require(['./components/product/Order/OrderApplyList'], resolve) })
-  Vue.component('order-message', (resolve) => { require(['./components/product/Order/OrderMessage'], resolve) })
-
-  // 终止报建页面入口
-  Vue.component('stop-apply', (resolve) => { require(['./components/product/Stop/StopApply'], resolve) })
-  Vue.component('stop-apply-list', (resolve) => { require(['./components/product/Stop/StopApplyList'], resolve) })
-
-  /** 报建收费记录 **/
-  Vue.component('apply-charge-search', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeSearch'], resolve) })
-  Vue.component('apply-charge-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeList'], resolve) })
-
-  // 地址管理
-  Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
-  // 施工安装明细
-  Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
-  // 收费管理
-  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
-  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/printCharge'], resolve) })
-  // 补充协议
-  Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
-  // 选择用户信息
-  Vue.component('select-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectUserinfo'], resolve) })
-  // 选择报建项目
-  Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
-  // 设备管理
-  Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
-  Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
-
-  /** VueUtils **/
-  Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
-  Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })
-  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
-  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/GaoPaiYi/HighMeter'], resolve) })
-
-  if (filiale) {
-    let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
-    for (let key in filialeComp) {
-      Vue.component(key, filialeComp[key])
-    }
-  }
-}
+import Vue from 'vue'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function (filiale) {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+  /** ***************************报建模块*********************************/
+  /**  报建流程业务 **/
+  // 报建流程业务总入口
+  Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
+  // 报建流程业务总入口页面list布局
+  Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
+  // 业务tab(control层)页
+  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('onetomany', (resolve) => { require(['./components/product/Onetomany'], resolve) })
+  // 显示退回理由tab页
+  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/ShowBackReason'], resolve) })
+
+  /** 报建监控业务 **/
+  // 流程监控入口页
+  Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
+  // 流程监控列表页
+  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
+  // 业务tab(control层)页
+  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
+  // 流程列表页
+  Vue.component('supervisory-chart', (resolve) => { require(['./components/product/Supervisory/SupervisoryhCart'], resolve) })
+  // 流程列表打印
+  Vue.component('apply-print-charge-node', (resolve) => { require(['./components/product/Supervisory/Service/printChargeNode'], resolve) })
+  /** 报建功能业务 **/
+  // 报建功能业务总入口
+  Vue.component('install-function', (resolve) => { require(['./components/product/Function/InstallFunction'], resolve) })
+  // 报建功能工程列表
+  Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
+  // 报建菜单页面控制层
+  Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
+  // 调研表打印单
+  Vue.component('market_survey', (resolve) => { require(['./components/product/Function/MarketSurvey'], resolve) })
+  // 安装标准告知单
+  Vue.component('inform', (resolve) => { require(['./components/product/Function/Inform'], resolve) })
+
+  /** 预约报建 **/
+  // 报建功能业务总入口
+  Vue.component('order-apply', (resolve) => { require(['./components/product/Order/OrderApply'], resolve) })
+  Vue.component('order-apply-list', (resolve) => { require(['./components/product/Order/OrderApplyList'], resolve) })
+  Vue.component('order-message', (resolve) => { require(['./components/product/Order/OrderMessage'], resolve) })
+
+  // 终止报建页面入口
+  Vue.component('stop-apply', (resolve) => { require(['./components/product/Stop/StopApply'], resolve) })
+  Vue.component('stop-apply-list', (resolve) => { require(['./components/product/Stop/StopApplyList'], resolve) })
+
+  /** 报建收费记录 **/
+  Vue.component('apply-charge-search', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeSearch'], resolve) })
+  Vue.component('apply-charge-list', (resolve) => { require(['./components/product/ApplyCharge/ApplyChargeList'], resolve) })
+
+  // 地址管理
+  Vue.component('apply-address-userinfo-management', (resolve) => { require(['./components/product/Process/Processes/addressAndUserinfoManagement'], resolve) })
+  // 施工安装明细
+  Vue.component('installation-details', (resolve) => { require(['./components/product/Process/Processes/InstallationDetails'], resolve) })
+  // 收费管理
+  Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/printCharge'], resolve) })
+  // 补充协议
+  Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
+  // 选择用户信息
+  Vue.component('select-userinfo', (resolve) => { require(['./components/product/Process/Processes/selectUserinfo'], resolve) })
+  // 选择报建项目
+  Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
+  // 设备管理
+  Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
+  Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
+
+  /** VueUtils **/
+  Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
+  Vue.component('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], resolve) })
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/GaoPaiYi/HighMeter'], resolve) })
+
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/pc`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
+}

package/src/components/android/AppTakePic.vue

@@ -1,143 +1,143 @@
-<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="file.f_downloadURL" :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>
-      <div class="row text-right form-group" v-if="istakepic">
-        <v-select
-          class="fileType"
-          placeholder="请选择使用类型"
-          v-if="istype"
-          :search="false"
-          close-on-select
-          value-single
-          :options="typeList"
-          v-model="type"
-          :value.sync="type"
-        ></v-select>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
-      </div>
-    </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'],
-  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 = '手机拍照' order by f_uploaddate desc `
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
-      // let res = await http.load('POST', `rs/sql/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()
-      })
-    },
-    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  // 水印
-        }
-      })
-    },
-    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: '手机拍照',
-        fileName: fileName,
-        fileUrl: fileUrl
-      }
-
-      console.log('-----------bzLogic-----------------')
-      HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
-      })
-
-      console.log('----------------开始回调查询-------------------')
-      HostApp.__this__.getFiles()
-      console.log('----------------查询回调结束-------------------')
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    }
-  },
-  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>
+<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="file.f_downloadURL" :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>
+      <div class="row text-right form-group" v-if="istakepic">
+        <v-select
+          class="fileType"
+          placeholder="请选择使用类型"
+          v-if="istype"
+          :search="false"
+          close-on-select
+          value-single
+          :options="typeList"
+          v-model="type"
+          :value.sync="type"
+        ></v-select>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
+      </div>
+    </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'],
+  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}' order by f_uploaddate desc`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
+      // let res = await http.load('POST', `rs/sql/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()
+      })
+    },
+    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  // 水印
+        }
+      })
+    },
+    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: '手机拍照',
+        fileName: fileName,
+        fileUrl: fileUrl
+      }
+
+      console.log('-----------bzLogic-----------------')
+      HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles()
+      console.log('----------------查询回调结束-------------------')
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    }
+  },
+  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/Function/AppInstallFunction.vue

@@ -155,12 +155,15 @@
         model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuserfunction`, 20, {
         // model: new PagedList('rs/sql/checkuserfunction', 20, {
           data: {
-            orgid: Vue.user.orgid
-            // orgid: '10101'
+            orgid: Vue.user.orgid,
+            id: Vue.user.id
+            // id: '1626081',
+            // orgid: '1123'
           }
         }),
         criteriaShow: false,
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+        // applytype: [{label: '全部', value: ''},{label: '散户报建', value: '散户报建'}], // 所有报建类型
         defnames: [{label: '全部', value: ''}],
         function_vue: null
       }

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

@@ -152,12 +152,14 @@ export default {
         data: {
           id: Vue.user.id,
           orgid: Vue.user.orgid
-          // id: '51953',
-          // orgid: '10101'
+          // id: '1626081',
+          // orgid: '1123'
         }
       }),
       criteriaShow: false,
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+      // applytype: [{label: '全部', value: ''},{label: '散户报建', value: '散户报建'}], // 所有报建类型
+
       defnames: [{label: '全部', value: ''}]
     }
   },
@@ -175,7 +177,7 @@ export default {
       this.$refs.cp.$refs.cri.search()
     },
     searchCondition (args) {
-      args.condition += `and act.defname in ${this.appDefnames}`
+      args.condition
       this.model.search(args.condition, args.model)
     },
     click (row) {