apply-clients 4.1.15-weinan → 4.1.16-weinan

package/package.json

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

package/src/applyAndroid.js

@@ -35,7 +35,8 @@ export default function () {
   Vue.component('app-charge-management', (resolve) => { require(['./components/app_apply/AppChargeManagement'], resolve) })
 // 材料收费信息
   Vue.component('app-materialshoufei', (resolve) => { require(['./components/app_apply/materialshoufei'], resolve) })
-
+  // 拍照
+  Vue.component('app-take-pic', (resolve) => { require(['./components/app_apply/AppTakePic'], resolve) })
   // 业务tab(control层)页
   Vue.component('service-control-app', (resolve) => { require(['./components/app_apply/ServiceControl'], resolve) })
   // 公共业务显示(view层)页

package/src/components/app_apply/AppTakePic.vue

@@ -0,0 +1,146 @@
+<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-show="false"
+          :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(":\\") + 3)}`)
+          res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 3)}`
+        }
+
+        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) {
+        // 拍照成功回调
+        console.log('-----------拍照成功回调-----------------')
+        HostApp.__callback__ = this.cameraCallBack
+        HostApp.__this__ = this
+        let fileName = guid() + '.jpg'
+        // 打开相机
+        console.log('-----------打开相机-----------------')
+        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('文件类型')
+        // return [{label:"jpg",value:"jpg"}]
+      }
+    },
+    events: {
+    }
+  }
+</script>
+
+<style lang="less">
+  .fileType {
+    float: left;
+    .select-style {
+      background: #f8f8f8;
+      border: 0px;
+    }
+    input {
+      border-left: none;
+      width: 100%;
+    }
+  }
+</style>

package/src/components/app_apply/ApplyToDoList.vue

@@ -104,7 +104,7 @@ export default{
       _this.$back()
     },
     search () {
-      var condition = "1=1  and (f_apply_type! = '居民报建' or (f_apply_type = '居民报建' and defname = '现场勘察'))"
+      var condition = "1=1  and (f_apply_type! = '居民报建' and f_apply_type! = '工商户报建'  or (f_apply_type = '居民报建' and defname = '现场勘察') or (f_apply_type = '工商户报建' and (defname = '现场勘察' or defname = '施工'))))"
       var param = {condition: condition,condValue:[],data:{"id": Vue.user.id,orgid: Vue.user.orgid}}
       let http = new HttpResetClass()
       http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,{data:param}).then(res=>{

package/src/components/app_apply/PlaceControler.vue

@@ -33,17 +33,17 @@
 </template>
 
 <script>
-  import ApplyUserInfo from "./ApplyUserInfo";
-  import ApplyInfo from "./ApplyInfo";
+  import ApplyUserInfo from './ApplyUserInfo'
+  import ApplyInfo from './ApplyInfo'
   // import FieldExploration from "./FieldExploration";
   // import Ventilation from "./Ventilation";
   // import Acceptance from "./Acceptance";
-  import ServiceControl from "./ServiceControl";
-
+  import ServiceControl from './ServiceControl'
+  import AppTakePic from './AppTakePic'
   export default {
     title: '报建代办详情',
     props: {
-      //分辨平板还是pc
+      // 分辨平板还是pc
       system: '',
       // 要处理的工单
       row: {
@@ -60,11 +60,10 @@
       }
     },
 
-
-    data() {
+    data () {
       return {
-        routeShow:true,
-        number:0,
+        routeShow: true,
+        number: 0,
         // shupingshow:false,
         pipeline: {},
         componentName: 'apply-user-info',
@@ -75,6 +74,9 @@
           },
           'apply-defame-work': {
             header: null, class: 'apply-info-class', props: null
+          },
+          'app-take-pic': {
+            header: '拍照', class: 'apply-info-class', props: null
           }
         },
         // actName: this.$appdata.getParam('用气类型'),  // 报建app需提取的流程名称
@@ -83,10 +85,10 @@
     },
 
     methods: {
-      imgback(val){
-        if(val && this.routeShow){
+      imgback (val) {
+        if (val && this.routeShow) {
           return require('../../assets/xiangxia1.png')
-        }else{
+        } else {
           return require('../../assets/xiangyou1.png')
         }
       },
@@ -99,22 +101,24 @@
         })
       },
       // 选择tab
-      tabSelect (name,number) {
+      tabSelect (name, number) {
         this.number = number
         this.tabs[name].props = null
         // 处理关闭/显示 内容
-        if(this.componentName == name && !this.routeShow ){
+        if (this.componentName === name && !this.routeShow) {
           this.routeShow = true
-        }else if(this.componentName == name && this.routeShow){
+        } else if (this.componentName === name && this.routeShow) {
           this.routeShow = false
-        }else if(this.componentName != name){
+        } else if (this.componentName !== name) {
           this.routeShow = true
         }
         this.componentName = name
         console.log('name=>' + name)
-        if( name == 'apply-info'){
+        if (name === 'apply-info') {
           this.tabs[name].props = {service: this.row, shutype: 'shu'}
-        }else{
+        } else if (name === 'app-take-pic') {
+          this.tabs[name].props = {blobid: this.row.f_process_id, defname: this.row.defname, isdelete: 'true', istakepic: 'true', istype: 'true'}
+        } else {
           this.row.defname = this.row.defname
           // this.row.fields = new Array()
           // this.row.buttons = new Array()
@@ -124,25 +128,25 @@
         this.$goto(name, this.tabs[name].props, 'apply')
         // this.shupingshow = true
       },
-      setProps() {
+      setProps () {
         // 给各自组件添加参数
         // this.tabs['apply-user-info'].props = {service: this.row, shutype: 'shu'}
         // this.tabs['apply-info'].props = {service: this.row, shutype: 'shu'}
         // this.tabs['apply-defame-work'].props = {model: this.row, shutype: 'shu'}
 
         // this.$goto('apply-user-info', this.tabs[this.componentName].props, 'apply')
-      },
+      }
     },
     ready () {
       var keyName = 'apply-defame-work'
       var valueHeader = this.row.defname
       var value = {
-        header:valueHeader,
+        header: valueHeader,
         class: 'apply-info-class',
         props: null
       }
       this.tabs[keyName] = value
-      console.log( 'this.number=>' + this.number)
+      console.log('this.number=>' + this.number)
       // this.$set('tabs.' + keyName ,value)
       this.setProps()
     },
@@ -152,10 +156,11 @@
       // 'fieldexploration': FieldExploration,
       // 'acceptance': Acceptance,
       // 'ventilation':Ventilation
-      'apply-defame-work': ServiceControl
+      'apply-defame-work': ServiceControl,
+      'app-take-pic': AppTakePic
     },
     events: {
-      'close'() {
+      'close' () {
         this.$back()
       }
     }

package/src/components/app_apply/ServiceControl.vue

@@ -176,7 +176,7 @@
         this.show_data = temp
         console.log('initializtion()方法结束,showview')
         this.showview = true
-        if (this.selectdata.defname === '现场勘察') {
+        if (this.selectdata.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
           for (const item of this.show_data.fields) {
             if (item.label === '现场勘察人员' && !item.value) {
               return item.value = Vue.user.name
@@ -256,20 +256,37 @@
         model=Object.assign({},this.selectdata,model)
         console.log('合并selectdata与model后的model=>' + JSON.stringify(model))
         let http = new HttpResetClass()
-        if(this.selectdata.defname =='现场勘察' && model.f_is_have == '否'){
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model. model.button.button_name == '提交'){
           let model1 ={
             f_stop_remarks : '不具备安装条件'
           }
           this.stopapply(model1,model)
           return
         }
-        if(this.selectdata.defname =='现场勘察' && model.f_is_aerate == '否'){
+        if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装')  && model.f_is_aerate == '否' && model. model.button.button_name == '提交'){
           let model1 ={
             f_stop_remarks : '未通气'
           }
           this.stopapply(model1,model)
           return
         }
+        if(this.selectdata.defname =='现场勘察'  && this.selectdata.f_apply_type == '工商户报建'&& model. model.button.button_name == '提交'){
+          let http = new HttpResetClass()
+          let data = {
+            tablename: 't_files',
+            condition: `defname = '现场勘察' and f_blobid = '${this.selectdata.f_process_id}'`
+          }
+          let res = await http.load('POST', this.$androidUtil.getProxyUrl() + '/rs/sql/singleTable', {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '查询失败'
+          })
+          console.log("数据长度：" + res.data.length)
+          if (res.data.length < 0) {
+             this.$showMessage("请上传照片！！！")
+            return
+          }
+
+        }
         var url = this.$androidUtil.getProxyUrl() + '/rs/logic/ApplyProductService'
         // let res = await http.load('POST',url,{data:{tables:this.data.tables,start_activity:this.$workflow_vue.start_activity,model:model,loginUser:Vue.user}}, {resolveMsg: null, rejectMsg: null})
         // // 先判断是否包含code，如果服务端异常，可能不存在code

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

@@ -1,134 +1,134 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
-        <exploration-select v-ref:query :show-data="showData"></exploration-select>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.defname'>
-            <service-control  v-ref:service :selectdata="selectdata"></service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="false"
-                          :issearch="true"
-                          :defname="selectdata.defname">
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建流程',
-    data () {
-      return {
-        showQuery: true,       // 控制查询页
-        showData: true,     // 控制列表数据
-        showtotal: false, // 详情显示
-        selectdata: {},
-        xmlname: ''        // 配置文件名
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.selectdata.processname
-        }
-        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
-
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
-      }
-    },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.query.$refs.cp.$refs.cri.search()
-        }
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-
-        if (servicedata.id) {
-          let http = new HttpResetClass()
-          let data = {
-            condition: `u.id = ${servicedata.id}`,
-            data: {
-              id: this.$login.f.id,
-              orgid: this.$login.f.orgid
-            }
-          }
-          let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'})
-
-          this.selectdata = res.data[0]
-        } else {
-          this.selectdata = servicedata
-        }
-
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-
-      },
-      // 初始化
-      async 'apply' (val) {
-        this.showtotal = false
-        this.selectdata = val
-
-        // if (this.selectdata.f_apply_type === '集体报建') {
-        //   this.xmlname = '集体报建流程'
-        // } else if (this.selectdata.f_apply_type === '散户报建') {
-        //   this.xmlname = '散户报建流程'
-        // } else {
-        //   this.$showMessage('暂无此类报装')
-        //   return
-        // }
-
-        // 次方法必须同步执行，否则后续会出问题
-        // 获取页面json配置文件
-        await this.loadName()
-
-        // 显示详细
-        this.showtotal = true
-        // 关闭列表数据
-        this.showData = false
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-      },
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      }
-    },
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'" v-show="showQuery">
+        <exploration-select v-ref:query :show-data="showData"></exploration-select>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.defname'>
+            <service-control  v-ref:service :selectdata="selectdata"></service-control>
+          </tab>
+<!--          <tab header='附件'>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="false"
+                          :issearch="true"
+                          :defname="selectdata.defname">
+            </apply-upload>
+          </tab>-->
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建流程',
+    data () {
+      return {
+        showQuery: true,       // 控制查询页
+        showData: true,     // 控制列表数据
+        showtotal: false, // 详情显示
+        selectdata: {},
+        xmlname: ''        // 配置文件名
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let http = new HttpResetClass()
+        let xmldata = {
+          data: this.$login.f,
+          workname: this.selectdata.processname
+        }
+        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
+
+        if (res.data.code && res.data.code === 200) {
+          Vue.prototype.$workflow_vue = res.data.workflow_vue
+        } else {
+          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+          return
+        }
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.query.$refs.cp.$refs.cri.search()
+        }
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let http = new HttpResetClass()
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              id: this.$login.f.id,
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await http.load('POST', 'rs/sql/checkuser', {data: data}, {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'})
+
+          this.selectdata = res.data[0]
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      // 初始化
+      async 'apply' (val) {
+        this.showtotal = false
+        this.selectdata = val
+
+        // if (this.selectdata.f_apply_type === '集体报建') {
+        //   this.xmlname = '集体报建流程'
+        // } else if (this.selectdata.f_apply_type === '散户报建') {
+        //   this.xmlname = '散户报建流程'
+        // } else {
+        //   this.$showMessage('暂无此类报装')
+        //   return
+        // }
+
+        // 次方法必须同步执行，否则后续会出问题
+        // 获取页面json配置文件
+        await this.loadName()
+
+        // 显示详细
+        this.showtotal = true
+        // 关闭列表数据
+        this.showData = false
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      }
+    },
+    watch: {
+    }
+  }
+</script>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -312,7 +312,7 @@ export default {
           }
         }
       }
-      if (this.selectdata.defname === '现场勘察') {
+      if (this.selectdata.defname === '现场勘察'|| this.selectdata.defname ==='入户安装') {
         for (const item of this.show_data.fields) {
           if (item.label === '现场勘察人员' && !item.value) {
             return item.value = this.$login.f.name
@@ -893,7 +893,7 @@ export default {
       //     }
       //   }
       // }
-      if(this.show_data.defname === '现场勘察') {
+      if(this.show_data.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
         console.log("this.shdata",this.show_data)
         if (this.show_data.fields[index].label === '是否具备安装条件') {
           for (const button of this.show_data.buttons) {