diff --git a/src/views/wms/wmsShippingBill/edit.vue b/src/views/wms/wmsShippingBill/edit.vue index 90d9da1..90c23c6 100644 --- a/src/views/wms/wmsShippingBill/edit.vue +++ b/src/views/wms/wmsShippingBill/edit.vue @@ -14,7 +14,7 @@ /> - + { 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' }], diff --git a/src/views/wms/wmsShippingBill/index.vue b/src/views/wms/wmsShippingBill/index.vue index fd5519b..a3286a0 100644 --- a/src/views/wms/wmsShippingBill/index.vue +++ b/src/views/wms/wmsShippingBill/index.vue @@ -119,8 +119,7 @@