From fe167dd71a1300aeae07522db990d6b3fdb77a0e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 12 三月 2026 13:26:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_中兴实强
---
src/views/procurementManagement/purchaseReturnOrder/New.vue | 618 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 618 insertions(+), 0 deletions(-)
diff --git a/src/views/procurementManagement/purchaseReturnOrder/New.vue b/src/views/procurementManagement/purchaseReturnOrder/New.vue
new file mode 100644
index 0000000..d2fe2a9
--- /dev/null
+++ b/src/views/procurementManagement/purchaseReturnOrder/New.vue
@@ -0,0 +1,618 @@
+<template>
+ <div>
+ <el-dialog
+ v-model="isShow"
+ title="鏂板閲囪喘閫�璐�"
+ width="1600"
+ @close="closeModal"
+ >
+ <el-form label-width="140px" :model="formState" label-position="top" ref="formRef" :inline="true">
+ <div class="section-title">
+ <span class="title-dot"></span>
+ <span class="title-text">鍩烘湰淇℃伅</span>
+ </div>
+ <el-form-item
+ label="閫�鏂欏崟鍙�"
+ prop="no"
+ :rules="[
+ {
+ required: !formState.isDefaultNo,
+ message: '璇疯緭鍏ラ��鏂欏崟鍙�',
+ trigger: 'blur',
+ }
+ ]"
+ >
+ <el-input
+ v-model="formState.no"
+ :placeholder="formState.isDefaultNo ? '浣跨敤绯荤粺缂栧彿' : '璇疯緭鍏ラ��鏂欏崟鍙�'"
+ :disabled="formState.isDefaultNo"
+ >
+ <template #append>
+ <el-checkbox v-model="formState.isDefaultNo" size="large" @change="handleChangeIsDefaultNo" />
+ </template>
+ </el-input>
+ </el-form-item>
+
+ <el-form-item
+ label="閫�璐ф柟寮�"
+ prop="returnType"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨閫�璐ф柟寮�',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select
+ v-model="formState.returnType"
+ placeholder="璇烽�夋嫨閫�璐ф柟寮�"
+ style="width: 240px"
+ >
+ <el-option label="閫�璐ч��娆�" :value="0" />
+ <el-option label="鎷掓敹" :value="1" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="渚涘簲鍟嗗悕绉�"
+ prop="supplierId"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨渚涘簲鍟�',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select
+ v-model="formState.supplierId"
+ placeholder="璇烽�夋嫨渚涘簲鍟�"
+ style="width: 240px"
+ @focus="fetchSupplierOptions"
+ @change="handleChangeSupplierId"
+ >
+ <el-option
+ v-for="item in supplierOptions"
+ :key="item.id"
+ :label="item.supplierName"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="椤圭洰"
+ prop="projectId"
+ >
+ <el-select
+ v-model="formState.projectId"
+ placeholder="璇烽�夋嫨椤圭洰"
+ style="width: 240px"
+ @focus="fetchProjectOptions"
+ >
+ <el-option
+ v-for="item in projectOptions"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="椤圭洰闃舵"
+ prop="projectPhase"
+ >
+ <el-select
+ v-model="formState.projectPhase"
+ placeholder="璇烽�夋嫨椤圭洰闃舵"
+ style="width: 240px"
+ >
+ <el-option
+ v-for="item in projectStageOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="鍒朵綔鏃ユ湡"
+ prop="preparedAt"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨鍒朵綔鏃ユ湡',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-date-picker
+ v-model="formState.preparedAt"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ type="date"
+ placeholder="璇烽�夋嫨鍒朵綔鏃ユ湡"
+ style="width: 240px"
+ clearable />
+ </el-form-item>
+
+ <el-form-item
+ label="鍒跺崟浜猴細"
+ prop="preparedUserId"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨鍒跺崟浜�',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select
+ v-model="formState.preparedUserId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ default-first-option
+ :reserve-keyword="false"
+ style="width: 240px"
+ @focus="fetchUserOptions"
+ >
+ <el-option
+ v-for="item in userOptions"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="閫�鏂欎汉锛�"
+ prop="returnUserId"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨閫�鏂欎汉',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select
+ v-model="formState.returnUserId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ default-first-option
+ style="width: 240px"
+ :reserve-keyword="false"
+ @focus="fetchUserOptions"
+ >
+ <el-option
+ v-for="item in userOptions"
+ :key="item.userId"
+ :label="item.nickName"
+ :value="item.userId"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="閲囪喘鍚堝悓鍙凤細"
+ prop="purchaseLedgerId"
+ :rules="[
+ {
+ required: true,
+ message: '璇烽�夋嫨閲囪喘鍚堝悓鍙�',
+ trigger: 'change',
+ }
+ ]"
+ >
+ <el-select
+ v-model="formState.purchaseLedgerId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ filterable
+ default-first-option
+ style="width: 240px"
+ :reserve-keyword="false"
+ @change="handleChangePurchaseLedgerId"
+ >
+ <el-option
+ v-for="item in purchaseLedgerOptions"
+ :key="item.id"
+ :label="item.purchaseContractNumber"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item
+ label="澶囨敞锛�"
+ prop="remark"
+ >
+ <el-input v-model="formState.remark" type="textarea" placeholder="璇疯緭鍏ュ娉�"/>
+ </el-form-item>
+
+ <div style="margin: 20px 0;">
+ <div class="section-title">
+ <span class="title-dot"></span>
+ <span class="title-text">浜у搧鍒楄〃</span>
+ </div>
+ <el-button type="primary" size="small" style="margin-bottom: 20px" @click="isShowProductsModal = true" :disabled="!formState.purchaseLedgerId">娣诲姞浜у搧</el-button>
+ <el-table :data="formState.purchaseReturnOrderProductsDtos"
+ border
+ max-height="400"
+ :scroll-y="true"
+ show-summary
+ :summary-method="summarizeChildrenTable">
+ <el-table-column align="center"
+ type="selection"
+ width="55" />
+ <el-table-column align="center"
+ label="搴忓彿"
+ type="index"
+ width="60" />
+ <el-table-column label="浜у搧澶х被"
+ prop="productCategory" />
+ <el-table-column label="瑙勬牸鍨嬪彿"
+ prop="specificationModel" />
+ <el-table-column label="鍗曚綅"
+ prop="unit"
+ width="70" />
+ <el-table-column label="鏁伴噺"
+ prop="quantity"
+ width="70" />
+ <el-table-column label="閫�璐ф暟閲�"
+ prop="returnQuantity"
+ width="180">
+ <template #default="scope">
+ <el-input-number v-model="scope.row.returnQuantity"
+ controls-position="right"
+ :step="1"
+ :min="1"
+ :max="scope.row.quantity"
+ required
+ placeholder="璇疯緭鍏ラ��璐ф暟閲�" />
+ </template>
+ </el-table-column>
+ <el-table-column label="搴撳瓨棰勮鏁伴噺"
+ prop="warnNum"
+ width="120"
+ show-overflow-tooltip />
+ <el-table-column label="绋庣巼(%)"
+ prop="taxRate"
+ width="80" />
+ <el-table-column label="鍚◣鍗曚环(鍏�)"
+ prop="taxInclusiveUnitPrice"
+ :formatter="formattedNumber"
+ width="150" />
+ <el-table-column label="鍚◣鎬讳环(鍏�)"
+ prop="taxInclusiveTotalPrice"
+ :formatter="formattedNumber"
+ width="150" />
+ <el-table-column label="涓嶅惈绋庢�讳环(鍏�)"
+ prop="taxExclusiveTotalPrice"
+ :formatter="formattedNumber"
+ width="150" />
+ <el-table-column label="鏄惁璐ㄦ"
+ prop="isChecked"
+ width="150">
+ <template #default="scope">
+ <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
+ {{ scope.row.isChecked ? '鏄�' : '鍚�' }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right"
+ label="鎿嶄綔"
+ width="100"
+ align="center">
+ <template #default="scope">
+ <el-button
+ link
+ type="danger"
+ size="small"
+ @click="delProduct(scope.$index)"
+ >
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+
+ <div class="section-title">
+ <span class="title-dot"></span>
+ <span class="title-text">璐圭敤淇℃伅</span>
+ </div>
+
+ <el-form-item
+ label="鏁村崟鎶樻墸棰濓細"
+ prop="totalDiscountAmount"
+ >
+ <el-input-number v-model="formState.totalDiscountAmount"
+ controls-position="right"
+ :step="0.01"
+ :precision="2"
+ style="width: 100%;"
+ @change="handleChangeTotalDiscountAmount"
+ placeholder="璇疯緭鍏ユ暣鍗曟姌鎵ｉ"/>
+ </el-form-item>
+
+ <el-form-item
+ label="鏁村崟鎶樻墸鐜囷細"
+ prop="totalDiscountAmount"
+ >
+ <el-input-number v-model="formState.totalDiscountRate"
+ controls-position="right"
+ :step="0.01"
+ :precision="2"
+ style="width: 100%;"
+ placeholder="璇疯緭鍏ユ暣鍗曟姌鎵ｇ巼"/>
+ </el-form-item>
+
+ <el-form-item
+ label="鎴愪氦閲戦锛�"
+ prop="totalAmount"
+ >
+ <el-input-number v-model="formState.totalAmount"
+ controls-position="right"
+ :step="0.01"
+ :precision="2"
+ style="width: 100%;"
+ @change="handleChangeTotalAmount"
+ placeholder="璇疯緭鍏ユ垚浜ら噾棰�"/>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="handleSubmit">纭</el-button>
+ <el-button @click="closeModal">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+
+ <ProductList
+ v-if="isShowProductsModal"
+ v-model:visible="isShowProductsModal"
+ :purchase-ledger-id="formState.purchaseLedgerId"
+ @completed="handleAddProduct"
+ />
+
+ </div>
+</template>
+
+<script setup>
+import {ref, computed, getCurrentInstance} from "vue";
+import {createPurchaseReturnOrder} from "@/api/procurementManagement/purchase_return_order.js";
+import {getOptions, purchaseList} from "@/api/procurementManagement/procurementLedger.js";
+import {userListNoPageByTenantId} from "@/api/system/user.js";
+const ProductList = defineAsyncComponent(() => import("@/views/procurementManagement/purchaseReturnOrder/ProductList.vue"));
+const props = defineProps({
+ visible: {
+ type: Boolean,
+ required: true,
+ }
+});
+let { proxy } = getCurrentInstance()
+const emit = defineEmits(['update:visible', 'completed']);
+
+// 鍝嶅簲寮忔暟鎹紙鏇夸唬閫夐」寮忕殑 data锛�
+const formState = ref({
+ no: '',
+ isDefaultNo: true,
+ returnType: 0,
+ remark: '',
+ supplierId: undefined,
+ projectId: undefined,
+ projectPhase: undefined,
+ preparedAt: undefined,
+ preparedUserId: undefined,
+ returnUserId: undefined,
+ purchaseLedgerId: undefined,
+ purchaseReturnOrderProductsDtos: [],
+ totalDiscountAmount: 0,
+ totalDiscountRate: undefined,
+ totalAmount: 0,
+});
+// 渚涘簲鍟嗛�夐」
+const supplierOptions = ref([])
+// 椤圭洰閫夐」
+const projectOptions = ref([])
+// 椤圭洰闃舵閫夐」
+const projectStageOptions = ref([
+ {
+ label: '绔嬮」',
+ value: 0,
+ },
+ {
+ label: '璁捐',
+ value: 1,
+ },
+ {
+ label: '閲囪喘',
+ value: 2,
+ },
+ {
+ label: '鐢熶骇',
+ value: 3,
+ },
+ {
+ label: '鍑鸿揣',
+ value: 4,
+ }
+])
+// 鐢ㄦ埛閫夐」
+const userOptions = ref([])
+// 閲囪喘鍙拌处閫夐」
+const purchaseLedgerOptions = ref([])
+// 鏄惁灞曠ず浜у搧鍒楄〃鏁版嵁
+const isShowProductsModal = ref(false)
+
+const isShow = computed({
+ get() {
+ return props.visible;
+ },
+ set(val) {
+ emit('update:visible', val);
+ },
+});
+
+const formattedNumber = (row, column, cellValue) => {
+ return parseFloat(cellValue).toFixed(2);
+};
+
+const closeModal = () => {
+ isShow.value = false;
+};
+
+const summarizeChildrenTable = (param) => {
+ return proxy.summarizeTable(
+ param,
+ [
+ "quantity",
+ "returnQuantity",
+ "taxInclusiveUnitPrice",
+ "taxInclusiveTotalPrice",
+ "taxExclusiveTotalPrice",
+ ],
+ {
+ quantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ returnQuantity: { noDecimal: true }, // 涓嶄繚鐣欏皬鏁�
+ }
+ );
+};
+
+const handleChangeTotalDiscountAmount= () => {
+ formState.value.totalAmount = formState.value.totalDiscountAmount * -1
+}
+
+const handleChangeTotalAmount= () => {
+ formState.value.totalDiscountAmount = formState.value.totalAmount * -1
+}
+
+// 鑾峰彇渚涘簲鍟嗛�夐」
+const fetchSupplierOptions = () => {
+ if (supplierOptions.value.length > 0) {
+ return
+ }
+ getOptions().then((res) => {
+ supplierOptions.value = res.data;
+ });
+}
+
+// 鑾峰彇椤圭洰閫夐」
+const fetchProjectOptions = () => {
+ if (projectOptions.value.length > 0) {
+ return
+ }
+ // todo 椤圭洰閫夐」
+}
+
+// 鑾峰彇鐢ㄦ埛閫夐」
+const fetchUserOptions = () => {
+ if (userOptions.value.length > 0) {
+ return
+ }
+ userListNoPageByTenantId().then((res) => {
+ userOptions.value = res.data;
+ });
+}
+
+// 澶勭悊鏀瑰彉渚涘簲鍟嗘暟鎹�
+const handleChangeSupplierId = () => {
+ formState.value.purchaseLedgerId = undefined
+ fetchPurchaseLedgerOptions()
+}
+
+// 鑾峰彇閲囪喘鍙拌处閫夐」
+const fetchPurchaseLedgerOptions = () => {
+ purchaseLedgerOptions.value = []
+ if (formState.value.supplierId) {
+ purchaseList({supplierId: formState.value.supplierId}).then((res) => {
+ purchaseLedgerOptions.value = res.rows;
+ });
+ }
+}
+
+// 澶勭悊鏀瑰彉閲囪喘鍙拌处鏁版嵁
+const handleChangePurchaseLedgerId = () => {
+ formState.value.purchaseReturnOrderProductsDtos = []
+}
+
+// 澶勭悊鏀瑰彉鏄惁榛樿缂栧彿
+const handleChangeIsDefaultNo = (checked) => {
+ if (checked) {
+ formState.value.no = ''
+ }
+}
+
+// 澧炲姞浜у搧
+const handleAddProduct = (selectedRows) => {
+ const existingIds = new Set(formState.value.purchaseReturnOrderProductsDtos.map(item => item.id));
+ const newProducts = selectedRows.filter(item => !existingIds.has(item.id)).map(item => ({
+ ...item,
+ returnQuantity: undefined,
+ salesLedgerProductId: item.id,
+ }));
+ formState.value.purchaseReturnOrderProductsDtos.push(...newProducts);
+}
+
+// 鍒犻櫎鍗曢」浜у搧
+const delProduct = (index) => {
+ formState.value.purchaseReturnOrderProductsDtos.splice(index, 1)
+}
+
+// 鎻愪氦琛ㄥ崟
+const handleSubmit = () => {
+ // 楠岃瘉閫�璐ф暟閲�
+ const hasEmptyReturnQuantity = formState.value.purchaseReturnOrderProductsDtos.some(item => !item.returnQuantity || item.returnQuantity <= 0);
+ if (hasEmptyReturnQuantity) {
+ proxy.$modal.msgError("璇蜂负鎵�鏈変骇鍝佸～鍐欓��璐ф暟閲�");
+ return;
+ }
+
+ proxy.$refs["formRef"].validate(valid => {
+ if (valid) {
+ createPurchaseReturnOrder(formState.value).then(res => {
+ // 鍏抽棴妯℃�佹
+ isShow.value = false;
+ // 鍛婄煡鐖剁粍浠跺凡瀹屾垚
+ emit('completed');
+ proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ })
+ }
+ })
+};
+
+defineExpose({
+ closeModal,
+ handleSubmit,
+ isShow,
+});
+</script>
+
+<style scoped lang="scss">
+.section-title {
+ display: flex;
+ align-items: center;
+ margin-bottom: 20px;
+ font-size: 16px;
+ font-weight: 600;
+ color: #303133;
+ width: 100%;
+ clear: both;
+}
+
+.title-dot {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ background-color: #409EFF;
+ border-radius: 50%;
+ margin-right: 8px;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3