1、调整凭证
2、调整对账 3、解决正式结算冲突bug
This commit is contained in:
@@ -100,7 +100,7 @@
|
||||
width="120"
|
||||
fixed="right"
|
||||
align="center"
|
||||
/><el-table-column label="操作" width="200" fixed="right" align="left"
|
||||
/><el-table-column label="操作" width="320" fixed="right" align="left"
|
||||
><template #default="{ row }"
|
||||
><div class="voucher-manage-page__actions">
|
||||
<el-link
|
||||
@@ -120,6 +120,16 @@
|
||||
type="primary"
|
||||
@click="download(row)"
|
||||
>下载</el-link
|
||||
><el-link
|
||||
v-if="row.auditStatus === '审核驳回'"
|
||||
type="primary"
|
||||
@click="openUpload(row, 'reupload')"
|
||||
>重新上传</el-link
|
||||
><el-link
|
||||
v-if="row.auditStatus === '审核驳回'"
|
||||
type="primary"
|
||||
@click="openUpload(row, 'changeBatch')"
|
||||
>更换运单批次</el-link
|
||||
><el-link
|
||||
v-if="row.processStatus !== '处理完成' || row.auditStatus === '待审核'"
|
||||
type="primary"
|
||||
@@ -207,7 +217,7 @@
|
||||
|
||||
<el-dialog
|
||||
v-model="uploadVisible"
|
||||
:title="editing.id ? '更换运单批次' : '批量导入凭证'"
|
||||
:title="editing.id ? (uploadMode === 'reupload' ? '重新上传' : '更换运单批次') : '批量导入凭证'"
|
||||
width="1200px"
|
||||
destroy-on-close
|
||||
:before-close="beforeUploadDialogClose"
|
||||
@@ -525,7 +535,8 @@ const loading = ref(false),
|
||||
cancelledTaskIds = ref(new Set()),
|
||||
uploadCancelled = ref(false),
|
||||
activeUploadTaskId = ref(),
|
||||
selectedVoucherFile = ref();
|
||||
selectedVoucherFile = ref(),
|
||||
uploadMode = ref('');
|
||||
const query = reactive({
|
||||
voucherBatchNo: '',
|
||||
auditStatus: '',
|
||||
@@ -597,9 +608,10 @@ const loadProjects = async () => {
|
||||
const changeProject = projectId => {
|
||||
editing.projectName = projectOptions.value.find(item => item.id === projectId)?.projectName || '';
|
||||
};
|
||||
const openUpload = async row => {
|
||||
const openUpload = async (row, mode = '') => {
|
||||
await loadProjects();
|
||||
selectedVoucherFile.value = undefined;
|
||||
uploadMode.value = mode;
|
||||
Object.assign(editing, {
|
||||
id: row?.id || '',
|
||||
voucherBatchNo: row?.voucherBatchNo || '',
|
||||
@@ -610,6 +622,7 @@ const openUpload = async row => {
|
||||
fileTaskId: row?.fileTaskId || '',
|
||||
waybillImportBatchIds: [],
|
||||
});
|
||||
if (mode === 'reupload') Object.assign(editing, { fileName: '', fileUrl: '', fileTaskId: '' });
|
||||
uploadPercent.value = 0;
|
||||
selectedBatches.value = [];
|
||||
uploadVisible.value = true;
|
||||
|
||||
Reference in New Issue
Block a user