apply-clients 3.5.4-8 → 3.5.4-81

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

@@ -525,6 +525,26 @@ export default {
         throw null
       }
     },
+    //商户报建在点火派单-检查是否导入用户
+    async checkUser() {
+      let http = new HttpResetClass()
+      let  data={
+        condValue:[],
+        condition:"1=1",
+        data:{
+          f_filialeid: this.$login.f.orgid,
+          f_process_id: this.selectdata.f_process_id
+        }
+      }
+      let res = await http.load('POST', 'rs/sql/getAddressAanUserinfo', {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+      if(res.data.length===0){
+        this.$showAlert('请先导入用户信息！！！', 'warning', 3000)
+        throw null
+      }
+    },
   //检查附件是否提交
   async checkfile(param) {
     let condition = `f_blobid= '${this.show_data.f_process_id}'  and fusetype='${param}' `

package/src/filiale/ruihua/pc/printVentilation.vue

@@ -182,6 +182,10 @@
             <td>注：</td>
             <td colspan="5" style="color: red" >点火通气时采集信息用。第一联存根联，第二联客户联，第三联安装联。请用户携带客户联和本人身份证复印件前往就近营业厅签订供应气合同并办理开卡充值业务。</td>
           </tr>
+          <tr>
+            <td>用户签名：</td>
+            <td colspan="5" style="color: red" ><img width="150" height="170"  :src="'rs/image/file/'+src"/></td>
+          </tr>
         </table>
       </div>
     </article>
@@ -225,12 +229,14 @@ export default {
       userinfo: {},
       meterbrands: [],
       showModal: false,
-      device: null
+      device: null,
+      src:''
     }
   },
   ready () {
     this.getMeterbrands()
     this.getMaterial()
+    this.getfiles()
   },
   methods: {
     async getMaterial() {
@@ -251,8 +257,21 @@ export default {
       })
       this.momey=total
     },
+    async getfiles() {
+      let data = {
+        tablename: `t_files`,
+        condition: `f_blobid='${this.selectdata.f_process_id}' and  defname = '通气点火' and fusetype = '手机签字'  order by f_uploaddate desc `
+      }
+       await new HttpResetClass().load('post',
+        'rs/sql/apply_singleTable',
+        {data: data},
+        {resolveMsg: null, rejectMsg: null}
+      ).then(res=>{
+         this.src = res.data[0].f_filename
+         console.log('签字照片', res.data[0].f_filename,this.src)
+       })
+    },
     async getdevic() {
-      debugger
       let data = {
         tablename: 't_devices',
         condition: `f_userfiles_id = '${this.userinfo.userfiles[0].f_userfiles_id}'`
@@ -263,7 +282,6 @@ export default {
         {resolveMsg: null, rejectMsg: '设备查询失败！！！'}
       )
       this.devicesinfo=res.data
-      debugger
     },
     //查询表具信息
     async getuserfiles() {
@@ -386,9 +404,6 @@ export default {
   computed: {
     orgs () {
       return this.$login.f.f_fengongsi
-    },
-    src () {
-      // return require(`./img/${this.$login.f.number}.png`)
     }
   }
 }

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

@@ -6,7 +6,7 @@
         <app-service-view v-ref:serviceview :data="show_data" v-if="showview"></app-service-view>
       </panel>
       <panel header="拍照" :is-open="false" type="primary" v-if="selectdata.f_process_id">
-        <app-take-pic :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="true" :istakepic="true" :istype="true"></app-take-pic>
+        <app-take-pic :selectdata="selectdata" :blobid="selectdata.f_process_id" :defname="selectdata.defname" :isdelete="true" :istakepic="true" :istype="true"></app-take-pic>
       </panel>
       <panel header="签字" :is-open="false" type="primary" v-if="selectdata.f_process_id">
         <app-sign :blobid="selectdata.f_process_id" :defname="selectdata.defname" @sign-success="signSuccess" :file-path="selectdata.f_process_id"@sign-clean="signClean"></app-sign>
@@ -243,6 +243,15 @@ export default {
       }
       if(this.show_data.button.button_name != '返回'){
         this.excessive=true
+        let param = {
+          'logic': 'appFileUploads',
+          'data': this.selectdata
+        }
+        let res1 = HostApp.bzLogic(param)
+        if (res1.data.status != 200){
+          this.$showMessage('网络异常,图片上传失败,请检查图片后重新上传!')
+          return
+        }
         let res = await this.$resetpost(
           // `rs/logic/ApplyProductService`,
           `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyProductService`,
@@ -330,7 +339,8 @@ export default {
         })
         this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self')
         this.excessive=false
-      }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
+      }
+      else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
         this.excessive=true
         let data3 = {
           condition: `u.id = ${this.show_data.id}`,

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

@@ -2,9 +2,9 @@
   <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 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">
@@ -26,70 +26,26 @@
 </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'],
+  props: ['selectdata', 'blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
   data () {
     return {
-      fileList: []
     }
   },
   ready () {
-    this.getFiles()
+    this.selectdata.files = []
+    this.selectdata.username = Vue.user.name
   },
   methods: {
-    async getFiles () {
-      console.log('----------------开始查询图片----------------')
-      this.fileList = []
-
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}'   and defname = '${this.defname}'  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()
-      })
+      this.selectdata.files.splice(index, 1)
+      HostApp.delfile(file)
     },
     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
-      })
-      console.log('----------------开始回调查询-------------------')
-      HostApp.__this__.getFiles()
-      console.log('----------------查询回调结束-------------------')
+      this.selectdata.files.push({fileName: fileName, fileUrl: fileUrl})
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
@@ -109,8 +65,7 @@ export default {
           watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
         }
       })
-    },
-
+    }
   },
   computed: {
     typeList () {
@@ -121,6 +76,11 @@ export default {
     }
   },
   events: {
+  },
+  watch: {
+    'type' () {
+      this.selectdata.type = this.type
+    }
   }
 }
 </script>

package/src/filiale/siyangRH/android/AppAddMaterialScience.vue

@@ -170,8 +170,6 @@
 <script>
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
-import {number} from "echarts/lib/export";
-
 export default {
   name: 'addMaterialScience',
   props: {