1.1.53 发货单的发货类型,发货方式改为必填。

dev
yinq 1 week ago
parent b77ff7ccce
commit 7836e62cc9

@ -14,7 +14,7 @@
/> />
</el-card> </el-card>
<!-- 全部到货确认区块查看/审批页都展示仅到货确认节点允许申请人录入 --> <!-- 全部到货确认区块查看/审批页都展示-->
<el-card <el-card
v-if="showArrivalConfirmSection" v-if="showArrivalConfirmSection"
shadow="never" shadow="never"
@ -570,7 +570,6 @@ const isCurrentTaskBusinessMatched = computed(() => {
const isArrivalConfirmApprover = computed(() => { const isArrivalConfirmApprover = computed(() => {
return ( return (
routeParams.value.type === 'approval' && routeParams.value.type === 'approval' &&
String(form.value.needArrivalConfirm || '') === '1' &&
isArrivalConfirmTask.value && isArrivalConfirmTask.value &&
isCurrentTaskBusinessMatched.value && isCurrentTaskBusinessMatched.value &&
String(userStore.userId || '') === String(form.value.createBy || '') String(userStore.userId || '') === String(form.value.createBy || '')
@ -579,7 +578,6 @@ const isArrivalConfirmApprover = computed(() => {
const showArrivalConfirmSection = computed(() => { const showArrivalConfirmSection = computed(() => {
const hasArrivalConfirmData = const hasArrivalConfirmData =
String(form.value.needArrivalConfirm || '') === '1' ||
!!form.value.isAllReceiving || !!form.value.isAllReceiving ||
!!form.value.arrivalConfirmTime || !!form.value.arrivalConfirmTime ||
!!form.value.arrivalConfirmByName || !!form.value.arrivalConfirmByName ||
@ -760,6 +758,7 @@ const validateContractWhenBind = (rule: any, value: any, callback: any) => {
const data = reactive<{ form: WmsShippingBillForm; rules: any }>({ const data = reactive<{ form: WmsShippingBillForm; rules: any }>({
form: { ...initFormData }, form: { ...initFormData },
rules: { rules: {
shippingType: [{ required: true, message: '发货类型不能为空', trigger: 'change' }],
shippingMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }], shippingMode: [{ required: true, message: '发货方式不能为空', trigger: 'change' }],
bindType: [{ required: true, message: '绑定类型不能为空', trigger: 'change' }], bindType: [{ required: true, message: '绑定类型不能为空', trigger: 'change' }],
projectId: [{ validator: validateProjectOrContract, trigger: 'change' }], projectId: [{ validator: validateProjectOrContract, trigger: 'change' }],

@ -119,8 +119,7 @@
</el-table-column> </el-table-column>
<el-table-column label="到货标识" align="center" prop="isAllReceiving" width="100" v-if="columns[9].visible"> <el-table-column label="到货标识" align="center" prop="isAllReceiving" width="100" v-if="columns[9].visible">
<template #default="scope"> <template #default="scope">
<dict-tag :options="is_all_receiving" :value="scope.row.needArrivalConfirm === '1' ? scope.row.isAllReceiving : undefined" /> <dict-tag :options="is_all_receiving" :value="scope.row.isAllReceiving" />
<span v-if="scope.row.needArrivalConfirm === '0'">-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货确认时间" align="center" prop="arrivalConfirmTime" width="160" v-if="columns[10].visible"> <el-table-column label="到货确认时间" align="center" prop="arrivalConfirmTime" width="160" v-if="columns[10].visible">

Loading…
Cancel
Save