root/hht-ftdl-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
xiangxy
2025-10-17 14:27:22 +08:00
parent 1258f85322
commit 8d645fdada
29 changed files with 123 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locale/en.json
View File

@@ -70,7 +70,7 @@
"grid.number": "序号", "grid.number": "序号",
"grid.roll-number": "卷号", "grid.roll-number": "卷号",
"grid.material-code": "物料编码", "grid.material-code": "物料编码",
"grid.material-name": "物料名称", "grid.material-name": "物料品种",
"grid.quantity": "数量", "grid.quantity": "数量",
"grid.unit": "单位", "grid.unit": "单位",
"grid.status": "状态", "grid.status": "状态",

2
locale/zh-Hans.json
View File

@@ -70,7 +70,7 @@
"grid.number": "序号", "grid.number": "序号",
"grid.roll-number": "卷号", "grid.roll-number": "卷号",
"grid.material-code": "物料编码", "grid.material-code": "物料编码",
"grid.material-name": "物料名称", "grid.material-name": "物料品种",
"grid.quantity": "数量", "grid.quantity": "数量",
"grid.unit": "单位", "grid.unit": "单位",
"grid.status": "状态", "grid.status": "状态",

2
pages/check/check-task.vue
View File

@@ -57,7 +57,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-10"> <view class="zd-col-10">
<span class="filter_label">物料名称</span> <span class="filter_label">物料品种</span>
</view> </view>
<view class="zd-col-24"> <view class="zd-col-24">
<input type="text" class="filter_input" v-model="data.material_name"> <input type="text" class="filter_input" v-model="data.material_name">

2
pages/common/mater-list.vue
View File

@@ -19,7 +19,7 @@
<thead> <thead>
<tr> <tr>
<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th> <th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
<th>物料名称</th> <th>物料品种</th>
<th>物料编码</th> <th>物料编码</th>
<th>数量</th> <th>数量</th>
<th>批次号</th> <th>批次号</th>

2
pages/common/mater-list2.vue
View File

@@ -18,7 +18,7 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>物料名称</th> <th>物料品种</th>
<th>物料规格</th> <th>物料规格</th>
<th>物料编码</th> <th>物料编码</th>
</tr> </tr>

4
pages/entry/bill-to-store.vue
View File

@@ -23,7 +23,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-6"> <view class="zd-col-6">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-18"> <view class="zd-col-18">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>
@@ -117,7 +117,7 @@
<tr> <tr>
<th>序号</th> <th>序号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>物料数量</th> <th>物料数量</th>
<th>单位</th> <th>单位</th>
<th>单据状态</th> <th>单据状态</th>

2
pages/entry/check-to-store.vue
View File

@@ -22,7 +22,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>

2
pages/entry/group-to-store.vue
View File

@@ -44,7 +44,7 @@
<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view> <view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
</view> </view>
<view class="zd-row border-bottom filter_input_disabled"> <view class="zd-row border-bottom filter_input_disabled">
<view class="zd-col-8"><span class="filter_label">物料名称</span></view> <view class="zd-col-8"><span class="filter_label">物料品种</span></view>
<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view> <view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
</view> </view>
<view class="zd-row border-bottom filter_input_disabled"> <view class="zd-row border-bottom filter_input_disabled">

2
pages/entry/groupplate-instore.vue
View File

@@ -29,7 +29,7 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>物料名称</th> <th>物料品种</th>
<th>物料编码</th> <th>物料编码</th>
<th>数量</th> <th>数量</th>
<th>批次号</th> <th>批次号</th>

2
pages/entry/mater-group-to-store.vue
View File

@@ -14,7 +14,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>

2
pages/entry/mater-group.vue
View File

@@ -34,7 +34,7 @@
<table> <table>
<thead> <thead>
<tr> <tr>
<th>物料名称</th> <th>物料品种</th>
<th>物料编码</th> <th>物料编码</th>
<th>数量</th> <th>数量</th>
<th>批次号</th> <th>批次号</th>

2
pages/entry/mater-group2.vue
View File

@@ -30,7 +30,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>

2
pages/entry/pick-yl-return-store.vue
View File

@@ -25,7 +25,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>

2
pages/entry/qualified-to-store.vue
View File

@@ -42,7 +42,7 @@
<view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view> <view class="zd-col-16"><span class="filter_input">{{currentData.material_code}}</span></view>
</view> </view>
<view class="zd-row border-bottom filter_input_disabled"> <view class="zd-row border-bottom filter_input_disabled">
<view class="zd-col-8"><span class="filter_label">物料名称</span></view> <view class="zd-col-8"><span class="filter_label">物料品种</span></view>
<view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view> <view class="zd-col-16"><span class="filter_input">{{currentData.material_name}}</span></view>
</view> </view>
<view class="zd-row border-bottom filter_input_disabled"> <view class="zd-row border-bottom filter_input_disabled">

2
pages/ftdl/kc-manage.vue
View File

@@ -43,7 +43,7 @@
<!-- <th>状态</th> <!-- <th>状态</th>
<th>点位</th> <th>点位</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>数量</th> <th>数量</th>
<th>单位</th> <th>单位</th>
<th>卷号</th> --> <th>卷号</th> -->

1
pages/ftdl/line-call-mater.vue
View File

@@ -141,6 +141,7 @@
title: res.message, title: res.message,
icon: 'none' icon: 'none'
}) })
this.currentData = {}
this.clearUp() this.clearUp()
this.disabled = false this.disabled = false
} catch (e) { } catch (e) {

23
pages/ftdl/line-down-mater.vue
View File

@@ -39,7 +39,7 @@
<!-- <th>序号</th> <!-- <th>序号</th>
<th>卷号</th> <th>卷号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>数量</th> <th>数量</th>
<th>单位</th> --> <th>单位</th> -->
<th>{{$t('grid.number')}}</th> <th>{{$t('grid.number')}}</th>
@@ -161,6 +161,7 @@
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
// console.log('扫码成功:', res.result); // console.log('扫码成功:', res.result);
if (res.result.includes(';')) {
const parts = res.result.split(';') const parts = res.result.split(';')
if (parts.length !== 5) { if (parts.length !== 5) {
uni.showToast({ uni.showToast({
@@ -187,6 +188,26 @@
return return
} }
this.dataList.push(currObj) this.dataList.push(currObj)
} else {
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: res.result,
material_code: '',
material_name: '',
qty: '',
measure_unit_id: ''
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
}
}, },
fail: (err) => { fail: (err) => {
console.log('扫码失败:', err) console.log('扫码失败:', err)

2
pages/ftdl/man-get-goods.vue
View File

@@ -25,7 +25,7 @@
<!-- <th>序号</th> <!-- <th>序号</th>
<th>卷号</th> <th>卷号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>数量</th> <th>数量</th>
<th>单位</th> --> <th>单位</th> -->
<th>{{$t('grid.number')}}</th> <th>{{$t('grid.number')}}</th>

23
pages/ftdl/man-load-goods.vue
View File

@@ -31,7 +31,7 @@
<!-- <th>序号</th> <!-- <th>序号</th>
<th>卷号</th> <th>卷号</th>
<th>物料编码</th> <th>物料编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>数量</th> <th>数量</th>
<th>单位</th> --> <th>单位</th> -->
<th>{{$t('grid.number')}}</th> <th>{{$t('grid.number')}}</th>
@@ -148,6 +148,7 @@
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
// console.log('扫码成功:', res.result); // console.log('扫码成功:', res.result);
if (res.result.includes(';')) {
const parts = res.result.split(';') const parts = res.result.split(';')
if (parts.length !== 5) { if (parts.length !== 5) {
uni.showToast({ uni.showToast({
@@ -174,6 +175,26 @@
return return
} }
this.dataList.push(currObj) this.dataList.push(currObj)
} else {
let currObj = {
mid: 'mid_' + Date.now() + '_' + Math.random().toString(36).substr(2, 9),
container_code: res.result,
material_code: '',
material_name: '',
qty: '',
measure_unit_id: ''
}
// 检查是否已存在相同卷号
const exists = this.dataList.some(item => item.container_code === currObj.container_code)
if (exists) {
uni.showToast({
title: '已存在',
icon: 'none'
})
return
}
this.dataList.push(currObj)
}
}, },
fail: (err) => { fail: (err) => {
console.log('扫码失败:', err) console.log('扫码失败:', err)

2
pages/ftdl/mater-list-cxjl.vue
View File

@@ -20,7 +20,7 @@
<thead> <thead>
<tr> <tr>
<!-- <th>物料编码</th> <!-- <th>物料编码</th>
<th>物料名称</th> --> <th>物料品种</th> -->
<th>{{$t('grid.material-code')}}</th> <th>{{$t('grid.material-code')}}</th>
<th>{{$t('grid.material-name')}}</th> <th>{{$t('grid.material-name')}}</th>
</tr> </tr>

2
pages/ftdl/mater-list0.vue
View File

@@ -29,7 +29,7 @@
<thead> <thead>
<tr> <tr>
<!-- <th>物料编码</th> <!-- <th>物料编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>单位</th> <th>单位</th>
<th>物料类型</th> --> <th>物料类型</th> -->
<th>{{$t('grid.material-code')}}</th> <th>{{$t('grid.material-code')}}</th>

2
pages/outbound/bill-out-store.vue
View File

@@ -50,7 +50,7 @@
<th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th> <th @tap="toAllCheck"><uni-icons :type="allCheck ? 'checkbox' : 'circle'" size="24" color="#4e6ef2"></uni-icons></th>
<th class="td_3"> <th class="td_3">
<view class="td_3"> <view class="td_3">
物料名称 物料品种
</view> </view>
</th> </th>
<th>物料编码</th> <th>物料编码</th>

2
pages/outbound/line-callmater.vue
View File

@@ -36,7 +36,7 @@
<tr> <tr>
<th>库位</th> <th>库位</th>
<th>载具编码</th> <th>载具编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>数量</th> <th>数量</th>
<th>物料规格</th> <th>物料规格</th>
<th>物料编码</th> <th>物料编码</th>

2
pages/outbound/mater-outstore.vue
View File

@@ -36,7 +36,7 @@
<tr> <tr>
<th>库位</th> <th>库位</th>
<th>载具编码</th> <th>载具编码</th>
<th>物料名称</th> <th>物料品种</th>
<th>数量</th> <th>数量</th>
<th>物料规格</th> <th>物料规格</th>
<th>物料编码</th> <th>物料编码</th>

2
pages/outbound/out-store-confirm.vue
View File

@@ -17,7 +17,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>

2
pages/outbound/produce-out-store-2nd.vue
View File

@@ -49,7 +49,7 @@
<thead> <thead>
<tr> <tr>
<th>选择</th> <th>选择</th>
<th class="td_3"><view class="td_3">物料名称</view></th> <th class="td_3"><view class="td_3">物料品种</view></th>
<th>物料编码</th> <th>物料编码</th>
<th>物料状态</th> <th>物料状态</th>
<th>数量</th> <th>数量</th>

2
pages/outbound/quhuo-confirm.vue
View File

@@ -17,7 +17,7 @@
</view> </view>
<view class="zd-row border-bottom"> <view class="zd-row border-bottom">
<view class="zd-col-7"> <view class="zd-col-7">
<span class="filter_label filter_input_disabled">物料名称</span> <span class="filter_label filter_input_disabled">物料品种</span>
</view> </view>
<view class="zd-col-17"> <view class="zd-col-17">
<input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled> <input type="text" class="filter_input filter_input_disabled" v-model="currentData.material_name" disabled>

2
pages/pick/pick-task.vue
View File

@@ -277,7 +277,7 @@
<td width="60%">${data.material_code}</td> <td width="60%">${data.material_code}</td>
</tr> </tr>
<tr> <tr>
<td width="40%">物料名称</td> <td width="40%">物料品种</td>
<td width="60%">${data.material_name}</td> <td width="60%">${data.material_name}</td>
</tr> </tr>
<tr> <tr>

4
utils/mork2.js
View File

@@ -144,7 +144,7 @@ export const outStorageOrderList = (page, size, type) => {
}, },
{ {
"code": "CCC", "code": "CCC",
"material_name": "物料名称", "material_name": "物料品种",
"material_code": "物料编码", "material_code": "物料编码",
"material_spec": "物料类型", "material_spec": "物料类型",
"stor_code": "FStockPallet", "stor_code": "FStockPallet",
@@ -201,7 +201,7 @@ export const outStorageOrderConfirm = (code) => {
}, },
{ {
"code": "CCC", "code": "CCC",
"material_name": "物料名称", "material_name": "物料品种",
"material_code": "物料编码", "material_code": "物料编码",
"material_spec": "物料类型", "material_spec": "物料类型",
"stor_code": "FStockPallet", "stor_code": "FStockPallet",