sfms3.0
/
sfms3.0-uniapp
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

lijuncheng0816
lijuncheng 1 month ago
parent
0aa7c71af5 9815f5fea1
commit
54c16fcd37
2 changed files with 103 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/hybrid/html/purchaseReceiptJob.html
  2. 126
      src/pages/pointPutawayJob/index.vue

27
src/hybrid/html/purchaseReceiptJob.html
View File

@ -28,10 +28,11 @@
align-items: center align-items: center
} }
.top th { .top1 th {
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 13px;
padding: 10px; padding: 10px;
text-align: left;
} }
@ -42,13 +43,33 @@
width: 100% width: 100%
} }
th{ th{
text-align:left; font-weight: bold;
font-size: 13px;
padding: 10px; padding: 10px;
} }
td{ td{
padding: 10px; padding: 10px;
} }
td:nth-child(2n){
width:calc(50% - 100px);
}
td:nth-child(2n+1){
width:80px;
}
.relative{
margin-bottom: 10px;
position: relative;
}
.q{
position: absolute;
left: 50%;
top:50%;
font-size: 160px;
transform: translate(-50% ,-50%);
color: rgba(0, 0, 0, 0.1);
}
</style> </style>
</head> </head>
<body> <body>

126
src/pages/pointPutawayJob/index.vue
View File

@ -7,23 +7,32 @@
</view> </view>
<view class="" :style="{'paddingTop':isHaveOn && data1 && data1.inspectDTOList && data1.inspectDTOList.length>0?'100rpx': '30rpx'}"> <view class="" :style="{'paddingTop':isHaveOn && data1 && data1.inspectDTOList && data1.inspectDTOList.length>0?'100rpx': '30rpx'}">
<view class="box" style="page-break-before:always;" v-if="tabIndex == 1"> <view class="box" style="page-break-before:always;" v-if="tabIndex == 1">
<view class=""> <view class="relative" v-for="(item,index) in showTableInspectDTOList" :key='index'>
<view class="q">Q</view>
<table border='1'> <table border='1'>
<thead> <thead>
<tr class='top1'> <tr class='top1'>
<th>发货单号:</th> <th>物料代码:</th>
<th colspan='2'>{{data1.asnNumber}}</th> <th colspan='3'>{{item.itemCode}}</th>
</tr>
<tr>
<th>物料代码</th>
<th>供应商批次</th>
<th>检验数量</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item,index) in showTableInspectDTOList" :key='index'> <tr>
<td>{{item.itemCode}}</td> <td>物料名称</td>
<td>{{item.itemName}}</td>
<td>发货单号</td>
<td>{{data1.asnNumber}}</td>
</tr>
<tr>
<td>供应商</td>
<td>{{item.supplierCode}}</td>
<td>批次</td>
<td>{{item.supplierBatch}}</td> <td>{{item.supplierBatch}}</td>
</tr>
<tr>
<td>到货数量</td>
<td>{{item.quantityQty}}</td>
<td>抽检数量</td>
<td>{{item.sampleQty}}</td> <td>{{item.sampleQty}}</td>
</tr> </tr>
</tbody> </tbody>
@ -34,7 +43,7 @@
<com-empty-view v-if="data.length==0"></com-empty-view> <com-empty-view v-if="data.length==0"></com-empty-view>
<!-- 只用于展示页面 --> <!-- 只用于展示页面 -->
<view class="" v-if="tabIndex == 2"> <view class="" v-if="tabIndex == 2">
<view class="box" style="margin-bottom: 20rpx;" v-for='(item,index) in showTableSubList' :key='index'> <view class="box1" style="margin-bottom: 20rpx;" v-for='(item,index) in showTableSubList' :key='index'>
<view class="top"> <view class="top">
<view class="mb-kw"> <view class="mb-kw">
目标库位：<view>{{item.toLocationCode}}</view> 目标库位：<view>{{item.toLocationCode}}</view>
@ -160,7 +169,7 @@
<div class="mb-bo"> <div class="mb-bo">
<div class="mb-left"> <div class="mb-left">
<div class="mb-text"> <div class="mb-text">
物料号：<div>${item.itemCode}</div> 物料号：<div>${item.itemCode}asjkdhfksjahfkljashfklsdh</div>
</div> </div>
<div class="mb-text"> <div class="mb-text">
托包装号：<div>${item.packingNumber}</div> 托包装号：<div>${item.packingNumber}</div>
@ -184,44 +193,48 @@
// 获取采购收货指引单html // 获取采购收货指引单html
getPurchaseReceiptJobHtml() { getPurchaseReceiptJobHtml() {
this.$nextTick(async () => { this.$nextTick(async () => {
let str2 = '' let str = ''
this.readFile(htmlFileUrl1, (htmlContent) => { this.readFile(htmlFileUrl1, (htmlContent) => {
this.newHtmlContent1 = htmlContent this.newHtmlContent1 = htmlContent
str2 = `<div class="box" style="page-break-before:always;" ><br />
<div class="">
<table border='1'>
<thead>
<tr class='top'>
<th>发货单号:</th>
<th colspan='2'>${this.data1.asnNumber}</th>
</tr>
<tr>
<th>物料代码</th>
<th>供应商批次</th>
<th>检验数量</th>
</tr>
</thead>
<tbody>
strBody
</tbody>
</table>
</div>
</div>
`
let str1 = ''
this.data1.inspectDTOList.forEach(item => { this.data1.inspectDTOList.forEach(item => {
str1 += ` str += `
<tr> <div class="box" style="page-break-before:always;"><br />
<td>${item.itemCode}</td> <div class="relative" >
<td>${item.supplierBatch}</td> <div class="q">Q</div>
<td>${item.sampleQty}</td> <table border='1'>
</tr> <thead>
<tr class='top1'>
<th>物料代码:</th>
<th colspan='3'>${item.itemCode}</th>
</tr>
</thead>
<tbody>
<tr>
<td>物料名称</td>
<td>${item.itemName}</td>
<td>发货单号</td>
<td>${this.data1.asnNumber}</td>
</tr>
<tr>
<td>供应商</td>
<td>${item.supplierCode}</td>
<td>批次</td>
<td>${item.supplierBatch}</td>
</tr>
<tr>
<td>到货数量</td>
<td>${item.quantityQty}</td>
<td>抽检数量</td>
<td>${item.sampleQty}</td>
</tr>
</tbody>
</table>
</div>
</div>
` `
}) })
str2 = str2.replace("strBody", str1)
console.log(335, str1)
this.newHtmlContent1 = this.newHtmlContent1.replace( this.newHtmlContent1 = this.newHtmlContent1.replace(
"mainBody", str2); //替换物品代码 "mainBody", str); //替换物品代码
}); });
}) })
@ -308,7 +321,7 @@
}, },
onReachBottom() { onReachBottom() {
if (this.tabIndex == 1) { if (this.tabIndex == 1) {
if (this.showTableInspectDTOList.length != this.data1.inspectDTOList.length) { if (this.showTableInspectDTOList != this.data1.inspectDTOList.length) {
this.getTableInspectDTOList() this.getTableInspectDTOList()
} }
} else { } else {
@ -323,7 +336,7 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.box { .box1 {
font-size: 26rpx; font-size: 26rpx;
/* display: flex; */ /* display: flex; */
/* padding: 20rpx; */ /* padding: 20rpx; */
@ -439,7 +452,7 @@
.top1 th { .top1 th {
font-weight: bold; font-weight: bold;
font-size: 16px; font-size: 13px;
padding: 10px; padding: 10px;
} }
@ -458,6 +471,12 @@
td { td {
padding: 10px; padding: 10px;
&:nth-child(2n){
width:290rpx;
}
&:nth-child(2n+1){
width:160rpx;
}
} }
@ -484,4 +503,17 @@
border-bottom: 4rpx solid rgb(60, 156, 255); border-bottom: 4rpx solid rgb(60, 156, 255);
} }
} }
.relative{
margin-bottom: 20rpx;
position: relative;
}
.q{
position: absolute;
left: 50%;
top:50%;
font-size: 400rpx;
transform: translate(-50% ,-50%);
color: rgba(0, 0, 0, 0.1);
}
</style> </style>
Write Preview
Loading…
Cancel
Save