DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-01-14 08:32:02 +08:00
parent f0a4b9ffc5 a4e8262ce8
commit 4f1b1833de
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
klp-ui/src/views/wms/coil/do/warehousing.vue
View File

@@ -72,7 +72,8 @@
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" /> -->
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -276,10 +277,11 @@
</el-select>
</el-form-item>
<el-form-item :label="getItemLabel" prop="itemId">
<product-select v-if="editCoil.form.itemType == 'product' && editCoil.form.materialType === '成品'" v-model="editCoil.form.itemId" placeholder="请选择成品"
style="width: 100%;" clearable />
<raw-material-select v-else-if="editCoil.form.itemType == 'raw_material' && (editCoil.form.materialType === '原料')" v-model="editCoil.form.itemId"
placeholder="请选择原料" style="width: 100%;" clearable />
<product-select v-if="editCoil.form.itemType == 'product' && editCoil.form.materialType === '成品'"
v-model="editCoil.form.itemId" placeholder="请选择成品" style="width: 100%;" clearable />
<raw-material-select
v-else-if="editCoil.form.itemType == 'raw_material' && (editCoil.form.materialType === '原料')"
v-model="editCoil.form.itemId" placeholder="请选择原料" style="width: 100%;" clearable />
<div v-else>请先选择材料类型</div>
</el-form-item>
<el-form-item label="质量状态" prop="qualityStatus">
@@ -294,7 +296,8 @@
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" /> -->
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in dict.type.coil_quality_status" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
@@ -532,14 +535,23 @@ export default {
}
},
remoteMethod(query) {
listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 5, planType: 1 }).then(res => {
listDeliveryPlan({ planName: query, pageNum: 1, pageSize: 10, planType: 1 }).then(res => {
this.planList = res.rows
})
},
getTodayPlan() {
// 获取今天的收货计划
// 计划日期格式为yyyy-MM-dd
let today = new Date().toISOString().substring(0, 10)
function getBeijingDate() {
const today = new Date();
const year = today.getFullYear(); // 获取4位完整年份(2026)
const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份是0开始(0-11)，所以+1；补0成两位(01-12)
const day = String(today.getDate()).padStart(2, '0'); // 日期补0成两位(01-31)
return `${year}-${month}-${day}`;
}
// 调用使用
let today = getBeijingDate();
// let today = '2025-01-01'
listDeliveryPlan({ planDate: today, pageNum: 1, pageSize: 1, planType: 1 }).then(res => {
if (res.rows.length > 0) {