apply-clients 3.3.43 → 3.3.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.43",
+  "version": "3.3.47",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -93,9 +93,9 @@
     "style": "0.0.3",
     "style-loader": "^0.20.3",
     "system-clients": "3.1.87",
-    "system-phone": "1.1.18",
+    "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/AndroidApp.vue

@@ -1,30 +1,35 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-      <route :comp="{name: 'app-exploration-user'}" name="root"></route>
-<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
-<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
-<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
-<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
-    </article>
-    <time-out></time-out>
-    <message-box></message-box>
-    <alert-box></alert-box>
-    <alert-box-batch></alert-box-batch>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+      <route :comp="{name: 'app-exploration-user'}" name="root"></route>
+<!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
+<!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
+<!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
+<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
+<!--      <route :comp="{name: 'login-app'}" name="root"></route>-->
+    </article>
+    <time-out></time-out>
+    <message-box></message-box>
+    <alert-box></alert-box>
+    <alert-box-batch></alert-box-batch>
+  </div>
+</template>
+
+<script>
+
+  import AlertBox from "vue-client/src/components/AlertBox";
+  import AlertBoxBatch from "vue-client/src/components/AlertBoxBatch";
+
+  export default {
+    ready () {
+      if(!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("Error occured: " + error.message)
+          return false
+        }
+      }
+    },
+    components: { AlertBox, AlertBoxBatch }
+  }
+</script>

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) })
   // 选择用户信息
@@ -76,7 +76,8 @@ export default function () {
   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) })
+  // Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/GaoPaiYi/HighMeter'], resolve) })
+  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
 
   // 旧报装处理入口
   Vue.component('old-apply', (resolve) => { require(['./components/product/OldApply/OldApply'], resolve) })
@@ -86,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/applyAndroid.js

@@ -17,6 +17,7 @@ export default function () {
   Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
   Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
 
+  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
   Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
   Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
   Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
@@ -25,4 +26,6 @@ export default function () {
   Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
   Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
   Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
+
+  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
 }

package/src/components/android/AppServiceView.vue

@@ -1,6 +1,4 @@
 <template>
-  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
-
   <div class="form-horizontal select-overspread">
     <div v-for="(index,item) in data.fields">
       <!--input-->
@@ -279,8 +277,7 @@ export default {
       model: {}, // 公司等属性
       disable_button: true, // 控制按钮禁用
       disable_modal_button: true, // 控制按钮禁用
-      showButModal: false,
-      showWork: false
+      showButModal: false
     }
   },
   watch: {
@@ -377,7 +374,6 @@ export default {
     },
     // 点击按钮组按钮
     async click_but (button) {
-      this.showWork = true
       this.disable_button = true
 
       this.data.fields.forEach(item => {
@@ -388,7 +384,6 @@ export default {
 
       if (button.button_fields && button.button_fields.length > 0) {
         this.showButModal = true
-        this.showWork = false
         return
       }
 
@@ -399,7 +394,6 @@ export default {
       }
     },
     confirmModal () {
-      this.showWork = true
       this.closeModal()
 
       this.data.button.button_fields.forEach(item => {

package/src/components/android/AppSign.vue

@@ -0,0 +1,142 @@
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <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>
+  </div>
+</template>
+<script>
+import {getNowDate, guid, isEmpty} from '../Util'
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import QRCode from 'qrcodejs2'
+import Vue from "vue";
+
+export default {
+  title: '签字',
+  props: ['filePath'],
+  data () {
+    return {
+      f_sign_path: null,
+      fileName: null
+    }
+  },
+  ready () {
+    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)
+      this.fileName = guid() + '.jpg'
+      HostApp.__callback__ = this.signCallback
+      HostApp.__this__ = this
+      HostApp.getSignature({
+        file: this.fileName,
+        requestCode: 111,
+        callback: 'javascript:HostApp.__callback__("f_sign_path", "%s");'
+      })
+    },
+    // 签名回调
+    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
+    },
+    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(signPath)
+      this.f_sign_path = null
+      this.fileName = null
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped lang="less">
+.qrcode {
+  display: inline-block !important;
+  margin: 10px 0px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.vertical-center {
+  display: flex;
+  align-items: center;
+  text-align: center;
+}
+/*清除model中的浮动*/
+.clearfix:after,.clearfix:before{
+  display: table;
+}
+.clearfix:after{
+  clear: both;
+}
+</style>

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

@@ -105,6 +105,21 @@
               </datepicker>
             </div>
           </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">稍后处理：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                v-model="model.f_is_later"
+                placeholder='稍后处理'
+                condition="f_is_later = '{}'"
+                :value.sync="model.f_is_later"
+                :options='$parent.$parent.laterList'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+          </div>
           <div class="row form-group text-right" style="">
             <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
             <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
@@ -157,6 +172,7 @@
             </div>
 
             <div class="col-xs-12 text-right">
+              <button class="btn btn-info" @click="$parent.$parent.$parent.later(row)" v-if="row.f_is_later !== '是'">稍后处理</button>
               <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
             </div>
           </div>
@@ -185,13 +201,31 @@ export default {
       criteriaShow: false,
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
       defnames: [{label: '全部', value: ''}],
-      applyNatures: [{label: '全部', value: ''}] // 报建性质
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      laterList: [
+        {label: '全部', value: ''},
+        {label: '是', value: '是'},
+        {label: '否', value: '否'}
+      ]
     }
   },
   ready () {
     this.search()
   },
   methods: {
+    async later (row) {
+      let res = await this.$showMessage('您确定要将此任务加入稍后处理吗？', ['confirm'])
+
+      if (res === 'confirm') {
+        row.f_is_later = '是'
+        let res = await this.$resetpost(
+          'rs/entity/t_apply',
+          row
+        )
+
+        this.$refs.cp.$refs.cri.search()
+      }
+    },
     dialNumber (phone) {
       this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
         if (res === 'confirm') {