root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add：换托组盘，中鼎回调需求单

Browse Source
This commit is contained in:
zhaoyf
2026-08-15 09:42:33 +08:00
parent 1560faa7a9
commit 74eaa903a6
18 changed files with 175 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nladmin-ui/src/views/system/appVersion/index.vue
View File

@@ -87,8 +87,9 @@ import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
const baseURLStr = window.g.prod.VUE_APP_BASE_API
const defaultForm = { app_name: '', version_name: '' }
const baseURL = process.env.NODE_ENV === 'production' ? baseURLStr : '/'
export default {
name: 'AppVersion',
@@ -116,9 +117,8 @@ export default {
}
},
computed: {
...mapGetters(['baseApi']),
publishUrl() {
return this.baseApi + '/api/appVersion/publish'
return baseURL + '/api/appVersion/publish'
}
},
methods: {
@@ -173,7 +173,7 @@ export default {
return value.toFixed(index === 0 ? 0 : 2) + ' ' + units[index]
},
downloadUrl(id) {
return this.baseApi + '/api/appVersion/download/' + id
return baseURL + '/api/appVersion/download/' + id
}
}
}

1
nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
View File

@@ -135,6 +135,7 @@
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
<el-table-column prop="source_load_port" label="指定上料口" align="center" width="130px" />
<el-table-column prop="vehicle_type" label="载具名称" align="center" width="130px" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>

7
nladmin-ui/src/views/wms/st/outbill/index.vue
View File

@@ -440,19 +440,22 @@ export default {
const skuName = dtl.material_name || ''
const qty = dtl.plan_qty || ''
const assQty = dtl.assign_qty || ''
const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#'
const vehicle_type = dtl.vehicle_type || ''
const source_load_port = dtl.source_load_port || ''
const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#' + source_load_port + '#'
const imgSrc = await QRCode.toDataURL(qrText, {
width: 300
})
html += '<div class="label">'
html += '<h3>上海诺力</h3>'
html += '<table>'
html += '<tr><td class="lbl">出库单号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="6"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">出库单号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="7"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">行号</td><td class="val">' + itemNo + '</td></tr>'
html += '<tr><td class="lbl">物料编码</td><td class="val">' + skuCode + '</td></tr>'
html += '<tr><td class="lbl">物料名称</td><td class="val">' + skuName + '</td></tr>'
html += '<tr><td class="lbl">出库数量</td><td class="val">' + assQty + '</td></tr>'
html += '<tr><td class="lbl">用料位置</td><td class="val">' + house_code + '</td></tr>'
html += '<tr><td class="lbl">载具名称</td><td class="val">' + vehicle_type + '</td></tr>'
html += '</table></div>'
}
html += '</body></html>'