apply-clients 3.3.46 → 3.3.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.46",
+  "version": "3.3.47",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -95,7 +95,7 @@
     "system-clients": "3.1.87",
     "system-phone": "1.2.80-49",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.31",
+    "vue-client": "1.24.33",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/apply.js

@@ -61,7 +61,7 @@ export default function () {
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
   Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
   Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/Print/printRefund'], resolve) })
-  Vue.component('print-build-order', (resolve) => { require(['./components/product/Process/Processes/Print/printBuildOrder'], resolve) })
+
   // 补充协议
   Vue.component('supplemental-agreement', (resolve) => { require(['./components/product/Process/Processes/supplementalAgreement'], resolve) })
   // 选择用户信息
@@ -87,4 +87,7 @@ export default function () {
 
   Vue.component('apply-material-detailed', (resolve) => { require(['./components/product/Material/MaterialDetailed'], resolve) })
   Vue.component('apply-install-project', (resolve) => { require(['./components/product/Install/InstallProject'], resolve) })
+
+  Vue.component('build-order-list', (resolve) => { require(['./components/product/Print/BuildOrder/buildOrderList'], resolve) })
+  Vue.component('print-build-order', (resolve) => { require(['./components/product/Print/BuildOrder/printBuildOrder'], resolve) })
 }

package/src/components/android/AppSign.vue

@@ -5,6 +5,7 @@
         <img :src="f_sign_path" width="100%" height="100%" />
       </div>
       <div class="row text-right form-group">
+        <button class="btn" style="background-color: #f1e404;border-radius: 5px;margin-right: 10px" @click="clean">清除</button>
         <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click="sign">签名</button>
       </div>
     </div>
@@ -19,49 +20,93 @@ import Vue from "vue";
 
 export default {
   title: '签字',
-  props: {
-    f_file_path: {
-      type: Object,
-      default: null
-    }
-  },
+  props: ['filePath'],
   data () {
     return {
-      f_sign_path: null
+      f_sign_path: null,
+      fileName: null
     }
   },
   ready () {
-    console.log('============进入签字==============')
-    this.f_sign_path = this.f_file_path
+    this.f_sign_path = this.filePath
   },
   methods: {
+    clean () {
+      this.f_sign_path = null
+      this.fileName = null
+      this.$emit('sign-clean')
+    },
     sign () {
       this.delAudioFile(this.f_sign_path)
-      let fileName = guid() + '.jpg'
-      console.log('===================生成文件名=======================')
-      console.log(fileName)
+      this.fileName = guid() + '.jpg'
       HostApp.__callback__ = this.signCallback
       HostApp.__this__ = this
       HostApp.getSignature({
-        file: fileName,
+        file: this.fileName,
         requestCode: 111,
         callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
       })
     },
     // 签名回调
-    signCallback (prop, filePath) {
-      console.log('==============签字回调========================')
-      console.log(filePath)
-      HostApp.__this__.$set(prop, filePath)
+    signCallback (prop, signPath) {
+      console.log('==============签字回调============')
+      console.log(signPath)
+      HostApp.__this__.$set(prop, signPath)
+      console.log(HostApp.__this__.f_sign_path)
+
+      HostApp.__this__.uploadFile()
+
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
-    delAudioFile (filePath) {
-      if (!filePath) {
+    uploadFile () {
+      console.log('===================签字文件上传==============')
+      let data = {
+        username: Vue.user.name,
+        fremarks: '报装手机签字文件',
+        fileName: HostApp.__this__.fileName,
+        fileUrl: HostApp.__this__.f_sign_path
+      }
+
+      console.log('-----------bzLogic-----------------')
+      console.log(JSON.stringify(data))
+      let res = HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+      console.log('===============上传回调=================')
+      console.log(JSON.stringify(res))
+      HostApp.__this__.getFiles(res.id)
+    },
+    async getFiles (fileid) {
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `id = '${fileid}'`
+      }
+      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
+      })
+
+      console.log('=========查询回调===============')
+      let fileUrl = `${this.$androidUtil.getProxyUrl()}/${res.data[0].f_downloadpath.substring(res.data[0].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      console.log(fileUrl)
+      // HostApp.__this__.$set('f_sign_path', fileUrl)
+      // HostApp.__this__.f_sign_path = fileUrl
+      this.f_sign_path = fileUrl
+
+      this.$emit('sign-success', fileUrl)
+    },
+    delAudioFile (signPath) {
+      if (!signPath) {
         return
       }
-      HostApp.delfile(filePath)
+      HostApp.delfile(signPath)
       this.f_sign_path = null
+      this.fileName = null
     }
   },
   events: {