Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
caoyizhong 2 years ago
parent
commit
284746fb03
  1. 4
      src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue
  2. 42
      src/views/accessrecords/plan/ProcessMaterialsPlan.vue
  3. 19
      src/views/accessrecords/plan/ProcessMaterialsPlanList.vue
  4. 230
      src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
  5. 35
      src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue
  6. 36
      src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue

4
src/views/accessrecords/plan/ProcessMaterialWarehousingPlan.vue

@ -18,8 +18,8 @@
<script>
import ProcessMaterialWarehousingDetail from '../modules/ProcessMaterialWarehousingDetail'
import ProcessMaterialWarehousingFlowChart from '@views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart'
import ProcessMaterialWarehousingStatement from '@views/accessrecords/statement/ProcessMaterialWarehousingStatement'
import ProcessMaterialWarehousingFlowChart from '../flowchart/ProcessMaterialWarehousingFlowChart'
import ProcessMaterialWarehousingStatement from '../statement/ProcessMaterialWarehousingStatement'
import { getAction } from '@api/manage'
export default {

42
src/views/accessrecords/plan/ProcessMaterialsPlan.vue

@ -1,7 +1,7 @@
<template>
<a-card :bordered="false" >
<a-tabs style="text-align: center" @change="callback">
<a-tabs style="text-align: center" :default-active-key="this.tabKey" @change="callback">
<a-tab-pane tab="采购明细" key="1" forceRender >
<process-materials-plan-detail :materPlanId="this.$route.query.item" />
</a-tab-pane>
@ -18,10 +18,10 @@
<script>
import ProcessMaterialsPlanDetail from '../modules/ProcessMaterialsPlanDetail'
import ProcessMaterialWarehousingFlowChart from '@views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart'
import ProcessMaterialsPlanStatement from '@views/accessrecords/statement/ProcessMaterialsPlanStatement'
import ProcessMaterialWarehousingFlowChart from '../flowchart/ProcessMaterialWarehousingFlowChart'
import ProcessMaterialsPlanStatement from '../statement/ProcessMaterialsPlanStatement'
import { getAction } from '@api/manage'
import ProcessMaterialsPlanList from '@views/accessrecords/plan/ProcessMaterialsPlanList'
import ProcessMaterialsPlanList from '../plan/ProcessMaterialsPlanList'
export default {
name: 'ProcessMaterialsPlan',
@ -33,6 +33,7 @@
},
data() {
return {
tabKey:"1",
isNew:'',
ifShow:false,
pictureId:'',
@ -87,30 +88,41 @@
// required: false
// }
// },
created(){
console.log(this.proMaterListId);
console.log("=================",this.proMaterListId,"===================")
// this.getPicture();
},
watch:{
proMaterListId:function (newData, oldData) {
//newData
//oldData
if(newData !== oldData){
console.log("=================","值发生了变化","===================")
}
}
},
methods: {
callback(key){
if (key==2){
getAction(this.url.getProcessPicture, { id:this.$route.query.item }).then((res) => {
callback(key) {
console.log("=================",key,"===================")
if (key == 2) {
getAction(this.url.getProcessPicture, { id: this.$route.query.item }).then((res) => {
if (res.success) {
// this.dataSource = res.result.records;
// this.ipagination.total = res.result.total;
this.pictureId=res.result.procDefId;
this.ifShow=true;
console.log(res,'获取数据')
this.pictureId = res.result.procDefId;
this.ifShow = true;
console.log(res, '获取数据')
}
if(res.code===510){
if (res.code === 510) {
this.$message.warning(res.message)
}
this.loading = false;
})
}
}
},
},
}
}
</script>

19
src/views/accessrecords/plan/ProcessMaterialsPlanList.vue

@ -53,11 +53,11 @@
<script>
import ProcessMaterialsPlanDetail from '../modules/ProcessMaterialsPlanDetail'
import ProcessMaterialWarehousingFlowChart from '@views/accessrecords/flowchart/ProcessMaterialWarehousingFlowChart'
import ProcessMaterialsPlanStatement from '@views/accessrecords/statement/ProcessMaterialsPlanStatement'
import ProcessMaterialWarehousingFlowChart from '../flowchart/ProcessMaterialWarehousingFlowChart'
import ProcessMaterialsPlanStatement from '../statement/ProcessMaterialsPlanStatement'
import { getAction } from '@api/manage'
import ProcessMaterialWarehousingStatement from '@views/accessrecords/statement/ProcessMaterialWarehousingStatement'
import ProcessMaterialsPlanStatement2 from '@views/accessrecords/statement/ProcessMaterialsPlanStatement2'
import ProcessMaterialsPlanStatement2 from '../statement/ProcessMaterialsPlanStatement2'
export default {
@ -148,12 +148,25 @@
// default: false,
// required: false
// }
// materWared:{
// type:String,
// },
},
created(){
console.log("进来没有")
// console.log(this.proMaterListId);
// this.getPicture();
},
// watch:{
// materWared:function (newData, oldData) {
// //newData
// //oldData
// if(newData !== oldData){
// this.loadData();
// }
// }
//
// },
methods: {
callback(key){
if (key==2){

230
src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue

@ -1,130 +1,140 @@
<template>
<div >
<a-card :bordered="false" style="width: 100%;height: 730px">
<div>
<a-button type="primary" icon="download" @click="downWord">下载</a-button>
<a-button type="primary" style="left: 10px" @click="previewWord">预览并打印</a-button>
<div class="table-operator" style="width: 18%">
<!-- <a-button type="primary">-->
<!-- 预览-->
<!-- </a-button>-->
<div style="width: 100%;height: 100%;">
<pdf v-show="false" ref="pdfWord" :src="pdfSrc" class="pdf" style=""></pdf>
</div>
</div>
</div>
<div style="width: 100%;height: 80%">
<iframe class="iframe"
:src="srcHtml"
frameborder="0"
ref="iframes"
style="width: 100%;height: 100%"
>
</iframe>
</div>
</a-card>
</div>
</template>
<script>
import { getAction } from '@api/manage'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
export default {
name: "ProcessMaterialWarehousingStatement",
mixins:[JeecgListMixin,mixinDevice],
props:{
materWared:{
type: String,
}
},
data(){
return{
showSessionId : '',
srcHtml : '',
url:{
list: "/hy/processMaterialWarehousing/queryByIdWarehousingList",
const VALIDATE_NO_PASSED = Symbol()
import pick from 'lodash.pick'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction, downFile } from '@/api/manage'
import pdf from 'vue-pdf-signature'
import CMapReaderFactory from 'vue-pdf-signature/src/CMapReaderFactory'
export default {
name: 'ProcessMaterialWarehousingStatement',
mixins: [JeecgListMixin, mixinDevice],
components: { pdf, CMapReaderFactory },
props: {
materWared: {
type: String
},
Wslist:[]
}
},
created() {
this.sendMesFroIframe();
// this.loadData();
},
activated() {
this.sendMesFroIframe();
},
mounted() {
this.showSessionId = window.location.search;
this.srcHtml = '../static/物质入库验收报告.html';
this.sendMesFroIframe();
},
beforeMount() {
},
methods:{
//
async sendMesFroIframe() {
let a = await this.loadData();
console.log("执行了>>>>>>>>>>>>>>>>>>",a);
const mapFrame = this.$refs['iframes']
if (mapFrame.attachEvent) { //
mapFrame.attachEvent('onload', function() {
const iframeWin = mapFrame.contentWindow
iframeWin.postMessage(a, '*')
// data *ip
})
} else {
mapFrame.onload = function() {
const iframeWin = mapFrame.contentWindow
iframeWin.postMessage(a, '*')
}
}
},
/**/
procInstId: {
type: String,
default: '',
required: false
},
pictureId: {
type: String,
default: '',
required: false
},
lcModa: {
type: Object,
required: false
}
},
loadData() {
return new Promise((resolve, reject) => {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
return
data() {
return {
showSessionId: '',
srcHtml: '',
modalLsVisible: false,
pdfWord: '',
pdfSrc: '',
queryParam:{
id:''
},
url: {
list: '/hy/processUdgetPlan/getPlanTable',
queryPlandDownWord: '/word/queryWarehousingDownWord',
queryPlanPrevie: '/word/queryWarehousingPrevie'
},
Wslist: null
}
},
mounted() {
this.showSessionId = window.location.search
},
watch:{
materWared:function (newData, oldData) {
// newData
// oldData
if(newData !== oldData){
this.loadData();
console.log("数据已经更新")
}
console.log(this.materWared);
this.queryParam.processMaterialWarehousingId = this.materWared;
getAction(this.url.list, this.queryParam).then((res) => {
console.log(res);
if (res.success) {
this.Wslist = res.result.records;
}
},
created() {
// downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
// console.log(data)
// const blob = new Blob([data], { type: 'application/pdf' })
// this.pdfWord = window.URL.createObjectURL(blob)
//
// })
// this.loadData();
},
activated() {
},
beforeMount() {
},
computed: {
importExcelUrl: function() {
return `${window._CONFIG['domianURL']}/${this.url.queryPlanApply}`
}
},
methods: {
//
downWord() {
downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => {
if (!data) {
this.$message.warning("文件下载失败")
return
}
if(res.code===510){
this.$message.warning(res.message)
const blob = new Blob([data]) //
var a = document.createElement('a') //<a></a>
a.href = URL.createObjectURL(blob) // ahref
a.download = '采购通知书.docx' //
a.style.display = 'none' // a
document.body.appendChild(a) // a
a.click() // aahref
a.remove()
})
},
previewWord() {
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
if (!data) {
this.$message.warning("文件预览失败")
return
}
this.loading = false;
resolve( this.Wslist );
const blob = new Blob([data], { type: 'application/pdf' })
this.pdfSrc = window.URL.createObjectURL(blob)
console.log(this.pdfSrc)
window.open(this.pdfSrc)//
})
},
loadData() {
this.queryParam.id = this.materWared
},
})
},
}
}
}
</script>
<style scoped>
.iframe {
<style lang="less" scoped>
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
width: 100%;
height: 100%;
background: #fff;
overflow-y: hidden;
}
</style>

35
src/views/accessrecords/statement/ProcessMaterialsPlanStatement.vue

@ -20,7 +20,7 @@
import CMapReaderFactory from 'vue-pdf-signature/src/CMapReaderFactory'
export default {
name: 'ProcessMaterialPlan',
name: 'ProcessMaterialsPlanStatement',
mixins: [JeecgListMixin, mixinDevice],
components: { pdf, CMapReaderFactory },
props: {
@ -43,13 +43,24 @@
required: false
}
},
watch:{
materWared:function (newData, oldData) {
//newData
//oldData
if(newData !== oldData){
this.loadData();
}
}
},
data() {
return {
showSessionId: '',
srcHtml: '',
modalLsVisible: false,
pdfWord: '',
queryParam:{
id:''
},
pdfSrc: '',
url: {
list: '/hy/processUdgetPlan/getPlanTable',
@ -63,12 +74,12 @@
this.showSessionId = window.location.search
},
created() {
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
console.log(data)
const blob = new Blob([data], { type: 'application/pdf' })
this.pdfWord = window.URL.createObjectURL(blob)
})
// downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
// console.log(data)
// const blob = new Blob([data], { type: 'application/pdf' })
// this.pdfWord = window.URL.createObjectURL(blob)
//
// })
// this.loadData();
},
activated() {
@ -86,6 +97,10 @@
//
downWord() {
downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => {
if (!data) {
this.$message.warning("文件下载失败")
return
}
const blob = new Blob([data]) //
var a = document.createElement('a') //<a></a>
a.href = URL.createObjectURL(blob) // ahref
@ -99,6 +114,10 @@
},
previewWord() {
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
if (!data) {
this.$message.warning("文件预览失败")
return
}
console.log(data)
const blob = new Blob([data], { type: 'application/pdf' })
this.pdfSrc = window.URL.createObjectURL(blob)

36
src/views/accessrecords/statement/ProcessMaterialsPlanStatement2.vue

@ -20,7 +20,7 @@
import CMapReaderFactory from 'vue-pdf-signature/src/CMapReaderFactory'
export default {
name: 'ProcessMaterialPlan',
name: 'ProcessMaterialsPlanStatement2',
mixins: [JeecgListMixin, mixinDevice],
components: { pdf, CMapReaderFactory },
props: {
@ -51,6 +51,9 @@
modalLsVisible: false,
pdfWord: '',
pdfSrc: '',
queryParam:{
id:''
},
url: {
list: '/hy/processUdgetPlan/getPlanTable',
queryPlandDownWord: '/word/queryPlandDownWord',
@ -62,13 +65,23 @@
mounted() {
this.showSessionId = window.location.search
},
created() {
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
console.log(data)
const blob = new Blob([data], { type: 'application/pdf' })
this.pdfWord = window.URL.createObjectURL(blob)
watch:{
materWared:function (newData, oldData) {
//newData
//oldData
if(newData !== oldData){
this.loadData();
}
}
})
},
created() {
// downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
// console.log(data)
// const blob = new Blob([data], { type: 'application/pdf' })
// this.pdfWord = window.URL.createObjectURL(blob)
//
// })
// this.loadData();
},
activated() {
@ -86,6 +99,10 @@
//
downWord() {
downFile(this.url.queryPlandDownWord, { id: this.queryParam.id }).then((data) => {
if (!data) {
this.$message.warning("文件下载失败")
return
}
const blob = new Blob([data]) //
var a = document.createElement('a') //<a></a>
a.href = URL.createObjectURL(blob) // ahref
@ -99,7 +116,10 @@
},
previewWord() {
downFile(this.url.queryPlanPrevie, { id: this.queryParam.id }).then((data) => {
console.log(data)
if (!data) {
this.$message.warning("文件预览失败")
return
}
const blob = new Blob([data], { type: 'application/pdf' })
this.pdfSrc = window.URL.createObjectURL(blob)
console.log(this.pdfSrc)

Loading…
Cancel
Save