This commit is contained in:
2025-05-22 16:08:45 +08:00
parent 3d3de77fa1
commit 7a69ba7cbf
21 changed files with 1219 additions and 296 deletions

View File

@@ -55,17 +55,20 @@
<template #menu-left>
<div class="selectBoxes">
<div class="selectItem">
<el-input v-model="state.formData.fBillNo" style="width: 12vw" :placeholder="t('message.index.DocNumber')" size="default" />
<el-input v-model="state.formData.fBillNo" style="width: 8vw" :placeholder="t('message.index.DocNumber')" size="default" />
</div>
<div class="selectItem">
<el-select :placeholder="t('message.index.DocStatus')" size="default" style="width: 12vw" v-model="state.formData.fmrpCloseStatus">
<el-input v-model="state.formData.materialCode" style="width: 8vw" :placeholder="t('message.tiaoma.pno')" size="default" />
</div>
<div class="selectItem">
<el-select :placeholder="t('message.index.DocStatus')" size="default" style="width: 8vw" v-model="state.formData.fmrpCloseStatus">
<el-option v-for="item in state.option.column[11].dicData" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
<div class="selectItem">
<el-date-picker
v-model="state.elDatePicker"
style="width: 25vw"
style="width: 22vw"
type="daterange"
range-separator="-"
:start-placeholder="t('message.index.StartDate')"
@@ -128,7 +131,7 @@
<script lang="ts" setup>
import { reactive, onMounted, computed, nextTick, ref } from 'vue';
import { useRouter } from 'vue-router';
import { listApi } from '../../api/list/index';
import { listApi } from '/@/api/list';
import { useI18n } from 'vue-i18n';
import SelectedData from '/@/views/mssPurchaseOrder/selectedData.vue';
import { ElMessage, ElMessageBox } from 'element-plus';
@@ -143,7 +146,6 @@ const state = reactive({
pageSize: 30,
},
option: {
height: computed(() => window.innerHeight - window.innerHeight * 0.23 + ''),
tip: false,
index: false,
menu: true,
@@ -152,7 +154,6 @@ const state = reactive({
delBtn: false,
editBtn: false,
align: 'center',
// searchLabelWidth:100,
selection: true,
reserveSelection: true,
searchMenuSpan: 3,
@@ -202,6 +203,7 @@ const state = reactive({
fDateBegin: '',
fDateEmd: '',
fmrpCloseStatus: '',
materialCode:''
},
selectedData: [],
chengNuoJiaoQiP: '',
@@ -522,8 +524,11 @@ onMounted(() => {
:deep(.el-form) {
flex: 1;
overflow: hidden;
}
:deep(.el-table--default){
height: 100%;
}
.system-user-container {
:deep(.el-card__body) {
display: flex;

View File

@@ -96,7 +96,6 @@ const state = reactive({
pageSize: 25,
},
option: {
height: computed(() => window.innerHeight - window.innerHeight * 0.23 + ''),
tip: false,
index: true,
menuWidth: 120,
@@ -143,7 +142,7 @@ const state = reactive({
],
width: '90',
},
{ label: computed(() => t('message.index.receivedQTY')), prop: 'sendedQty', width: '180' },
{ label: computed(() => t('message.index.receivedQTY')), prop: 'mssReceiveQty', width: '180' },
{ label: computed(() => t('message.index.unreceivedQTY')), prop: 'notSendQty', width: '110' },
{ label: computed(() => t('message.index.earliestDeliveryDate')), prop: 'chengNuoJiaoQi', width: '160' },
{ label: computed(() => t('message.index.latestDeliveryDate')), prop: 'newChengNuoJiaoQi', width: '160' },
@@ -445,7 +444,11 @@ onMounted(() => {
}
:deep(.el-form) {
flex: 1;
flex: 1;
overflow: hidden;
}
:deep(.el-table--default){
height: 100%;
}
.system-user-container {

View File

@@ -22,7 +22,7 @@
<el-input style="width: 300px" v-model="state.f_VHUB_Text" :placeholder="t('message.index.invoiceNumber')" size="default" />
</div>
<div style="display: flex; align-items: center; margin-bottom: 16px;margin-left: 32px">
<div>发票日期</div>
<div>{{ t('message.index.fprq') }}</div>
<el-date-picker
v-model="state.f_URXD_Date"
type="date"
@@ -33,6 +33,18 @@
value-format="YYYY-MM-DD"
/>
</div>
<div style="display: flex; align-items: center; margin-bottom: 16px;margin-left: 32px">
<div>{{ t('message.index.deliveryDate') }}</div>
<el-date-picker
v-model="state.faHuoDate"
type="date"
:placeholder="t('message.index.date')"
size="default"
style="width: 300px"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
/>
</div>
</div>
</template>
</avue-crud>
@@ -66,6 +78,7 @@ const state = reactive({
loading: false,
f_VHUB_Text: '',
f_URXD_Date: '',
faHuoDate:'',
fSupplierLot: '',
dialogVisible: true,
data: [],
@@ -90,7 +103,7 @@ const state = reactive({
{ label: computed(() => t('message.index.materialName')), prop: 'materialName', width: '180' },
{ label: computed(() => t('message.index.unit')), prop: 'unitName' },
{ label: computed(() => t('message.index.qty')), prop: 'qty' },
{ label: computed(() => t('message.index.receivedQTY')), prop: 'sendedQty' },
{ label: computed(() => t('message.index.receivedQTY')), prop: 'mssReceiveQty' },
{ label: computed(() => t('message.index.unreceivedQTY')), prop: 'notSendQtyText' },
{ label: computed(() => t('message.index.supplierLot')), prop: 'fSupplierLot' },
{ label: computed(() => t('message.index.shipmentQTY')), prop: 'notSendQty', width: '180' },
@@ -114,17 +127,20 @@ watch(
const batchAddInvoiceOrderFun = () => {
if(Local.get('setUserInfo').ifForeign === 1){
if(state.f_VHUB_Text === ''){
ElMessage.error('请填写发票号')
ElMessage.error(t('message.index.qtxfph'))
return
}
if(state.f_URXD_Date === ''){
ElMessage.error('请选择发票日期')
ElMessage.error(t('message.index.qtxfph'))
return
}
if(state.faHuoDate === ''){
ElMessage.error(t('message.index.deliveryDate'))
return
}
}
if (props.listData.length != 0) {
state.loading = true;
console.log(props.listData);
let arr: any = [];
props.listData.forEach((item: any) => {
arr.push({
@@ -134,7 +150,7 @@ const batchAddInvoiceOrderFun = () => {
});
});
listApi()
.batchAddInvoiceOrder({ f_VHUB_Text: state.f_VHUB_Text,f_URXD_Date:state.f_URXD_Date, upDateList: arr })
.batchAddInvoiceOrder({ f_VHUB_Text: state.f_VHUB_Text,f_URXD_Date:state.f_URXD_Date,faHuoDate:state.faHuoDate, upDateList: arr })
.then((res: any) => {
state.loading = false;
if (res.resultCode === 0) {