diff --git a/src/pages/business/leaseApply.vue b/src/pages/business/leaseApply.vue index 0dfdc88..c976b9a 100644 --- a/src/pages/business/leaseApply.vue +++ b/src/pages/business/leaseApply.vue @@ -22,9 +22,9 @@ @clear="clearPro" > - + @@ -148,7 +148,7 @@ const formData = ref({ leasePerson: '', phone: '', configId: '', - applyCode: '', + // applyCode: '', code:'' } }) @@ -192,15 +192,15 @@ const rules = ref({ } ] }, - applyCode: { - rules: [ - { - required: true, - errorMessage: '采购申请编号为必填项', - trigger: 'blur' - } - ] - }, + // applyCode: { + // rules: [ + // { + // required: true, + // errorMessage: '采购申请编号为必填项', + // trigger: 'blur' + // } + // ] + // }, leasePerson: { rules: [ { @@ -485,7 +485,7 @@ const submitNum = async() => { "phone":formData.value.phone, "code": formData.value.code, "standardConfigId":configId.value, - "applyCode":formData.value.applyCode, + // "applyCode":formData.value.applyCode, "bmFileInfos": bmFileInfos.value, }, "leaseApplyDetailsList":typeList.value diff --git a/src/pages/picking/review/details.vue b/src/pages/picking/review/details.vue index a4678a3..4479344 100644 --- a/src/pages/picking/review/details.vue +++ b/src/pages/picking/review/details.vue @@ -58,7 +58,11 @@ }" > {{ item.isAccept == 0 ? '待审批' : item.isAccept == 1 ? '已通过' : '已驳回' }} - {{ item.createTime ? ` ${item.createTime}` : '' }} +
+ {{ item.auditBy ? item.auditBy : '' }} +
+ + {{ item.createTime ? item.createTime : '' }} @@ -271,6 +275,7 @@ const fetchAuditInfo = async () => { const res = await getAuditInfoAPI({taskId:queryParams.value.taskId}) console.log('🚀 ~ fetchAuditInfo ~ res:', res) auditingList.value = res.rows + console.log('🚀 ~ fetchAuditInfo ~ auditingList:', auditingList.value) } catch (error) { // 打印错误信息 @@ -302,7 +307,7 @@ const getCodeDeviceListData = async () => { const handleReview = (action) => { uni.showModal({ title: action == 1 ? '通过' : '驳回', - content: '请输入审核意见', + placeholderText: '请输入审核意见', editable: true, confirmText: '确认', cancelText: '取消', @@ -398,7 +403,9 @@ const onHandleOutbound = async () => {