From a2c33664f683aee11fdc62391c8d1e21cc74f5b2 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 21 五月 2026 17:24:49 +0800
Subject: [PATCH] 天津宝东 1.修改展示字段
---
src/views/salesManagement/salesQuotation/index.vue | 1000 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 661 insertions(+), 339 deletions(-)
diff --git a/src/views/salesManagement/salesQuotation/index.vue b/src/views/salesManagement/salesQuotation/index.vue
index b89dad1..c5ef3ea 100644
--- a/src/views/salesManagement/salesQuotation/index.vue
+++ b/src/views/salesManagement/salesQuotation/index.vue
@@ -3,35 +3,20 @@
<el-card class="box-card">
<!-- 鎼滅储鍖哄煙 -->
<el-row :gutter="20" class="search-row">
- <el-col :span="6">
+ <el-col :span="8">
<el-input
- v-model="searchForm.quotationNo"
- placeholder="璇疯緭鍏ユ姤浠峰崟鍙�"
+ v-model="searchForm.product"
+ placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
clearable
- @keyup.enter="handleSearch"
+ @keyup.enter="handleSearch(true)"
>
<template #prefix>
<el-icon><Search /></el-icon>
</template>
</el-input>
</el-col>
- <el-col :span="6">
- <el-select v-model="searchForm.customer" placeholder="璇烽�夋嫨瀹㈡埛" clearable>
- <el-option label="涓婃捣绉戞妧鏈夐檺鍏徃" value="涓婃捣绉戞妧鏈夐檺鍏徃"></el-option>
- <el-option label="娣卞湷鐢靛瓙鏈夐檺鍏徃" value="娣卞湷鐢靛瓙鏈夐檺鍏徃"></el-option>
- <el-option label="鍖椾含璐告槗鍏徃" value="鍖椾含璐告槗鍏徃"></el-option>
- </el-select>
- </el-col>
- <el-col :span="6">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鎶ヤ环鐘舵��" clearable>
- <el-option label="鑽夌" value="鑽夌"></el-option>
- <el-option label="宸插彂閫�" value="宸插彂閫�"></el-option>
- <el-option label="瀹㈡埛纭" value="瀹㈡埛纭"></el-option>
- <el-option label="宸茶繃鏈�" value="宸茶繃鏈�"></el-option>
- </el-select>
- </el-col>
- <el-col :span="6">
- <el-button type="primary" @click="handleSearch">鎼滅储</el-button>
+ <el-col :span="4">
+ <el-button type="primary" @click="handleSearch(true)">鎼滅储</el-button>
<el-button @click="resetSearch">閲嶇疆</el-button>
<el-button style="float: right;" type="primary" @click="handleAdd">
鏂板鎶ヤ环
@@ -48,29 +33,29 @@
stripe
height="calc(100vh - 22em)"
>
- <el-table-column prop="id" label="ID" width="80" align="center"/>
- <el-table-column prop="quotationNo" label="鎶ヤ环鍗曞彿" width="150" />
- <el-table-column prop="customer" label="瀹㈡埛鍚嶇О" />
- <el-table-column prop="salesperson" label="涓氬姟鍛�" width="100" />
- <el-table-column prop="quotationDate" label="鎶ヤ环鏃ユ湡" width="120" />
- <el-table-column prop="validDate" label="鏈夋晥鏈熻嚦" width="120" />
- <el-table-column prop="totalAmount" label="鎶ヤ环閲戦" width="120">
- <template #default="scope">
- 楼{{ scope.row.totalAmount.toFixed(2) }}
- </template>
+ <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+ <el-table-column prop="product" label="浜у搧鍚嶇О" min-width="180" show-overflow-tooltip />
+ <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" min-width="140" show-overflow-tooltip />
+ <el-table-column prop="paper" label="绾稿紶" min-width="120" show-overflow-tooltip />
+ <el-table-column prop="paperWeight" label="瀹氶噺" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="unitPrice" label="鍗曚环" width="120" align="right">
+ <template #default="{ row }">{{ formatMoney(row.unitPrice) }}</template>
</el-table-column>
- <el-table-column prop="status" label="鎶ヤ环鐘舵��" width="100">
- <template #default="scope">
- <el-tag :type="getStatusType(scope.row.status)">
- {{ scope.row.status }}
- </el-tag>
- </template>
+ <el-table-column prop="printingFee" label="鍗扮増璐�" width="120" align="right">
+ <template #default="{ row }">{{ formatMoney(row.printingFee) }}</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="250" fixed="right" align="center">
+ <el-table-column prop="dieCuttingFee" label="鍒�鐗堣垂" width="120" align="right">
+ <template #default="{ row }">{{ formatMoney(row.dieCuttingFee) }}</template>
+ </el-table-column>
+ <el-table-column prop="grindingFee" label="纾ㄥ叿璐�" width="120" align="right">
+ <template #default="{ row }">{{ formatMoney(row.grindingFee) }}</template>
+ </el-table-column>
+ <el-table-column prop="quantity" label="鏁伴噺" width="90" align="right" />
+ <el-table-column label="鎿嶄綔" width="200" fixed="right" align="center">
<template #default="scope">
- <el-button link type="primary" @click="handleView(scope.row)">鏌ョ湅</el-button>
- <el-button link type="primary" @click="handleEdit(scope.row)" v-if="scope.row.status === '鑽夌'">缂栬緫</el-button>
- <el-button link type="danger" @click="handleDelete(scope.row)" v-if="scope.row.status === '鑽夌'">鍒犻櫎</el-button>
+ <el-button link type="primary" @click="handleEdit(scope.row)">缂栬緫</el-button>
+ <el-button link type="primary" @click="handleView(scope.row)" style="color: #67C23A">鏌ョ湅</el-button>
+ <el-button link type="danger" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -86,114 +71,106 @@
</el-card>
<!-- 鏂板/缂栬緫瀵硅瘽妗� -->
- <el-dialog v-model="dialogVisible" :title="dialogTitle" width="900px" :close-on-click-modal="false">
- <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
- <!-- 鍩烘湰淇℃伅 -->
- <el-card class="form-card" shadow="never">
- <template #header>
- <span class="card-title">鍩烘湰淇℃伅</span>
- </template>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="瀹㈡埛鍚嶇О" prop="customer">
- <el-select v-model="form.customer" placeholder="璇烽�夋嫨瀹㈡埛" style="width: 100%" @change="handleCustomerChange">
- <el-option label="涓婃捣绉戞妧鏈夐檺鍏徃" value="涓婃捣绉戞妧鏈夐檺鍏徃"></el-option>
- <el-option label="娣卞湷鐢靛瓙鏈夐檺鍏徃" value="娣卞湷鐢靛瓙鏈夐檺鍏徃"></el-option>
- <el-option label="鍖椾含璐告槗鍏徃" value="鍖椾含璐告槗鍏徃"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="涓氬姟鍛�" prop="salesperson">
- <el-select v-model="form.salesperson" placeholder="璇烽�夋嫨涓氬姟鍛�" style="width: 100%">
- <el-option label="闄堝織寮�" value="闄堝織寮�"></el-option>
- <el-option label="鍒橀泤濠�" value="鍒橀泤濠�"></el-option>
- <el-option label="鐜嬪缓鍥�" value="鐜嬪缓鍥�"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="鎶ヤ环鏃ユ湡" prop="quotationDate">
- <el-date-picker
- v-model="form.quotationDate"
- type="date"
- placeholder="閫夋嫨鎶ヤ环鏃ユ湡"
- style="width: 100%"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鏈夋晥鏈熻嚦" prop="validDate">
- <el-date-picker
- v-model="form.validDate"
- type="date"
- placeholder="閫夋嫨鏈夋晥鏈�"
- style="width: 100%"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="12">
- <el-form-item label="浠樻鏂瑰紡" prop="paymentMethod">
- <el-select v-model="form.paymentMethod" placeholder="璇烽�夋嫨浠樻鏂瑰紡" style="width: 100%">
- <el-option label="鍏ㄦ鍒颁粯" value="鍏ㄦ鍒颁粯"></el-option>
- <el-option label="鍒嗘湡浠樻" value="鍒嗘湡浠樻"></el-option>
- <el-option label="鏈堢粨" value="鏈堢粨"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="浜よ揣鏈�" prop="deliveryPeriod">
- <el-input v-model="form.deliveryPeriod" placeholder="璇疯緭鍏ヤ氦璐ф湡" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-card>
-
+ <FormDialog v-model="dialogVisible" :title="dialogTitle" width="85%" :close-on-click-modal="false" @close="dialogVisible = false" @confirm="handleSubmit" @cancel="dialogVisible = false">
+ <div class="quotation-form-container">
+ <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="quotation-form">
<!-- 浜у搧淇℃伅 -->
- <el-card class="form-card" shadow="never">
+ <el-card class="form-card" shadow="hover">
<template #header>
- <div class="card-header">
+ <div class="card-header-wrapper">
+ <el-icon class="card-icon"><Box /></el-icon>
<span class="card-title">浜у搧淇℃伅</span>
- <el-button type="primary" size="small" @click="addProduct">娣诲姞浜у搧</el-button>
+ <el-button type="primary" size="small" @click="addProduct" class="header-btn" :disabled="isEdit">
+ <el-icon><Plus /></el-icon>
+ 娣诲姞浜у搧
+ </el-button>
</div>
</template>
- <el-table :data="form.products" border style="width: 100%">
- <el-table-column prop="productName" label="浜у搧鍚嶇О" width="200">
+ <div class="form-content">
+ <el-table :data="form.products" border style="width: 100%" class="product-table" v-if="form.products.length > 0">
+ <el-table-column prop="product" label="浜у搧鍚嶇О" width="200">
<template #default="scope">
- <el-input v-model="scope.row.productName" placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�" />
+ <el-form-item :prop="`products.${scope.$index}.productId`" class="product-table-form-item">
+ <el-tree-select
+ v-model="scope.row.productId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ check-strictly
+ @change="getModels($event, scope.row)"
+ :data="productOptions"
+ :render-after-expand="false"
+ style="width: 100%"
+ />
+ </el-form-item>
</template>
</el-table-column>
- <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="150">
+ <el-table-column prop="specification" label="瑙勬牸鍨嬪彿" width="200">
<template #default="scope">
- <el-input v-model="scope.row.specification" placeholder="瑙勬牸鍨嬪彿" />
+ <el-form-item :prop="`products.${scope.$index}.specificationId`" class="product-table-form-item">
+ <el-select
+ v-model="scope.row.specificationId"
+ placeholder="璇烽�夋嫨"
+ clearable
+ @change="getProductModel($event, scope.row)"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in scope.row.modelOptions || []"
+ :key="item.id"
+ :label="item.model"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
</template>
</el-table-column>
- <el-table-column prop="quantity" label="鏁伴噺" width="100">
+ <el-table-column prop="unit" label="鍗曚綅">
<template #default="scope">
- <el-input-number v-model="scope.row.quantity" :min="1" :precision="0" style="width: 100%" />
+ <el-form-item :prop="`products.${scope.$index}.unit`" class="product-table-form-item">
+ <el-input v-model="scope.row.unit" placeholder="鍗曚綅" clearable/>
+ </el-form-item>
</template>
</el-table-column>
- <el-table-column prop="unit" label="鍗曚綅" width="80">
+ <el-table-column prop="paper" label="绾稿紶" width="180">
<template #default="scope">
- <el-input v-model="scope.row.unit" placeholder="鍗曚綅" />
+ <el-form-item :prop="`products.${scope.$index}.paper`" class="product-table-form-item">
+ <el-input v-model="scope.row.paper" placeholder="绾稿紶" clearable />
+ </el-form-item>
</template>
</el-table-column>
- <el-table-column prop="unitPrice" label="鍗曚环" width="120">
+ <el-table-column prop="paperWeight" label="瀹氶噺" width="140">
<template #default="scope">
- <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" @change="calculateAmount(scope.row)" />
+ <el-form-item :prop="`products.${scope.$index}.paperWeight`" class="product-table-form-item">
+ <el-input v-model="scope.row.paperWeight" placeholder="瀹氶噺" clearable />
+ </el-form-item>
</template>
</el-table-column>
- <el-table-column prop="amount" label="閲戦" width="120">
+ <el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
- <span>楼{{ scope.row.amount.toFixed(2) }}</span>
+ <el-form-item :prop="`products.${scope.$index}.unitPrice`" class="product-table-form-item">
+ <el-input-number v-model="scope.row.unitPrice" :min="0" :precision="2" style="width: 100%" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="printingFee" label="鍗扮増璐�" width="140">
+ <template #default="scope">
+ <el-form-item :prop="`products.${scope.$index}.printingFee`" class="product-table-form-item">
+ <el-input-number v-model="scope.row.printingFee" :min="0" :precision="2" style="width: 100%" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="dieCuttingFee" label="鍒�鐗堣垂" width="140">
+ <template #default="scope">
+ <el-form-item :prop="`products.${scope.$index}.dieCuttingFee`" class="product-table-form-item">
+ <el-input-number v-model="scope.row.dieCuttingFee" :min="0" :precision="2" style="width: 100%" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ <el-table-column prop="grindingFee" label="纾ㄥ叿璐�" width="140">
+ <template #default="scope">
+ <el-form-item :prop="`products.${scope.$index}.grindingFee`" class="product-table-form-item">
+ <el-input-number v-model="scope.row.grindingFee" :min="0" :precision="2" style="width: 100%" />
+ </el-form-item>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="80" align="center">
@@ -202,106 +179,68 @@
</template>
</el-table-column>
</el-table>
- </el-card>
-
- <!-- 璐圭敤淇℃伅 -->
- <el-card class="form-card" shadow="never">
- <template #header>
- <span class="card-title">璐圭敤淇℃伅</span>
- </template>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item label="浜у搧灏忚">
- <el-input-number v-model="form.subtotal" :precision="2" :min="0" style="width: 100%" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="杩愯垂">
- <el-input-number v-model="form.freight" :precision="2" :min="0" style="width: 100%" @change="calculateTotal" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鍏朵粬璐圭敤">
- <el-input-number v-model="form.otherFee" :precision="2" :min="0" style="width: 100%" @change="calculateTotal" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="8">
- <el-form-item label="鎶樻墸鐜�(%)">
- <el-input-number v-model="form.discountRate" :precision="2" :min="0" :max="100" style="width: 100%" @change="calculateTotal" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶樻墸閲戦">
- <el-input-number v-model="form.discountAmount" :precision="2" :min="0" style="width: 100%" readonly />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ヤ环鎬婚">
- <el-input-number v-model="form.totalAmount" :precision="2" :min="0" style="width: 100%" readonly />
- </el-form-item>
- </el-col>
- </el-row>
+ <el-empty v-else description="鏆傛棤浜у搧锛岃鐐瑰嚮娣诲姞浜у搧" :image-size="80" />
+ </div>
</el-card>
<!-- 澶囨敞淇℃伅 -->
- <el-card class="form-card" shadow="never">
+ <el-card class="form-card" shadow="hover">
<template #header>
- <span class="card-title">澶囨敞淇℃伅</span>
+ <div class="card-header-wrapper">
+ <el-icon class="card-icon"><EditPen /></el-icon>
+ <span class="card-title">澶囨敞淇℃伅</span>
+ </div>
</template>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark" placeholder="璇疯緭鍏ュ娉ㄤ俊鎭�" rows="3"></el-input>
- </el-form-item>
+ <div class="form-content">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ type="textarea"
+ v-model="form.remark"
+ placeholder="璇疯緭鍏ュ娉ㄤ俊鎭紙閫夊~锛�"
+ :rows="4"
+ maxlength="500"
+ show-word-limit
+ ></el-input>
+ </el-form-item>
+ </div>
</el-card>
</el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="handleSubmit">纭� 瀹�</el-button>
- </div>
- </template>
- </el-dialog>
+ </div>
+ </FormDialog>
<!-- 鏌ョ湅璇︽儏瀵硅瘽妗� -->
<el-dialog v-model="viewDialogVisible" title="鎶ヤ环璇︽儏" width="800px">
- <el-descriptions :column="2" border>
- <el-descriptions-item label="鎶ヤ环鍗曞彿">{{ currentQuotation.quotationNo }}</el-descriptions-item>
- <el-descriptions-item label="瀹㈡埛鍚嶇О">{{ currentQuotation.customer }}</el-descriptions-item>
- <el-descriptions-item label="涓氬姟鍛�">{{ currentQuotation.salesperson }}</el-descriptions-item>
- <el-descriptions-item label="鎶ヤ环鏃ユ湡">{{ currentQuotation.quotationDate }}</el-descriptions-item>
- <el-descriptions-item label="鏈夋晥鏈熻嚦">{{ currentQuotation.validDate }}</el-descriptions-item>
- <el-descriptions-item label="浠樻鏂瑰紡">{{ currentQuotation.paymentMethod }}</el-descriptions-item>
- <el-descriptions-item label="浜よ揣鏈�">{{ currentQuotation.deliveryPeriod }}</el-descriptions-item>
- <el-descriptions-item label="鎶ヤ环鐘舵��">
- <el-tag :type="getStatusType(currentQuotation.status)">{{ currentQuotation.status }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="鎶ヤ环鎬婚" :span="2">
- <span style="font-size: 18px; color: #e6a23c; font-weight: bold;">楼{{ currentQuotation.totalAmount?.toFixed(2) }}</span>
- </el-descriptions-item>
- </el-descriptions>
-
- <div style="margin-top: 20px;">
+ <div style="margin: 20px 0;">
<h4>浜у搧鏄庣粏</h4>
<el-table :data="currentQuotation.products" border style="width: 100%">
- <el-table-column prop="productName" label="浜у搧鍚嶇О" />
+ <el-table-column prop="product" label="浜у搧鍚嶇О" />
<el-table-column prop="specification" label="瑙勬牸鍨嬪彿" />
- <el-table-column prop="quantity" label="鏁伴噺" />
<el-table-column prop="unit" label="鍗曚綅" />
+ <el-table-column prop="paper" label="绾稿紶" />
+ <el-table-column prop="paperWeight" label="瀹氶噺" />
<el-table-column prop="unitPrice" label="鍗曚环">
<template #default="scope">
楼{{ scope.row.unitPrice.toFixed(2) }}
</template>
</el-table-column>
- <el-table-column prop="amount" label="閲戦">
+ <el-table-column prop="printingFee" label="鍗扮増璐�">
<template #default="scope">
- 楼{{ scope.row.amount.toFixed(2) }}
+ 楼{{ Number(scope.row.printingFee || 0).toFixed(2) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="dieCuttingFee" label="鍒�鐗堣垂">
+ <template #default="scope">
+ 楼{{ Number(scope.row.dieCuttingFee || 0).toFixed(2) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="grindingFee" label="纾ㄥ叿璐�">
+ <template #default="scope">
+ 楼{{ Number(scope.row.grindingFee || 0).toFixed(2) }}
</template>
</el-table-column>
</el-table>
</div>
-
- <div v-if="currentQuotation.remark" style="margin-top: 20px;">
+ <div v-if="currentQuotation.remark" style="margin-top: 12px;">
<h4>澶囨敞</h4>
<p>{{ currentQuotation.remark }}</p>
</div>
@@ -310,86 +249,48 @@
</template>
<script setup>
-import { ref, reactive, computed } from 'vue'
+import { ref, reactive, computed, onMounted, markRaw, shallowRef } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { Search } from '@element-plus/icons-vue'
+import { Search, Box, EditPen, Plus } from '@element-plus/icons-vue'
import Pagination from '@/components/PIMTable/Pagination.vue'
+import FormDialog from '@/components/Dialog/FormDialog.vue'
+import {
+ quotationProductListPage,
+ getQuotationProductInfo,
+ addOrUpdateQuotationProduct,
+ editQuotationProduct,
+ deleteQuotationProduct
+} from '@/api/salesManagement/salesQuotationProduct.js'
+import {modelList, productTreeList} from "@/api/basicData/product.js";
+// import {listCustomerPrivatePool} from "@/api/basicData/customerFile.js";
+import { userListNoPage } from "@/api/system/user.js";
// 鍝嶅簲寮忔暟鎹�
const loading = ref(false)
const searchForm = reactive({
- quotationNo: '',
- customer: '',
- status: ''
+ product: ''
})
-const quotationList = ref([
- {
- id: 1,
- quotationNo: 'QT202312001',
- customer: '涓婃捣绉戞妧鏈夐檺鍏徃',
- salesperson: '闄堝織寮�',
- quotationDate: '2023-12-01',
- validDate: '2023-12-31',
- totalAmount: 50000.00,
- paymentMethod: '鍏ㄦ鍒颁粯',
- deliveryPeriod: '30澶�',
- status: '宸插彂閫�',
- remark: '閲嶈瀹㈡埛鎶ヤ环',
- products: [
- { productName: '宸ヤ笟浼犳劅鍣�', specification: 'SEN-001', quantity: 10, unit: '涓�', unitPrice: 5000, amount: 50000 }
- ]
- },
- {
- id: 2,
- quotationNo: 'QT202312002',
- customer: '娣卞湷鐢靛瓙鏈夐檺鍏徃',
- salesperson: '鍒橀泤濠�',
- quotationDate: '2023-12-02',
- validDate: '2023-12-31',
- totalAmount: 35000.00,
- paymentMethod: '鍒嗘湡浠樻',
- deliveryPeriod: '20澶�',
- status: '瀹㈡埛纭',
- remark: '甯歌鎶ヤ环',
- products: [
- { productName: '鎺у埗妯″潡', specification: 'CTL-002', quantity: 5, unit: '涓�', unitPrice: 7000, amount: 35000 }
- ]
- },
- {
- id: 3,
- quotationNo: 'QT202312003',
- customer: '鍖椾含璐告槗鍏徃',
- salesperson: '鐜嬪缓鍥�',
- quotationDate: '2023-12-03',
- validDate: '2023-12-31',
- totalAmount: 28000.00,
- paymentMethod: '鏈堢粨',
- deliveryPeriod: '15澶�',
- status: '鑽夌',
- remark: '鏂板鎴锋姤浠�',
- products: [
- { productName: '鏁版嵁閲囬泦鍣�', specification: 'DAQ-003', quantity: 4, unit: '涓�', unitPrice: 7000, amount: 28000 }
- ]
- }
-])
-
+const quotationList = ref([])
+const userList = ref([])
+const productOptions = ref([]);
+const modelOptions = ref([]);
const pagination = reactive({
total: 3,
currentPage: 1,
- pageSize: 10
+ pageSize: 100
})
const dialogVisible = ref(false)
const viewDialogVisible = ref(false)
const dialogTitle = ref('鏂板鎶ヤ环')
const form = reactive({
+ quotationNo: '',
customer: '',
salesperson: '',
quotationDate: '',
validDate: '',
paymentMethod: '',
- deliveryPeriod: '',
status: '鑽夌',
remark: '',
products: [],
@@ -401,14 +302,25 @@
totalAmount: 0
})
-const rules = {
- customer: [{ required: true, message: '璇烽�夋嫨瀹㈡埛', trigger: 'change' }],
- salesperson: [{ required: true, message: '璇烽�夋嫨涓氬姟鍛�', trigger: 'change' }],
- quotationDate: [{ required: true, message: '璇烽�夋嫨鎶ヤ环鏃ユ湡', trigger: 'change' }],
- validDate: [{ required: true, message: '璇烽�夋嫨鏈夋晥鏈�', trigger: 'change' }],
- paymentMethod: [{ required: true, message: '璇烽�夋嫨浠樻鏂瑰紡', trigger: 'change' }],
- deliveryPeriod: [{ required: true, message: '璇疯緭鍏ヤ氦璐ф湡', trigger: 'blur' }]
+const baseRules = {}
+
+const productRowRules = {
+ productId: [{ required: true, message: '璇烽�夋嫨浜у搧鍚嶇О', trigger: 'change' }],
+ specificationId: [{ required: true, message: '璇烽�夋嫨瑙勬牸鍨嬪彿', trigger: 'change' }],
+ unit: [{ required: true, message: '璇峰~鍐欏崟浣�', trigger: 'blur' }],
+ unitPrice: [{ required: true, message: '璇峰~鍐欏崟浠�', trigger: 'change' }]
}
+const rules = computed(() => {
+ const r = { ...baseRules }
+ ;(form.products || []).forEach((_, i) => {
+ r[`products.${i}.productId`] = productRowRules.productId
+ r[`products.${i}.specificationId`] = productRowRules.specificationId
+ r[`products.${i}.unit`] = productRowRules.unit
+ r[`products.${i}.unitPrice`] = productRowRules.unitPrice
+ })
+ return r
+})
+const customerOption = ref([]);
const isEdit = ref(false)
const editId = ref(null)
@@ -417,57 +329,312 @@
// 璁$畻灞炴��
const filteredList = computed(() => {
- let list = quotationList.value
- if (searchForm.quotationNo) {
- list = list.filter(item => item.quotationNo.includes(searchForm.quotationNo))
- }
- if (searchForm.customer) {
- list = list.filter(item => item.customer === searchForm.customer)
- }
- if (searchForm.status) {
- list = list.filter(item => item.status === searchForm.status)
- }
- return list
+ const keyword = String(searchForm.product || '').trim()
+ if (!keyword) return quotationList.value
+ return quotationList.value.filter((row) => {
+ const p = String(row?.product || '').toLowerCase()
+ return p.includes(keyword.toLowerCase())
+ })
})
// 鏂规硶
-const getStatusType = (status) => {
- const statusMap = {
- '鑽夌': 'info',
- '宸插彂閫�': 'primary',
- '瀹㈡埛纭': 'success',
- '宸茶繃鏈�': 'danger'
- }
- return statusMap[status] || 'info'
-}
-
-const handleSearch = () => {
- // 鎼滅储閫昏緫宸插湪computed涓鐞�
-}
+const formatMoney = (value) => `楼${Number(value || 0).toFixed(2)}`
const resetSearch = () => {
- searchForm.quotationNo = ''
- searchForm.customer = ''
- searchForm.status = ''
+ searchForm.product = ''
+ // 閲嶇疆鍒扮涓�椤靛苟閲嶆柊鏌ヨ
+ pagination.currentPage = 1
+ handleSearch()
}
-const handleAdd = () => {
+const handleAdd = async () => {
dialogTitle.value = '鏂板鎶ヤ环'
isEdit.value = false
resetForm()
dialogVisible.value = true
+ getProductOptions();
+ // listCustomerPrivatePool({current: -1,size:-1}).then((res) => {
+ // customerOption.value = res.data.records;
+ // });
+}
+const getProductOptions = () => {
+ // 杩斿洖 Promise锛屼究浜庣紪杈戞椂 await 纭繚鑳藉弽鏄�
+ return productTreeList().then((res) => {
+ productOptions.value = convertIdToValue(res);
+ return productOptions.value
+ });
+};
+function convertIdToValue(data) {
+ return data.map((item) => {
+ const { id, children, ...rest } = item;
+ const newItem = {
+ ...rest,
+ value: id, // 灏� id 鏀逛负 value
+ };
+ if (children && children.length > 0) {
+ newItem.children = convertIdToValue(children);
+ }
+
+ return newItem;
+ });
+}
+// 鏍规嵁鍚嶇О鍙嶆煡鑺傜偣 id锛屼究浜庝粎瀛樺悕绉版椂鐨勫弽鏄�
+function findNodeIdByLabel(nodes, label) {
+ if (!label) return null;
+ for (let i = 0; i < nodes.length; i++) {
+ const node = nodes[i];
+ if (node.label === label) return node.value;
+ if (node.children && node.children.length > 0) {
+ const found = findNodeIdByLabel(node.children, label);
+ if (found !== null && found !== undefined) return found;
+ }
+ }
+ return null;
+}
+const getModels = (value, row) => {
+ if (!row) return;
+ // 濡傛灉娓呯┖閫夋嫨锛屽垯娓呯┖鐩稿叧瀛楁
+ if (!value) {
+ row.productId = '';
+ row.product = '';
+ row.modelOptions = [];
+ row.specificationId = '';
+ row.specification = '';
+ row.unit = '';
+ return;
+ }
+ // 鏇存柊 productId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
+ row.productId = value;
+ // 鎵惧埌瀵瑰簲鐨� label 骞惰祴鍊肩粰 row.product
+ const label = findNodeById(productOptions.value, value);
+ if (label) {
+ row.product = label;
+ }
+ // 鑾峰彇瑙勬牸鍨嬪彿鍒楄〃锛岃缃埌褰撳墠琛岀殑 modelOptions
+ modelList({ id: value }).then((res) => {
+ row.modelOptions = res || [];
+ });
+};
+const getProductModel = (value, row) => {
+ if (!row) return;
+ // 濡傛灉娓呯┖閫夋嫨锛屽垯娓呯┖鐩稿叧瀛楁
+ if (!value) {
+ row.specificationId = '';
+ row.specification = '';
+ row.unit = '';
+ return;
+ }
+ // 鏇存柊 specificationId锛坴-model 宸茬粡鑷姩鏇存柊锛岃繖閲岀‘淇濅竴鑷存�э級
+ row.specificationId = value;
+ const modelOptions = row.modelOptions || [];
+ const index = modelOptions.findIndex((item) => item.id === value);
+ if (index !== -1) {
+ row.specification = modelOptions[index].model;
+ row.unit = modelOptions[index].unit;
+ } else {
+ row.specification = '';
+ row.unit = '';
+ }
+};
+const findNodeById = (nodes, productId) => {
+ for (let i = 0; i < nodes.length; i++) {
+ if (nodes[i].value === productId) {
+ return nodes[i].label; // 鎵惧埌鑺傜偣锛岃繑鍥� label
+ }
+ if (nodes[i].children && nodes[i].children.length > 0) {
+ const foundLabel = findNodeById(nodes[i].children, productId);
+ if (foundLabel) {
+ return foundLabel; // 鍦ㄥ瓙鑺傜偣涓壘鍒帮紝杩斿洖 label
+ }
+ }
+ }
+ return null; // 娌℃湁鎵惧埌鑺傜偣锛岃繑鍥瀗ull
+};
+const mapProductItem = (product) => ({
+ id: product?.id || '',
+ salesQuotationId: product?.salesQuotationId || '',
+ productId: product?.productId || '',
+ product: product?.product || product?.productName || '',
+ specificationId: product?.specificationId || '',
+ specification: product?.specification || '',
+ quantity: product?.quantity || 0,
+ unit: product?.unit || '',
+ paper: product?.paper || '',
+ paperWeight: product?.paperWeight || '',
+ unitPrice: product?.unitPrice || 0,
+ printingFee: Number(product?.printingFee || 0),
+ dieCuttingFee: Number(product?.dieCuttingFee || 0),
+ grindingFee: Number(product?.grindingFee || 0),
+ amount: product?.amount || 0
+})
+
+const mapQuotationItem = (item) => ({
+ id: item?.id,
+ salesQuotationId: item?.salesQuotationId || '',
+ product: item?.product || '',
+ specification: item?.specification || '',
+ unit: item?.unit || '',
+ paper: item?.paper || '',
+ paperWeight: item?.paperWeight || '',
+ unitPrice: Number(item?.unitPrice || 0),
+ printingFee: Number(item?.printingFee || 0),
+ dieCuttingFee: Number(item?.dieCuttingFee || 0),
+ grindingFee: Number(item?.grindingFee || 0),
+ quantity: Number(item?.quantity || 0),
+ amount: Number(item?.amount || 0),
+ createTime: item?.createTime || '',
+ quotationNo: item?.quotationNo || '',
+ customer: item?.customer || '',
+ salesperson: item?.salesperson || '',
+ quotationDate: item?.quotationDate || '',
+ validDate: item?.validDate || '',
+ paymentMethod: item?.paymentMethod || '',
+ status: item?.status || '鑽夌',
+ approveUserIds: item?.approveUserIds || '',
+ remark: item?.remark || '',
+ products: Array.isArray(item?.products) && item.products.length > 0
+ ? item.products.map(mapProductItem)
+ : [mapProductItem(item)],
+ subtotal: item?.subtotal || 0,
+ freight: item?.freight || 0,
+ otherFee: item?.otherFee || 0,
+ discountRate: item?.discountRate || 0,
+ discountAmount: item?.discountAmount || 0,
+ totalAmount: item?.totalAmount || 0
+})
+
+const calcTotalAmountFromProducts = (products) => {
+ return (products || []).reduce((sum, product) => {
+ const price = Number(product.unitPrice) || 0
+ const printingFee = Number(product.printingFee) || 0
+ const dieCuttingFee = Number(product.dieCuttingFee) || 0
+ const grindingFee = Number(product.grindingFee) || 0
+ return sum + price + printingFee + dieCuttingFee + grindingFee
+ }, 0)
}
-const handleView = (row) => {
- currentQuotation.value = row
+const buildProductPayload = (product) => {
+ const quantity = Number(product?.quantity || 0)
+ const unitPrice = Number(product?.unitPrice || 0)
+ const printingFee = Number(product?.printingFee || 0)
+ const dieCuttingFee = Number(product?.dieCuttingFee || 0)
+ const grindingFee = Number(product?.grindingFee || 0)
+ return {
+ id: product?.id || undefined,
+ salesQuotationId: product?.salesQuotationId || form.salesQuotationId || null,
+ product: product?.product || '',
+ specification: product?.specification || '',
+ unit: product?.unit || '',
+ paper: product?.paper || '',
+ paperWeight: product?.paperWeight || '',
+ unitPrice,
+ printingFee,
+ dieCuttingFee,
+ grindingFee,
+ quantity,
+ amount: Number(product?.amount ?? quantity * unitPrice),
+ remark: product?.remark ?? form.remark ?? ''
+ }
+}
+
+const handleView = async (row) => {
+ let source = row
+ if (row?.id) {
+ try {
+ const res = await getQuotationProductInfo(row.id)
+ source = res?.data || row
+ } catch (error) {
+ source = row
+ }
+ }
+ source.totalAmount = source.totalAmount || calcTotalAmountFromProducts(source?.products || [source])
+ currentQuotation.value = mapQuotationItem(source)
viewDialogVisible.value = true
}
-const handleEdit = (row) => {
+const handleEdit = async (row) => {
dialogTitle.value = '缂栬緫鎶ヤ环'
isEdit.value = true
editId.value = row.id
- Object.assign(form, row)
+ form.id = row.id || form.id || null
+ // 鍏堝姞杞戒骇鍝佹爲鏁版嵁锛屽惁鍒� el-tree-select 鏃犳硶鍙嶆樉浜у搧鍚嶇О
+ await getProductOptions()
+ let source = row
+ if (row?.id) {
+ try {
+ const res = await getQuotationProductInfo(row.id)
+ source = res?.data || row
+ } catch (error) {
+ source = row
+ }
+ }
+ source.totalAmount = source.totalAmount || calcTotalAmountFromProducts(source?.products || [source])
+
+ const sourceProducts = Array.isArray(source?.products) && source.products.length > 0
+ ? source.products
+ : [source]
+
+ // 鍙鍒堕渶瑕佺殑瀛楁锛岄伩鍏嶅皢缁勪欢寮曠敤鏀惧叆鍝嶅簲寮忓璞�
+ form.quotationNo = source.quotationNo || ''
+ form.customer = source.customer || ''
+ form.salesperson = source.salesperson || ''
+ form.quotationDate = source.quotationDate || ''
+ form.validDate = source.validDate || ''
+ form.paymentMethod = source.paymentMethod || ''
+ form.status = source.status || '鑽夌'
+ form.remark = source.remark || ''
+ form.products = await Promise.all(sourceProducts.map(async (product) => {
+ const productName = product.product || product.productName || ''
+ // 浼樺厛鐢� productId锛涘鏋滃彧鏈夊悕绉帮紝灏濊瘯鍙嶆煡 id 浠ヤ究鏍戦�夋嫨鍣ㄥ弽鏄�
+ const resolvedProductId = product.productId
+ ? Number(product.productId)
+ : findNodeIdByLabel(productOptions.value, productName) || ''
+
+ // 濡傛灉鏈変骇鍝両D锛屽姞杞藉搴旂殑瑙勬牸鍨嬪彿鍒楄〃
+ let modelOptions = [];
+ let resolvedSpecificationId = product.specificationId || '';
+
+ if (resolvedProductId) {
+ try {
+ const res = await modelList({ id: resolvedProductId });
+ modelOptions = res || [];
+
+ // 濡傛灉杩斿洖鐨勬暟鎹病鏈� specificationId锛屼絾鏈� specification 鍚嶇О锛屾牴鎹悕绉版煡鎵� ID
+ if (!resolvedSpecificationId && product.specification) {
+ const foundModel = modelOptions.find(item => item.model === product.specification);
+ if (foundModel) {
+ resolvedSpecificationId = foundModel.id;
+ }
+ }
+ } catch (error) {
+ console.error('鍔犺浇瑙勬牸鍨嬪彿澶辫触:', error);
+ }
+ }
+
+ return {
+ productId: resolvedProductId,
+ product: productName,
+ specificationId: resolvedSpecificationId,
+ specification: product.specification || '',
+ quantity: product.quantity || 0,
+ unit: product.unit || '',
+ paper: product.paper || '',
+ paperWeight: product.paperWeight || '',
+ unitPrice: product.unitPrice || 0,
+ printingFee: Number(product.printingFee || 0),
+ dieCuttingFee: Number(product.dieCuttingFee || 0),
+ grindingFee: Number(product.grindingFee || 0),
+ amount: product.amount || 0,
+ modelOptions: modelOptions // 涓烘瘡琛屾坊鍔犵嫭绔嬬殑瑙勬牸鍨嬪彿鍒楄〃
+ }
+ }))
+ form.subtotal = source.subtotal || 0
+ form.freight = source.freight || 0
+ form.otherFee = source.otherFee || 0
+ form.discountRate = source.discountRate || 0
+ form.discountAmount = source.discountAmount || 0
+ form.totalAmount = source.totalAmount || 0
+
dialogVisible.value = true
}
@@ -478,22 +645,26 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- const index = quotationList.value.findIndex(item => item.id === row.id)
- if (index > -1) {
- quotationList.value.splice(index, 1)
- pagination.total--
- ElMessage.success('鍒犻櫎鎴愬姛')
+ if (!row?.id) {
+ ElMessage.warning('鏈幏鍙栧埌鍙垹闄ょ殑浜у搧ID')
+ return
}
+ deleteQuotationProduct([row.id]).then(res=>{
+ if(res.code===200){
+ ElMessage.success('鍒犻櫎鎴愬姛')
+ handleSearch()
+ }
+ })
})
}
const resetForm = () => {
+ form.id = null
form.customer = ''
form.salesperson = ''
form.quotationDate = ''
form.validDate = ''
form.paymentMethod = ''
- form.deliveryPeriod = ''
form.status = '鑽夌'
form.remark = ''
form.products = []
@@ -506,13 +677,26 @@
}
const addProduct = () => {
+ if (isEdit.value) {
+ ElMessage.warning('缂栬緫鏃朵笉鍏佽鏂板浜у搧')
+ return
+ }
form.products.push({
+ productId: '',
+ product: '',
productName: '',
+ specificationId: '',
specification: '',
quantity: 1,
unit: '',
+ paper: '',
+ paperWeight: '',
unitPrice: 0,
- amount: 0
+ printingFee: 0,
+ dieCuttingFee: 0,
+ grindingFee: 0,
+ amount: 0,
+ modelOptions: [] // 涓烘瘡琛屾坊鍔犵嫭绔嬬殑瑙勬牸鍨嬪彿鍒楄〃
})
}
@@ -536,10 +720,6 @@
form.totalAmount = form.subtotal + form.freight + form.otherFee - form.discountAmount
}
-const handleCustomerChange = () => {
- // 鍙互鏍规嵁瀹㈡埛淇℃伅鑷姩濉厖涓�浜涢粯璁ゅ��
-}
-
const handleSubmit = () => {
formRef.value.validate((valid) => {
if (valid) {
@@ -547,27 +727,39 @@
ElMessage.warning('璇疯嚦灏戞坊鍔犱竴涓骇鍝�')
return
}
-
+
+ // 璁$畻鎵�鏈変骇鍝佺殑鍗曚环鎬诲拰
+ form.totalAmount = form.products.reduce((sum, product) => {
+ const price = Number(product.unitPrice) || 0
+ const printingFee = Number(product.printingFee) || 0
+ const dieCuttingFee = Number(product.dieCuttingFee) || 0
+ const grindingFee = Number(product.grindingFee) || 0
+ return sum + price + printingFee + dieCuttingFee + grindingFee
+ }, 0)
if (isEdit.value) {
- // 缂栬緫
- const index = quotationList.value.findIndex(item => item.id === editId.value)
- if (index > -1) {
- quotationList.value[index] = { ...form, id: editId.value }
- ElMessage.success('缂栬緫鎴愬姛')
- }
- } else {
- // 鏂板
- const newId = Math.max(...quotationList.value.map(item => item.id)) + 1
- const quotationNo = `QT${new Date().getFullYear()}${String(new Date().getMonth() + 1).padStart(2, '0')}${String(new Date().getDate()).padStart(2, '0')}${String(newId).padStart(3, '0')}`
- quotationList.value.push({
- ...form,
- id: newId,
- quotationNo: quotationNo
+ const editingItem = form.products[0] || {}
+ const payload = buildProductPayload({
+ ...editingItem,
+ id: editingItem.id || form.id
})
- pagination.total++
- ElMessage.success('鏂板鎴愬姛')
+ editQuotationProduct(payload).then((res) => {
+ if (res?.code === 200) {
+ ElMessage.success('缂栬緫鎴愬姛')
+ dialogVisible.value = false
+ handleSearch()
+ }
+ })
+ } else {
+ const payloadList = form.products.map((item) => buildProductPayload(item))
+ addOrUpdateQuotationProduct(payloadList).then((res) => {
+ if (res?.code === 200) {
+ ElMessage.success('鏂板鎴愬姛')
+ dialogVisible.value = false
+ handleSearch()
+ }
+ })
}
- dialogVisible.value = false
+
}
})
}
@@ -575,30 +767,160 @@
const handleCurrentChange = (val) => {
pagination.currentPage = val.page
pagination.pageSize = val.limit
+ // 鍒嗛〉鍙樺寲鏃堕噸鏂版煡璇㈠垪琛�
+ handleSearch()
}
+const handleSearch = (resetPage = false)=>{
+ if (resetPage) {
+ pagination.currentPage = 1
+ }
+ const params = {
+ // 鍚庣鍒嗛〉鍙傛暟锛歝urrent / size
+ current: pagination.currentPage,
+ size: pagination.pageSize,
+ ...searchForm
+ }
+ quotationProductListPage(params).then(res=>{
+ if(res.code===200){
+ const records = res.data.records || []
+ quotationList.value = records.map((item) => {
+ const mapped = mapQuotationItem(item)
+ mapped.totalAmount = calcTotalAmountFromProducts(mapped.products)
+ return mapped
+ })
+ pagination.total = res.data.total
+ }
+ })
+}
+
+const getUserList = async () => {
+ try {
+ const res = await userListNoPage()
+ userList.value = Array.isArray(res?.data) ? res.data : []
+ } catch (error) {
+ userList.value = []
+ ElMessage.error('鍔犺浇涓氬姟鍛樺垪琛ㄥけ璐�')
+ }
+}
+
+onMounted(()=>{
+ getUserList()
+ handleSearch()
+})
</script>
-<style scoped>
+<style scoped lang="scss">
.search-row {
margin-bottom: 20px;
}
+.quotation-form-container {
+ padding: 10px 0;
+ max-height: calc(100vh - 200px);
+ overflow-y: auto;
+
+ &::-webkit-scrollbar {
+ width: 6px;
+ height: 6px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ background: #c1c1c1;
+ border-radius: 3px;
+
+ &:hover {
+ background: #a8a8a8;
+ }
+ }
+}
+
+.quotation-form {
+ .el-form-item {
+ margin-bottom: 22px;
+ }
+}
+
.form-card {
- margin-bottom: 20px;
+ margin-bottom: 24px;
+ border-radius: 8px;
+ transition: all 0.3s ease;
+
+ &:hover {
+ box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08) !important;
+ }
+
+ :deep(.el-card__header) {
+ padding: 16px 20px;
+ background: linear-gradient(135deg, #f5f7fa 0%, #ffffff 100%);
+ border-bottom: 1px solid #ebeef5;
+ }
+
+ :deep(.el-card__body) {
+ padding: 20px;
+ }
}
-.card-title {
- font-weight: bold;
- color: #303133;
-}
-
-.card-header {
+.card-header-wrapper {
display: flex;
- justify-content: space-between;
align-items: center;
+ gap: 8px;
+
+ .card-icon {
+ font-size: 18px;
+ color: #409eff;
+ }
+
+ .card-title {
+ font-weight: 600;
+ font-size: 16px;
+ color: #303133;
+ flex: 1;
+ }
+
+ .header-btn {
+ margin-left: auto;
+ }
+}
+
+.form-content {
+ padding: 8px 0;
+}
+
+.product-table-form-item {
+ margin-bottom: 0;
+ :deep(.el-form-item__content) {
+ margin-left: 0 !important;
+ }
+ :deep(.el-form-item__label) {
+ width: auto;
+ min-width: auto;
+ }
+}
+
+.product-table {
+ :deep(.el-table__header) {
+ background-color: #f5f7fa;
+
+ th {
+ background-color: #f5f7fa !important;
+ color: #606266;
+ font-weight: 600;
+ }
+ }
+
+ :deep(.el-table__row) {
+ &:hover {
+ background-color: #f5f7fa;
+ }
+ }
+
+ :deep(.el-table__cell) {
+ padding: 12px 0;
+ }
}
.dialog-footer {
text-align: right;
}
+
</style>
--
Gitblit v1.9.3