Compare commits

..

No commits in common. "a50994c1616969c902e20bc2d55c1cf82a08a11d" and "c0ae21753d7e6cc12b5c0ec7f3e5a0e4d69139e9" have entirely different histories.

2 changed files with 2 additions and 31 deletions

View File

@ -144,10 +144,6 @@
</el-table>
</div> -->
<el-row class="page-search" justify="end" align="middle">
<el-form-item label="过账日期" prop="state.commitDate" style="margin-top: 10px;">
<el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date"
placeholder="选择过账时间" value-format="YYYY-MM-DD" />
</el-form-item>
<div class="page-search-btns">
<!-- <el-button
type="primary"
@ -187,7 +183,6 @@ const { proxy }: any = getCurrentInstance()
const formDataRef = ref(ElForm)
const queryParamRef = ref(ElForm)
const state = reactive({
commitDate: '',
USE_LOCATION: '',
Button_state: false,
firstLocation: '',
@ -379,14 +374,6 @@ onMounted(() => {
hide: false
}
]
var newDate = new Date()
var year = newDate.getFullYear()
var moth = newDate.getMonth() + 1
if (moth < 10) moth = '0' + moth
var day = newDate.getDate()
if (day < 10) day = '0' + day
state.commitDate = year + '-' + moth + '-' + day
WareList()
getStorageSpecLocationList()
})
@ -424,7 +411,6 @@ async function handleReserve() {
erpLocation: state.formData.ERPRECEIVELOCATION,
erpFactory: state.formData.ERPRECEIVEFACTORY,
locationName: state.StorageSelect[0] || '',
commitDate: state.commitDate,
boxList: objectFull
}
await allocateStockInCommit(param)

View File

@ -106,11 +106,6 @@
</div>
<el-row class="page-search" justify="end" align="middle">
<div class="block" style="float: right">
<el-form-item label="过账日期" prop="state.commitDate">
<el-date-picker :clearable="true" :editable="true" v-model="state.commitDate" type="date" placeholder="选择过账时间" value-format="YYYY-MM-DD"/>
</el-form-item>
</div>
<div class="page-search-btns">
<el-button type="primary" @click="handleStockOut" :disabled="state.button_state" v-loading="state.button_loadings">出库</el-button>
</div>
@ -155,7 +150,6 @@ const state: any = reactive({
ABList: [{ value: 'A', label: 'A' }, { value: 'B', label: 'B' }],
ENDING: '',
INITILATION: '',
commitDate:'',
STOCKSELECTLIST: [] as any,
queryParams: {
queryId: "",
@ -314,13 +308,6 @@ onMounted(() => {
{ header: "生产日期", field: "MAKEDATE", hide: false },
{ header: "过期时间", field: "EXPIRINGDATE", hide: false },
];
let newDate = new Date();
let year = newDate.getFullYear();
let moth = newDate.getMonth() + 1;
if(moth < 10) moth = '0' + moth;
let day = newDate.getDate();
if(day < 10) day = '0' + day;
state.commitDate = year + '-' + moth + '-' + day
updateTableHeight();
window.addEventListener('resize', handleResize);
});
@ -500,17 +487,15 @@ function resetQuery() {
async function handleStockOut() {
if (state.MaterialPackingUsername.length > 0) {
let param = {
user: localStorage.get('userId'),
userId: localStorage.get('userId'),
siteName : "SDK",
receiveRequestName: state.queryParams.params.SHIPREQUESTNAME,
receiveRequestDetailName: state.queryParams.params.SHIPREQUESTDETAILNAME,
shipRequestName : state.queryParams.params.SHIPREQUESTNAME,
commitDate: state.commitDate,
};
purReturnCommit(param).then((res: any) => {
// handle(tempRow);
// handleQuery();
console.log(res)
if (IFTRUE(res)) {
state.loading = false;
state.loading2 = false;
@ -520,7 +505,7 @@ async function handleStockOut() {
state.button_state = false
state.button_loadings = false;
} else {
ElMessageBox.alert(res.message,"错误" , {
ElMessageBox.alert(res.data.RETURNCODE + '->' + res.data.RETURNMESSAGE, '', {
confirmButtonText: 'OK',
})
state.button_state = false