apply-clients 5.0.35-8 → 5.0.35-80

package/src/components/product/Common/ApplyValidateBill.vue

@@ -13,6 +13,7 @@
 
     let http = new HttpResetClass()
     let param = {
+      f_process_id:self.data.f_process_id,
       f_bill_user: self.$login.f.name, // 票据使用人
       f_bill_type: self.data.f_bill_type, // 票据类型
       f_filialeids: self.$login.f.f_orgids, //所属分公司
@@ -37,17 +38,23 @@
       }
     },
     props: ['data','show'],
-    ready () {
-
+   async ready () {
+      /*debugger
       console.log(this.data.f_bill_type)
       if (this.data.f_bill_type) {
-        getCurrentBill(this)
+        await  getCurrentBill(this)
+        console.log('打印参数',this.data.f_process_id)
 
-      }
+      }*/
     },
     watch : {
-      'show' (val) {
-          getCurrentBill(this)
+      data:{
+        deep:true,
+        immediate:true,
+        async handler(){
+          console.log('1111155555')
+          await getCurrentBill(this)
+        }
       }
     }
   }

package/src/components/product/Common/PrintBill.vue

@@ -1,120 +1,121 @@
-<template>
-  <div class="auto form-horizontal" >
-    <modal :show.sync="show"  v-ref:modal large backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
-        <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
-      </header>
-      <article slot="modal-body" class="modal-body">
-<!--        <div v-if="bill.data">-->
-<!--          {{{bill.data}}}-->
-<!--        </div>-->
-        <validator name='v'>
-          <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
-              {{{bill.data}}}
-            </div>
-          </form>
-        </validator>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <div v-if="billConfig.hasBillManage">
-          <div class="col-sm-2" >
-            <span><strong>发票号:{{model.f_using_number}}</strong></span>
-          </div>
-        </div>
-        <button type="button" class="btn btn-success" @click='print()'>打印</button>
-        <report-print id='normal-bill' top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
-        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-  import { DataModel } from 'vue-client'
-  import Vue from "vue";
-
-  let getBillData = async function(self, val) {
-    self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
-    await self.bill.search(self.data.chargeid)
-    // self.bill.condition=
-    // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
-    console.log(self.bill)
-  }
-
-  export default {
-    title: '收费发票',
-    data () {
-      return {
-        model: {
-          f_using_number: null
-        },
-        bill: {},
-        messShow: false
-      }
-    },
-    props: ['show', 'data', 'billData', 'billConfig','titleName'],
-    ready () {
-      console.log('打票！！！！！！！！！！！！！！！！！')
-
-
-    },
-    methods: {
-        closebuyerinfo(){
-            this.show=false;
-        },
-      cancel  () {
-        this.$dispatch('toggle')
-      },
-
-
-      async print () {
-        // 更新系统发票
-          this.data.f_operator=this.$login.f.name,
-          this.data.f_filiale= this.$login.f.f_fengongsi,
-          this.data.f_outlets= this.$login.f.f_parentname,
-          this.data.f_orgstr=this.$login.f.orgpathstr,
-          this.data.f_filialeids=this.$login.f.f_orgids
-
-        try {
-          if (this.billConfig.hasBillManage) {
-            console.log("进入hasBillManage====================================")
-            await this.$commonService.openPaperBill(this.data.chargeid, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常',this.data.f_operator,this.data.f_filiale,this.data.f_outlets,this.data.f_orgstr,this.data.f_filialeids)
-          }
-          //票据打印！！！！！！！！！！！！！！！！！！！！
-          this.$refs.reportprint.print()
-          this.$dispatch('selfsearch')
-          this.$parent.model.f_charge_money=0
-          this.$parent.model.f_amount_words=0
-          this.$parent.model.f_amount_words=0
-          this.show=false
-        } catch (error) {
-          this.$dispatch('refresh')
-        }
-      }
-    },
-    watch: {
-      'show' (val) {
-        if (val) {
-          getBillData(this, val).then(() => {
-                }).catch((error) => {
-
-            this.$emit('error', error)
-          })
-        }
-      }
-    },
-    events: {
-      'print' () {
-        this.$dispatch('printok', '发票打印', this.data)
-      },
-      'print-error' () {
-        this.$dispatch('error', '发票打印', this.data, null)
-      }
-    }
-  }
-
-</script>
-<style >
-</style>
+<template>
+  <div class="auto form-horizontal" >
+    <modal  :show.sync="show" v-if="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
+        <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
+      </header>
+      <article slot="modal-body" class="modal-body">
+<!--        <div v-if="bill.data">-->
+<!--          {{{bill.data}}}-->
+<!--        </div>-->
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill_xx' v-if="bill.data" v-html="bill.data">
+
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div v-if="billConfig.hasBillManage">
+          <div class="col-sm-2" >
+            <span><strong>发票号:{{model.f_using_number}}</strong></span>
+          </div>
+        </div>
+        <button type="button" class="btn btn-success" @click='print()'>打印</button>
+        <report-print :id="'normal-bill_xx'" top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :showbtn="false" v-ref:reportprint></report-print>
+        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel } from 'vue-client'
+  import Vue from "vue";
+
+  let getBillData = async function(self, val) {
+    debugger
+    self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
+    await self.bill.search(self.data.chargeid)
+    // self.bill.condition=
+    // 获取发票号
+    self.model.f_using_number = self.billData.bill.number
+    console.log(self.bill)
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {data:''},
+        messShow: false
+      }
+    },
+    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
+    ready () {
+      console.log('打票！！！！！！！！！！！！！！！！！')
+
+
+    },
+    methods: {
+        closebuyerinfo(){
+            this.show=false;
+        },
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+
+
+      async print () {
+        // 更新系统发票
+          this.data.f_operator=this.$login.f.name,
+          this.data.f_filiale= this.$login.f.f_fengongsi,
+          this.data.f_outlets= this.$login.f.f_parentname,
+          this.data.f_orgstr=this.$login.f.orgpathstr,
+          this.data.f_filialeids=this.$login.f.f_orgids
+
+        try {
+          if (this.billConfig.hasBillManage) {
+            console.log("进入hasBillManage====================================")
+            await this.$commonService.openPaperBill(this.data.chargeid, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常',this.data.f_operator,this.data.f_filiale,this.data.f_outlets,this.data.f_orgstr,this.data.f_filialeids)
+          }
+          //票据打印！！！！！！！！！！！！！！！！！！！！
+          this.$refs.reportprint.print()
+          this.$dispatch('selfsearch')
+          this.$parent.model.f_charge_money=0
+          this.$parent.model.f_amount_words=0
+          this.$parent.model.f_amount_words=0
+          this.show=false
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+                }).catch((error) => {
+
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+      'print' () {
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+
+</script>
+<style >
+</style>

package/src/components/product/EngineeringManagement/EngineerUpload.vue

@@ -0,0 +1,304 @@
+<template>
+  <div class="col-sm-12" style="background-color: #FFFFFF">
+    <div class="col-sm-12" style="padding:50px 100px;height: 25%">
+      <div class="form-group col-sm-5" v-if="issearch">
+        <v-select
+          class="select select_list"
+          :value.sync="useType"
+          width="90%"
+          v-model="useType"
+          :options='typeOfUse'
+          :valueSingle="true"></v-select>
+      </div>
+      <div class="form-group col-sm-2" style="text-align: center" v-if="issearch">
+        <button type="button" class="btn btn-primary item_btn" @click="load">搜索</button>
+      </div>
+      <div class="form-group col-sm-2" style="text-align: center" v-if="isupload">
+        <button type="button" class="btn btn-primary item_btn" @click="showUpload = !showUpload">本地上传</button>
+      </div>
+      <div class="form-group col-sm-2" style="text-align: center" v-if="takeimg">
+        <button type="button" class="btn btn-primary item_btn" @click="upload()">高拍仪</button>
+      </div>
+    </div>
+    <hr style="width: 90%;margin: 0px auto;border: #999999 1px solid;"/>
+    <div class="col-sm-12" style="overflow: scroll;height: 75%">
+      <div :class="bootstraped ? bootstraped + ' showData' : 'col-sm-6 showData'" v-for="row in fileInfoData">
+        <div class="col-sm-12 item">
+          <div class="left col-sm-5">
+            <a href="#" class="thumbnail" style="width: 100%;height: 100%">
+              <img v-if="row.f_filetype === 'jpg'||row.f_filetype === 'png'||row.f_filetype === 'gif'||row.f_filetype === 'bmp'" :src="row.f_downloadURL" alt="..."/>
+              <img v-if="row.f_filetype === 'pdf'" src="../../image/pdf.jpg" alt="" />
+              <img v-if="row.f_filetype === 'xls'||row.f_filetype === 'xlsx'" src="../../image/excel.jpg" alt=""  />
+              <img v-if="row.f_filetype === 'doc'||row.f_filetype === 'docx'" src="../../image/doc.jpg" alt=""  />
+              <img v-if="row.f_filetype === 'dwg'" src="../../image/dwg.png" alt=""  />
+              <img v-if="row.f_filetype === 'dxf'" src="../../image/dxf.png" alt=""  />
+            </a>
+          </div>
+          <div class="right col-sm-7">
+            <p :title="row.f_filename" class="clears"><strong>文件名：</strong>{{row.f_filename}}</p>
+            <p :title="row.f_username" class="clears"><strong>操作员：</strong><span>{{row.f_username}}</span></p>
+            <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{row.fusetype}}</span></p>
+            <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{row.f_uploaddate}}</span></p>
+            <p :title="row.fremarks" class="clears"><strong>文件说明：</strong>{{row.fremarks}}</p>
+            <p class="clears">
+              <a v-if="row.f_filetype === 'jpg' || row.f_filetype==='png' || row.f_filetype==='gif' || row.f_filetype==='bmp'" :href="row.f_downloadURL" style="background:#6aa6e2" class="btn btn-primary" target="_blank" role="button">预览</a>
+              <a v-if="row.f_filetype === 'dwg' || row.f_filetype==='dxf'" style="background:#6aa6e2" class="btn btn-primary" :href="row.f_downloadURL" role="button" download>下载</a>
+              <a v-if="row.f_filetype !=='jpg' && row.f_filetype !=='png' && row.f_filetype !=='gif' && row.f_filetype !=='bmp' && row.f_filetype !=='dxf' && row.f_filetype !=='dwg'"
+                 @click="downloadfile(row.f_downloadURL)" style="background:#6aa6e2" class="btn btn-primary" role="button">下载</a>
+              <a v-if="isdelete && row.defname === defname" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <high-meter :show.sync="showhighmeter"
+              @photo-finish="newPhoto"
+              v-if="showhighmeter"
+              :isusetype="isusetype"
+              :isremark="isremark"
+              v-ref:ltgao></high-meter>
+  <modal  :show.sync="showUpload" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="close"><span class="glyphicon glyphicon-remove"></span></button>
+      <h4 class="modal-title" style="text-align: center">文件上传</h4>
+    </header>
+    <article slot="modal-body" class="modal-body form-horizontal">
+      <div class="form-group" style="text-align: center">
+        <file-upload class="my-file-uploader" :name="'myFile' + blodid"
+                     action="rs/file/uploadFile" tagname="文件上传" :headers="headers" multiple v-ref:file></file-upload>
+      </div>
+      <div class="form-group" v-if="isusetype">
+        <label class="col-sm-2 control-label">文件类型：</label>
+        <div class="col-sm-10">
+          <input-select
+            class="select select_list"
+            :value.sync="headers.fusetype"
+            v-model="headers.fusetype"
+            :options="$appdata.getParam('工程管理文件类型')"
+            :valueSingle="true"></input-select>
+        </div>
+      </div>
+      <div class="form-group" v-if="isremark">
+        <label class="col-sm-2 control-label">文件说明：</label>
+        <div class="col-sm-10">
+          <input class="form-control input_view" style=""
+                 v-model="headers.fremarks"
+                 :value="headers.fremarks"/>
+        </div>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from "../../Util";
+export default {
+  title: '附件',
+  props: ['blodid', 'businessid', 'isremark', 'isusetype', 'takeimg', 'defname', 'isupload', 'isdelete', 'bootstraped', 'issearch'],
+  data () {
+    return {
+      fileInfoData: [], // 数据库存储的文件记录对象数组
+      headers: {'username': this.$login.f.name, 'blodid': '','businessid':'', 'fremarks': '','defname':'','fusetype':''}, // 调用rs/file/uploadFile 的参数
+      showUpload: false, // 上传模态框控制
+      showhighmeter: false, // 高拍仪组件控制
+      useType: null
+    }
+  },
+  methods: {
+    delet(index, row) {
+      this.$resetdelete('rs/entity/t_files', {id: row.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid",row.id)
+        this.load()
+      })
+    },
+    // 下载
+    downloadfile(filepath){
+      var link = document.createElement('a');
+      link.href = filepath;
+      link.target='_blank'
+      link.dispatchEvent(new MouseEvent('click'));
+    },
+    // 关闭文件上传对话框
+    close () {
+      this.showUpload = false
+      this.showhighmeter = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.headers.fusetype = ''
+      this.headers.fremarks = ''
+      this.load()
+    },
+    // 查询
+    async load() {
+      let condition = ''
+      if(this.businessid){
+        condition = `f_businessid= '${this.headers.businessid}' `
+      }else{
+        condition = `f_blobid= '${this.headers.blodid}' `
+      }
+      if (this.useType != undefined && this.useType != null && this.useType != '') {
+        condition += `and fusetype = '${this.useType}'`
+      }
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_files',
+        condition: condition + ` order by f_uploaddate desc `
+      }
+      console.log("当前数据",data)
+      let getFile = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < getFile.data.length; i++) {
+        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
+          getFile.data.splice(i,1)
+          i--
+          continue
+        }
+        let temp = getFile.data[i].f_downloadpath
+        if (temp.includes('http:')){
+          getFile.data[i].f_downloadURL = temp
+        } else {
+          let URL = temp.substring(temp.lastIndexOf(":\\") + 2)
+          getFile.data[i].f_downloadURL = "http://" + location.host + "/" + URL
+        }
+      }
+      this.fileInfoData = []
+      this.fileInfoData = getFile.data
+    },
+    // 打开高拍仪
+    upload () {
+      if(this.showhighmeter){
+        this.$refs.ltgao.closeVideo()
+      }
+      this.showhighmeter = !this.showhighmeter
+    },
+    // 高拍仪回调
+    newPhoto(Imgbase64, fusetype, fremarks) {
+      this.headers.fusetype = fusetype
+      this.headers.fremarks = fremarks
+
+      let form = new FormData()
+      let xhr = new XMLHttpRequest()
+      let formDataBoundary = "----WebkitFormBoundary" + "GaoPaiYi";
+      form.append('Content-Type', 'multipart/form-data;boundary=' + formDataBoundary)
+      form.append('file', this.convertBase64ToBlob(Imgbase64), "GaoPaiYi.jpg")
+      xhr.open("POST", "rs/file/uploadFile")
+
+      if (this.headers) {
+        for (var header in this.headers) {
+          xhr.setRequestHeader(header, encodeURIComponent(this.headers[header]))
+        }
+      }
+      xhr.send(form)
+      setTimeout(() => {
+        this.close()
+      }, 5000)
+    },
+    convertBase64ToBlob(base64String) {
+      // 将base64解码
+      var bytes = atob(base64String);
+      //var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length);
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode);
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i);
+      }
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], {type: 'image/jpeg'});
+    },
+  },
+  ready () {
+    console.log("当前的流程标asdasd识",this.blodid+'adada'+ this.defname)
+    this.headers.blodid = this.blodid
+    this.headers.businessid = this.businessid
+    this.headers.defname = this.defname
+    if (this.blodid || this.businessid) {
+      this.load()
+    }
+  },
+  computed: {
+    typeOfUse () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('工程管理文件类型')]
+    }
+  },
+  events: {
+    onFileUpload: function (file, res) {
+      this.$dispatch("resid",res.id)
+      this.headers.fremarks=''
+      this.close()
+    }
+  },
+  watch: {
+    'blodid'(val) {
+      if (val) {
+        console.log('观察blodid', val)
+        this.headers.blodid = this.blodid
+        this.load(this)
+      }
+    },
+    'businessid'(val) {
+      console.log('观察businessid')
+      if (val) {
+        console.log('观察businessid', val)
+        this.headers.businessid = this.businessid
+        this.load(this)
+      }
+    },
+    'useType'() {
+      this.headers.fusetype = this.useType[0] ? this.useType[0] : ''
+    },
+    'defname'() {
+      this.headers.defname=this.defname
+    }
+  },
+}
+</script>
+
+<style scoped>
+.clears{
+  overflow:hidden;
+  text-overflow:ellipsis;
+  white-space:nowrap;
+}
+.showData {
+  padding: 15px 10px 0px 10px;
+  box-sizing: border-box;
+  height: 230px;
+  font-family: "微软雅黑";
+}
+.showData .item{
+  padding-bottom: 10px;
+  border-bottom: solid 1px #c1c1c1;
+}
+.left {
+  padding-right: 10px;
+}
+.left img{
+  height: 100%;
+  width: 100%;
+}
+.right{
+  height: 100%;
+  /*display: -webkit-flex;*/
+  /*display: flex;*/
+  /*flex-direction: column;*/
+  /*justify-content: space-around;*/
+}
+.item_btn{
+  width: 80%;
+  background-color: #6aa6e2;
+  border-radius: 4px;
+  color: #FFFFFF;
+  font-family: PingFang;
+}
+</style>