apply-clients 3.4.70 → 3.4.72

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

@@ -0,0 +1,145 @@
+<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="../../../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 '../../../components/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 (fileid) {
+      debugger
+      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/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()
+      })
+    },
+    takePic (title) {
+      // 拍照成功回调
+      this.type='手机拍照'
+      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
+      }
+debugger
+      console.log('-----------bzLogic-----------------')
+      let res = HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles(res.id)
+      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/filiale/shexian/android.js

@@ -1,6 +1,8 @@
 import Vue from 'vue'
 
 let specialComp = {
-  'app-exploration-user':(resolve) => { require(['./android/AppExplorationUser'], resolve) }
+  'app-exploration-user': (resolve) => { require(['./android/AppExplorationUser'], resolve) },
+  'app-service-control': (resolve) => { require(['./android/AppServiceControl'], resolve) },
+  'app-take-pic': (resolve) => { require(['./android/AppTakePic'], resolve) }
 }
 exports.specialComp = specialComp

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

@@ -357,10 +357,13 @@
         if (this.applyType === '散户报建') {
           data.processname = '散户报建流程'
           data.defname = '报装申请'
-        } else if (this.applyType === '新用户报建') {
-          data.processname = '新用户报建流程'
+        } else if (this.applyType === '团购报建') {
+          data.processname = '团购报建流程'
           data.defname = '报装申请'
-        } else {
+        }else if (this.applyType === '团购转散户') {
+          data.processname = '团购转散户报建流程'
+          data.defname = '信息确认'
+        }else {
           this.$showMessage('暂无此类报装')
           return
         }

package/src/filiale/shexian/pc/ServiceControl.vue

@@ -577,12 +577,12 @@
       //     condition: `f_orgid = '${this.$login.f.orgid}'`
       //   }
       //   let http = new HttpResetClass()
-      //   let res = await http.load(
-      //     'POST',
-      //     `rs/sql/apply_singleTable`,
-      //     {data: data},
-      //     {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
-      //   )
+      //   // let res = await http.load(
+      //   //   'POST',
+      //   //   `rs/sql/apply_singleTable`,
+      //   //   {data: data},
+      //   //   {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
+      //   // )
       //
       //   return res.data.map(item => {
       //     return {
@@ -590,6 +590,7 @@
       //       value: item.f_dev_name
       //     }
       //   })
+      //   return
       // },
       async getPrice (f_price_id) {
         console.log('=======================')
@@ -764,7 +765,7 @@
       },
       async getDesignerPeople () {
         let data = {
-          source: 'this.getParentByType($organization$).getChildByName($设计部报装$).getChildren()',
+          source: 'this.getParentByType($organization$).getChildByName($发展员$).getChildren()',
           userid: this.$login.f.id
         }
 

package/src/filiale/shexian/pc.js

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

package/src/main.js

@@ -1,23 +1,23 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-
-import apply from './apply'
-
-all()
-apply()
-ldap()
-sale()
-material()
-system(false)
-
-require('system-clients/src/styles/less/bootstrap.less')
-require('./expandcss.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+
+all()
+apply()
+ldap()
+sale()
+material()
+system(false)
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})