product-inventory-management.git

			@@ -182,7 +182,6 @@
			approverNodes.value = [
			{ id: 1, userId: null }
			]
			console.log(userStore)
			form.value.approveUser = userStore.id;
			form.value.approveTime = getCurrentDate();

			@@ -46,6 +46,8 @@
			import InfoFormDia from "@/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue";
			import ApprovalDia from "@/views/collaborativeApproval/approvalProcess/components/approvalDia.vue";
			import {approveProcessDelete, approveProcessListPage} from "../../../api/collaborativeApproval/approvalProcess.js";
			import useUserStore from "@/store/modules/user";
			const userStore = useUserStore();

			const data = reactive({
			searchForm: {
			@@ -58,6 +60,7 @@
			label: "审批状态",
			prop: "approveStatus",
			dataType: "tag",
			width: 100,
			formatData: (params) => {
			if (params == 0) {
			return "待审核";
			@@ -103,6 +106,7 @@
			{
			label: "申请日期",
			prop: "approveTime",
			width: 120
			},
			{
			label: "结束日期",
			@@ -127,6 +131,7 @@
			clickFun: (row) => {
			openForm("edit", row);
			},
			disabled: (row) => row.approveStatus == 2 \|\| row.approveStatus == 1
			},
			{
			name: "审核",
			@@ -134,6 +139,7 @@
			clickFun: (row) => {
			openApprovalDia("approval", row);
			},
			disabled: (row) => row.approveUserCurrentId == null \|\| row.approveStatus == 2
			},
			{
			name: "详情",

			@@ -24,8 +24,8 @@
			<el-button type="primary" @click="handleAdd('add')">
			新增登记
			</el-button>
			<el-button @click="handleOut">导出</el-button>
			<el-button type="danger" plain @click="handleDelete">删除</el-button>
			<!-- <el-button @click="handleOut">导出</el-button>-->
			<!-- <el-button type="danger" plain @click="handleDelete">删除</el-button>-->
			</div>
			</div>
			<PIMTable

			@@ -12,7 +12,7 @@
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="来票金额：">
			<el-form-item label="含税总价(元)：">
			<el-text type="primary">{{ form.taxInclusiveTotalPrice }}</el-text>
			</el-form-item>
			</el-col>
			@@ -32,7 +32,7 @@
			</el-form-item>
			</el-col>
			<el-col :span="12">
			<el-form-item label="来票金额：">
			<el-form-item label="本次来票金额(元)：">
			<el-text type="success">{{ form.ticketsAmount }}</el-text>
			</el-form-item>
			</el-col>

	src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/collaborativeApproval/approvalProcess/index.vue	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/procurementManagement/invoiceEntry/index.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/procurementManagement/procurementInvoiceLedger/Form/EditForm.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史