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