aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '销账撤销功能' (#117) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/117
This commit is contained in:
wuteng 2025-10-17 10:14:34 +08:00
commit 6dcb5cec02
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/api/emis/emisSettleCancelAccount.js
View File

@ -90,4 +90,18 @@ export function revoke(ids) {
method: 'post',
data: ids
})
}
}
// 财务中心审核撤销
export function auditCenterRevoke(ids) {
return request({
url: '/emis/writeoffApply/auditCenterRevoke/' + ids,
method: 'post',
})
}
//总部确认撤销
export function auditHeadquartersRevoke(ids) {
return request({
url: '/emis/writeoffApply/auditHeadquartersRevoke/' + ids,
method: 'post',
})
}

3
src/views/emis/emisSettleBill/panel/CancelAccountApplicationListPanel.vue
View File

@ -83,10 +83,11 @@
<dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blHeadquartersConfirmed" />
</template>
</el-table-column>
<el-table-column :label="$t('审核时间')" align="center" prop="centerConfirmDate" min-width="100" />
<el-table-column :label="$t('中心审核时间')" align="center" prop="centerConfirmDate" min-width="120" />
<el-table-column :label="$t('中心审核人姓名')" align="center" prop="centerConfirmManName" min-width="120" />
<el-table-column :label="$t('中心驳回原因')" align="center" prop="centerRejectReason" min-width="110">
</el-table-column>
<el-table-column :label="$t('总部审核时间')" align="center" prop="headquartersConfirmDate" min-width="120" />
<el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="120" />
<el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="110">
</el-table-column>

34
src/views/emis/emisSettleBill/panel/CancelAccountCheckListPanel.vue
View File

@ -65,6 +65,10 @@
@click="handleauditHeadNoPass" v-hasPermi="['emis:writeoffApply:headquartersReject']">总部驳回</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['emis:writeoffApply:export']">导出</el-button>
<el-button style="margin-right: 5px;" type="danger" plain size="mini" :disabled="multiple || coRevokeFlag"
@click="handleRevoke" v-hasPermi="['emis:writeoffApply:revoke']">财务中心审核撤销</el-button>
<el-button style="margin-right: 5px;" type="danger" plain size="mini" :disabled="multiple"
@click="handleHeadquartersRevoke" v-hasPermi="['emis:writeoffApply:headquartersRevoke']">总部确认撤销</el-button>
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('申请编号')" align="center" prop="applyNo" min-width="100" />
@ -87,10 +91,11 @@
<dict-tag :options="dict.type.center_confirme_status" :value="scope.row.blHeadquartersConfirmed" />
</template>
</el-table-column>
<el-table-column :label="$t('审核时间')" align="center" prop="centerConfirmDate" min-width="100" />
<el-table-column :label="$t('中心审核时间')" align="center" prop="centerConfirmDate" min-width="120" />
<el-table-column :label="$t('中心审核人姓名')" align="center" prop="centerConfirmManName" min-width="120" />
<el-table-column :label="$t('中心驳回原因')" align="center" prop="centerRejectReason" min-width="110">
</el-table-column>
<el-table-column :label="$t('总部审核时间')" align="center" prop="eadquartersConfirmDate;" min-width="120" />
<el-table-column :label="$t('总部审核人姓名')" align="center" prop="headquartersConfirmManName" min-width="120" />
<el-table-column :label="$t('总部驳回原因')" align="center" prop="headquartersRejectReason" min-width="110">
</el-table-column>
@ -105,7 +110,7 @@ import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
import EmpNamePicker from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import CancelAccountApplicationFormPanel from '@/views/emis/emisSettleBill/panel/CancelAccountApplicationFormPanel.vue';
import { getWriteoffApplyList, auditCenterPass, auditCenterReject, auditHeadquartersConfirm, auditHeadquartersReject } from "@/api/emis/emisSettleCancelAccount";
import { getWriteoffApplyList, auditCenterPass, auditCenterReject, auditHeadquartersConfirm, auditHeadquartersReject, auditCenterRevoke, auditHeadquartersRevoke } from "@/api/emis/emisSettleCancelAccount";
export default {
name: "CancelAccountCheckListPanel",
@ -206,7 +211,8 @@ export default {
daterangeCreateTime: [],
// 更新网点时间范围
daterangeUpdateTime: [],
// 财务中心 撤销按钮 flag
coRevokeFlag: false,
// 查询参数
queryParams: {
pageNum: 1,
@ -288,6 +294,8 @@ export default {
this.selectionList = selection;
this.single = selection.length !== 1
this.multiple = !selection.length
//判断是否有 中部审核通过的
this.coRevokeFlag = selection.some(item => item.blHeadquartersConfirmed === '1');
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {
@ -437,6 +445,26 @@ export default {
dateTimeChange(value) {
this.dateTimeRange = value;
},
/** 财务中心审核撤销 */
handleRevoke(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否财务中心审核撤销?').then(function () {
return auditCenterRevoke(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => { });
},
/** 总部确认撤销 */
handleHeadquartersRevoke(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否总部审核撤销?').then(function () {
return auditHeadquartersRevoke(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("操作成功");
}).catch(() => { });
},
}
};
</script>