apply-clients 3.5.6-27 → 3.5.6-29

package/package.json

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

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

@@ -243,38 +243,38 @@ export default {
       }
       if(this.show_data.button.button_name !== '退回'){
         this.excessive=true
-        let params = {
-          files:this.selectdata.files,
-          f_process_id:this.selectdata.f_process_id,
-          defname:this.selectdata.defname,
-          username:this.selectdata.username,
-          type:this.selectdata.type
-        }
-        let res1 =HostApp.bzLogic({
-          'logic': 'appFileUploads',
-          'data': params
-        })
-        if (res1.status != 200){
-          this.excessive=false
-          this.$showMessage('网络异常,图片上传失败,请检查图片后重新上传!')
-          return
-        }else{
-          let  params={
-            imgids:res1.id,
-            blodid:this.selectdata.f_process_id,
-            username:this.selectdata.username,
-            fremarks:'手机拍照',
-            defname:this.selectdata.defname,
-            type:this.selectdata.type
-          }
-          let http2 = new HttpResetClass()
-          let restp2 = await http2.load(
-            'POST',
-            `${this.$androidUtil.getProxyUrl()}/rs/logic/applyupdateFilerows`,
-            {data: params},
-            {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
-          )
-        }
+        // let params = {
+        //   files:this.selectdata.files,
+        //   f_process_id:this.selectdata.f_process_id,
+        //   defname:this.selectdata.defname,
+        //   username:this.selectdata.username,
+        //   type:this.selectdata.type
+        // }
+        // let res1 =HostApp.bzLogic({
+        //   'logic': 'appFileUploads',
+        //   'data': params
+        // })
+        // if (res1.status != 200){
+        //   this.excessive=false
+        //   this.$showMessage('网络异常,图片上传失败,请检查图片后重新上传!')
+        //   return
+        // }else{
+        //   let  params={
+        //     imgids:res1.id,
+        //     blodid:this.selectdata.f_process_id,
+        //     username:this.selectdata.username,
+        //     fremarks:'手机拍照',
+        //     defname:this.selectdata.defname,
+        //     type:this.selectdata.type
+        //   }
+        //   let http2 = new HttpResetClass()
+        //   let restp2 = await http2.load(
+        //     'POST',
+        //     `${this.$androidUtil.getProxyUrl()}/rs/logic/applyupdateFilerows`,
+        //     {data: params},
+        //     {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        //   )
+        // }
         let res = await this.$resetpost(
           // `rs/logic/ApplyProductService`,
           `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,

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

@@ -1,100 +1,154 @@
-<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 selectdata.files">
-          <img-self :src="file.fileUrl" :width="120" :height="170"></img-self>
-          <img v-if="isdelete" src="../../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file.fileUrl,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 {guid, toStandardTimeString} from '../../../components/Util'
-import Vue from 'vue'
-export default {
-  title: '附件',
-  props: ['selectdata', 'blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
-  data () {
-    return {
-    }
-  },
-  ready () {
-    this.selectdata.files = []
-    this.selectdata.username = Vue.user.name
-  },
-  methods: {
-    delfile (file, index) {
-      this.selectdata.files.splice(index, 1)
-      HostApp.delfile(file)
-    },
-    cameraCallBack (fileName, fileUrl) {
-      this.selectdata.files.push({fileName: fileName, fileUrl: fileUrl})
-      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  // 水印
-        }
-      })
-    }
-  },
-  computed: {
-    typeList () {
-      if (this.typelabel) {
-        return this.$appdata.getParam(this.typelabel)
-      }
-      return this.$appdata.getParam('使用类型')
-    }
-  },
-  events: {
-  },
-  watch: {
-    'type' () {
-      this.selectdata.type = this.type
-    }
-  }
-}
-</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="$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>
+      <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 {guid, toStandardTimeString} from '../../../components/Util'
+import Vue from 'vue'
+import {HttpResetClass} from "vue-client";
+export default {
+  title: '附件',
+  props: ['selectdata', '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 in ('手机拍照','相册选择') 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()
+      })
+    },
+    async 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-----------------')
+      let res = HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+      let params = {
+        imgid: res.id,
+        defname: HostApp.__this__.defname,
+        type: HostApp.__this__.type,
+        fremarks: '手机拍照',
+        username: Vue.user.name,
+        blodid: HostApp.__this__.blobid
+      }
+      let http = new HttpResetClass()
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/updateFiles`,  params, {
+        warnMsg: null,
+        resolveMsg: null
+      }).then((res) => {
+        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  // 水印
+        }
+      })
+    },
+  },
+  computed: {
+    typeList () {
+      if (this.typelabel) {
+        return this.$appdata.getParam(this.typelabel)
+      }
+      return this.$appdata.getParam('使用类型')
+    }
+  },
+  events: {
+  },
+  watch: {
+    'type' () {
+      this.selectdata.type = this.type
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.fileType {
+  float: left;
+  .select-style {
+    background: #f8f8f8;
+    border: 0px;
+  }
+  input {
+    border-left: none;
+    width: 100%;
+  }
+}
+</style>