Browse Source

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

dev
caoyizhong 2 years ago
parent
commit
c0354fd637
  1. 6
      public/static/内部领物单.html
  2. 79
      public/static/物质入库验收报告.html
  3. 5
      src/views/accessrecords/LndustrialExplosiveEnter.vue
  4. 2
      src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
  5. 5
      src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
  6. 2
      src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue
  7. 8
      src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue
  8. 4
      src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
  9. 10
      src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
  10. 2
      src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue
  11. 14
      src/views/accessrecords/statement/ProcessMaterialWarehousingStatement.vue
  12. 125
      src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue
  13. 6
      src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
  14. 17
      src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
  15. 12
      src/views/waste/ProcessWasteList.vue

6
public/static/内部领物单.html

@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>回收台账</title>
<style>
body {
padding: 0;
@ -158,7 +158,7 @@
<body>
<!--startprint-->
<div class="max_box">
<div>分公司内部领物单</div>
<div>分公司内部领物单</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
<div class="danweixx">
<div>
@ -189,7 +189,7 @@
<div>金额</div>
</div>
<div class="maxbiox">
</div>
<div class="titl">
<div>发料单位</div>

79
public/static/物质入库验收报告.html

@ -217,7 +217,7 @@
<div class="max_box">
<div>新疆分公司</div>
<div>委托采购物质入库验收报告</div>
<div>
<div id="tbdw">
填报单位:
</div>
<div class="imags">
@ -229,42 +229,42 @@
<div class="telbox">
<div class="ghdanwei">
<div>供货单位</div>
<div></div>
<div id ="ghdw"></div>
</div>
<div class="wuzlb">
<div>
<div>物资名称</div>
<div></div>
<div >物资名称</div>
<div id="wzmc"></div>
</div>
<div>
<div>类别</div>
<div></div>
<div >类别</div>
<div id="lb"></div>
</div>
</div>
<div class="wuzlb">
<div>
<div>合同号</div>
<div class="tianxienr">
<div>项数</div>
<div></div>
<div >项数</div>
<div id="xs"></div>
</div>
</div>
<div>
<div>类别</div>
<div></div>
<div >类别</div>
<div id="lb1"></div>
</div>
</div>
<div class="huafenzj">
<div>
<div id ="dhsj">
到货时间:
</div>
<div>
<div id ="yssj">
验收时间:
</div>
</div>
<div class="ghdanwei">
<div style="height: 50px;">验收总金额(不含税)</div>
<div style="height: 50px;"></div>
<div style="height: 50px;" >验收总金额(不含税)</div>
<div style="height: 50px;" id ="yszje"></div>
</div>
<div class="neironqu">
<div>签收情况:</div>
@ -274,7 +274,7 @@
</div>
<div>
<div>验收人签字:</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
<div id ="sj3">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
</div>
</div>
<div class="neironqu">
@ -283,7 +283,7 @@
</div>
<div>
<div>签字(盖章):</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
<div id ="sj">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
</div>
</div>
<div class="neironqu">
@ -292,7 +292,7 @@
</div>
<div>
<div>签字(盖章):</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
<div id ="sj1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
</div>
</div>
<div class="neironqu">
@ -301,7 +301,7 @@
</div>
<div>
<div>签字(盖章):</div>
<div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
<div id ="sj2">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
</div>
</div>
</div>
@ -316,10 +316,49 @@
</div>
<!--endprint-->
<button class="dayinann" onclick="preview()">打印</button>
<button class="dayinann" onclick="">预览</button>
<!-- <button class="dayinann" onclick="">预览</button>-->
</body>
<script>
let data = null
window.addEventListener('message', messageEvent=> {
console.log('儿子收到vue的数据:>>>>>>>>>>>>>>>>>>>>',messageEvent.data);
data = messageEvent.data;
let tbdw=document.getElementById('tbdw')
let wzmc=document.getElementById('wzmc')
let lb=document.getElementById('lb')
let lb1=document.getElementById('lb1')
let xs=document.getElementById('xs')
let ghdw=document.getElementById('ghdw')
let dhsj=document.getElementById('dhsj')
let yszje=document.getElementById('yszje')
let sj=document.getElementById('sj')
let sj1=document.getElementById('sj1')
let sj2=document.getElementById('sj2')
let sj3=document.getElementById('sj3')
let yszje1 =0;
data.map((item,index)=>{
yszje1+=Number(item.materialAmount)
})
tbdw.innerHTML=`填报单位:${data[0].warehouseId_dictText}`
yszje.innerHTML=yszje1
wzmc.innerHTML=`${data[0].materialDescription},等`
lb.innerHTML=`${data[0].accountingAttributes_dictText}`
lb1.innerHTML=`${data[0].accountingAttributes_dictText}`
ghdw.innerHTML=`${data[0].supplierId}`
dhsj.innerHTML=`到货时间:${data[0].storageTime}`
let time = new Date();
// 获取年
let n = time.getFullYear()
// 获取月
let y= time.getMonth()+1
// 获取日
let r = time.getDate()
sj.innerHTML =n+'年'+ y+'月'+r+'日';
sj1.innerHTML =n+'年'+ y+'月'+r+'日';
sj2.innerHTML =n+'年'+ y+'月'+r+'日';
sj3.innerHTML =n+'年'+ y+'月'+r+'日';
xs.innerHTML=`${data.length}`
});
function preview() {
bdhtml = window.document.body.innerHTML;
sprnstr = "<!--startprint-->"; //开始打印标识字符串有17个字符

5
src/views/accessrecords/LndustrialExplosiveEnter.vue

@ -106,6 +106,10 @@
:customRow="clickThenSelect"
@change="handleTableChange">
<span slot="targetLibrary" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@ -229,6 +233,7 @@ export default {
{
title:'批次',
align:"center",
scopedSlots: { customRender: 'targetLibrary' },
dataIndex: 'targetLibrary'
},
{

2
src/views/accessrecords/ProcessMaterialWarehousingRecord.vue

@ -75,7 +75,7 @@
<!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('采购记录')">导出</a-button>
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->

5
src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue

@ -57,6 +57,9 @@
<span slot="sysOrgCode_dictText" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
</span>
<span slot="describes" slot-scope="text, record">
<j-ellipsis :value="text" :length="8"/>
</span>
<span slot="component" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
</span>
@ -272,7 +275,7 @@
{
title:'描述信息',
align:"center",
scopedSlots: { customRender: 'component' },
scopedSlots: { customRender: 'describes' },
dataIndex: 'describes',
},
{

2
src/views/accessrecords/modules/LndustrialExplosiveComeDetail.vue

@ -50,7 +50,7 @@
<j-ellipsis :value="text" :length="10"/>
</span>
<span slot="supplier" slot-scope="text, record">
<j-ellipsis :value="text" :length="7"/>
<j-ellipsis :value="text" :length="5"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>

8
src/views/accessrecords/modules/LndustrialExplosiveEnterDetail.vue

@ -102,10 +102,13 @@
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="materialDescription" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="5"/>
</span>
<span slot="supplierBatch" slot-scope="text, record">
<j-ellipsis :value="text" :length="5"/>
</span>
<span slot="supplierId" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="5"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
@ -278,6 +281,7 @@ export default {
{
title:'批次',
align:"center",
scopedSlots: { customRender: 'supplierBatch' },
dataIndex: 'supplierBatch'
},
{

4
src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue

@ -103,7 +103,7 @@
@change="handleTableChange">
<span slot="materialDescription" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="specification" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
@ -112,7 +112,7 @@
<j-ellipsis :value="text" :length="10"/>
</span>
<span slot="supplierId" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="5"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>

10
src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue

@ -79,6 +79,13 @@
:loading="loading"
:customRow="clickThenSelect"
@change="handleTableChange">
<span slot="materialSeries" slot-scope="text, record">
<j-ellipsis :value="text" :length="9"/>
</span>
<span slot="supplierId" slot-scope="text, record">
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="materialName" slot-scope="text, record">
<j-ellipsis :value="text" :length="7"/>
</span>
@ -193,11 +200,13 @@
{
title:'物料名称及规格型号',
align:"center",
scopedSlots: { customRender: 'materialName' },
dataIndex: 'materialName',
},
{
title:'系列',
align:"center",
scopedSlots: { customRender: 'materialSeries' },
dataIndex: 'materialSeries',
},
{
@ -229,6 +238,7 @@
{
title:'供应商',
align:"center",
scopedSlots: { customRender: 'supplierId' },
dataIndex: 'supplierId'
},
{

2
src/views/accessrecords/plan/ProcessMaterialsDeliveryPlan.vue

@ -10,7 +10,7 @@
<process-material-warehousing-flow-chart v-if="ifShow" :pictureId="pictureId" :procInstId="procInstId"/>
</a-tab-pane>
<a-tab-pane tab="制式表格" key="3" forceRender>
<ProcessMaterialsDeliveryStatement />
<ProcessMaterialsDeliveryStatement :materWared="this.$route.query.item"/>
</a-tab-pane>
</a-tabs>
</a-card>

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

@ -49,14 +49,18 @@ name: "ProcessMaterialWarehousingStatement",
Wslist:[]
}
},
created() {
this.sendMesFroIframe();
// this.loadData();
},
activated() {
this.sendMesFroIframe();
},
mounted() {
this.showSessionId = window.location.search;
this.srcHtml = '../static/物质入库验收报告.html';
this.sendMesFroIframe();
},
created() {
// this.loadData();
},
beforeMount() {
},
@ -64,8 +68,7 @@ name: "ProcessMaterialWarehousingStatement",
//
async sendMesFroIframe() {
let a = await this.loadData();
console.log("执行了",a);
console.log("执行了>>>>>>>>>>>>>>>>>>",a);
const mapFrame = this.$refs['iframes']
if (mapFrame.attachEvent) { //
@ -84,7 +87,6 @@ name: "ProcessMaterialWarehousingStatement",
},
loadData() {
console.log("执行; 欧帕科夫")
return new Promise((resolve, reject) => {
if(!this.url.list){
this.$message.error("请设置url.list属性!")

125
src/views/accessrecords/statement/ProcessMaterialsDeliveryStatement.vue

@ -1,18 +1,131 @@
<template>
<div>
<a-button type="primary">
预览
</a-button>
<a-button>打印</a-button>
<div >
<a-card :bordered="false" style="width: 100%;height: 730px">
<div class="table-operator" style="width: 18%">
<!-- <a-button type="primary">-->
<!-- 预览-->
<!-- </a-button>-->
</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 { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { mixinDevice } from '@/utils/mixin'
import { getAction } from '@api/manage'
export default {
name: "ProcessMaterialsDeliveryStatement"
name: "ProcessMaterialsDeliveryStatement",
mixins:[JeecgListMixin,mixinDevice],
props:{
materWared:{
type: String,
}
},
data(){
return{
showSessionId : '',
srcHtml : '',
url:{
list: "/hy/processMaterialsDelivery/listStockRemoval",
},
Wslist:[]
}
},
created() {
this.sendMesFroIframe();
// this.loadData();
},
activated() {
this.sendMesFroIframe();
this.srcHtml = '../static/内部领物单.html';
},
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, '*')
}
}
},
loadData() {
return new Promise((resolve, reject) => {
if(!this.url.list){
this.$message.error("请设置url.list属性!")
return
}
console.log("this.materWared>>>>>>>>>>>>>>>>>>>>>",this.materWared);
this.queryParam.processMaterialsDeliveryId = this.materWared;
getAction(this.url.list, this.queryParam).then((res) => {
console.log(res);
if (res.success) {
this.Wslist = res.result.records;
console.log("res.result>>>>>>>>>>>>>>>>",res.result)
}
if(res.code===510){
this.$message.warning(res.message)
}
this.loading = false;
resolve( this.Wslist );
})
})
},
}
}
</script>
<style scoped>
.iframe {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
width: 100%;
height: 100%;
background: #fff;
overflow-y: hidden;
}
</style>

6
src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@ -68,6 +68,9 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="merchandiseName" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
</template>
@ -132,7 +135,7 @@
title: '序号',
dataIndex: '',
key:'rowIndex',
width:60,
width:50,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
@ -152,6 +155,7 @@
{
title:'物料名称及规格型号',
align:"center",
scopedSlots: { customRender: 'merchandiseName' },
dataIndex: 'merchandiseName'
},
// {

17
src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@ -147,20 +147,21 @@
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange">
<span slot="processId" slot-scope="text, record">
<!-- <j-ellipsis :value="text" :length="10"/>-->
<a href="javascript:void(0);" @click="jumpLink(text,record)" >{{text}}111</a>
<a href="javascript:void(0);" @click="jumpLink(text,record)">
<j-ellipsis :value="text" :length="7"/>
</a>
</span>
<span slot="supplierName" slot-scope="text, record">
<j-ellipsis :value="text" :length="5"/>
<j-ellipsis :value="text" :length="4"/>
</span>
<span slot="materialClassify" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
</span>
<span slot="materialsNumber" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="merchandiseName" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="4"/>
</span>
<span slot="specification" slot-scope="text, record">
<j-ellipsis :value="text" :length="5"/>
@ -172,10 +173,10 @@
<j-ellipsis :value="text" :length="7"/>
</span>
<span slot="productionTime" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="8"/>
</span>
<span slot="createTime" slot-scope="text, record">
<j-ellipsis :value="text" :length="10"/>
<j-ellipsis :value="text" :length="8"/>
</span>
<template slot="htmlSlot" slot-scope="text">
<div v-html="text"></div>
@ -262,7 +263,7 @@
title: '序号',
dataIndex: '',
key:'rowIndex',
width:60,
width:50,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;

12
src/views/waste/ProcessWasteList.vue

@ -4,12 +4,12 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="物资名称">
<a-input placeholder="请输入物资名称" v-model="queryParam.materialName"/>
</a-form-item>
</a-col>
<a-col :md="6" :sm="10">
<a-col :md="5" :sm="10">
<a-form-item label="报废日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-range-picker
style="width: 210px"
@ -20,22 +20,22 @@
/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="物料码">
<a-input placeholder="请输入物料码" v-model="queryParam.descriptionId"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="所属单位">
<a-input placeholder="请选择所属单位" v-model="queryParam.affiliation"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="仓库位置">
<a-input placeholder="请选择仓库位置" v-model="queryParam.depositary" dict=",,"/>
</a-form-item>
</a-col>
<a-col :xl="4" :lg="7" :md="8" :sm="16">
<a-col :xl="3" :lg="7" :md="8" :sm="24">
<a-form-item label="创建人">
<a-input placeholder="请选择创建人" v-model="queryParam.createBy" dict=",,"/>
</a-form-item>

Loading…
Cancel
Save