Skip to content

Y
yd-middle-front
Commit f00a7e93 by Sweet Zhang
Options

对账公司接口更换，佣金设置增加是否直签

parent 64042940
Showing with 50 additions and 40 deletions
package.json
{ {
"name": "ruoyi", "name": "yd",
"version": "3.9.0", "version": "3.9.0",
"description": "若依管理系统", "description": "银盾中台系统",
"author": "若依", "author": "银盾",
"license": "MIT", "license": "MIT",
"type": "module", "type": "module",
"scripts": { "scripts": {
......
src/api/common.js
...@@ -34,3 +34,20 @@ export function getAllCompanys(data) { ...@@ -34,3 +34,20 @@ export function getAllCompanys(data) {
data: data data: data
}) })
} }
// 获取保险对账公司
export function getReconciliationCompany(data) {
return request({
url: '/insurance/base/api/insuranceReconciliationCompany/page',
method: 'post',
data: data
})
}
// 获取保险公司列表
export function getInsuranceCompany(data) {
return request({
url: '/insurance/base/api/insuranceCompany/page',
method: 'post',
data: data
})
}
src/api/product/index.js
...@@ -110,7 +110,7 @@ export function deleteCommission(announcementCommissionRatioBizId) { ...@@ -110,7 +110,7 @@ export function deleteCommission(announcementCommissionRatioBizId) {
method: 'delete' method: 'delete'
}) })
} }
// 获得来佣列表的数据 // 获得来佣规格数据
export function comeCommissionList(data) { export function comeCommissionList(data) {
return request({ return request({
url: '/product/api/expectedSpecies/page', url: '/product/api/expectedSpecies/page',
...@@ -118,7 +118,7 @@ export function comeCommissionList(data) { ...@@ -118,7 +118,7 @@ export function comeCommissionList(data) {
data: data data: data
}) })
} }
// 获得来佣列表的数据 // 更新产品规格数据
export function comeExpectedSpecies(data) { export function comeExpectedSpecies(data) {
return request({ return request({
url: '/product/api/expectedSpecies/import/species', url: '/product/api/expectedSpecies/import/species',
......
src/views/merchandise/addProduce.vue
...@@ -7,25 +7,11 @@ ...@@ -7,25 +7,11 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<div class="commonHeader">产品标题</div> <div class="commonHeader">产品标题</div>
<el-select <el-select v-model="queryParams.productName" filterable remote allow-create default-first-option
v-model="queryParams.productName" :reserve-keyword="false" placeholder="请选择产品名称" @blur="handleSelectChange" :remote-method="searchProduct"
filterable clearable remote-show-suffix>
remote <el-option v-for="item in productList" :key="item.productBizId" :label="item.productName"
allow-create :value="item.productBizId" />
default-first-option
:reserve-keyword="false"
placeholder="请选择产品名称"
@blur="handleSelectChange"
:remote-method="searchProduct"
clearable
remote-show-suffix
>
<el-option
v-for="item in productList"
:key="item.productBizId"
:label="item.productName"
:value="item.productBizId"
/>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -47,29 +33,21 @@ ...@@ -47,29 +33,21 @@
</el-col> </el-col>
<el-col :span="24" v-if="showNameTip"> <el-col :span="24" v-if="showNameTip">
<div class="tipCon"> <div class="tipCon">
<el-icon color="red" :size="20" style="margin-right: 5px"><Warning /></el-icon> <el-icon color="red" :size="20" style="margin-right: 5px">
<Warning />
</el-icon>
<span>标题信息过少，请至少输入5个有效字数（含中文、英文、数字）</span> <span>标题信息过少，请至少输入5个有效字数（含中文、英文、数字）</span>
</div> </div>
</el-col> </el-col>
<el-col :span="24" style="margin: 20px 0"> <el-col :span="24" style="margin: 20px 0">
<div class="commonHeader"> <div class="commonHeader">
图片和视频 图片和视频
<span style="color: rgb(111, 111, 111); font-size: 15px" <span style="color: rgb(111, 111, 111); font-size: 15px">({{ imageInfo.count }}/9)</span>
>({{ imageInfo.count }}/9)</span
>
</div> </div>
<image-upload <image-upload v-model="queryParams.picture" :action="'/oss/api/oss/upload'" :limit="9" :image-size="10"
v-model="queryParams.picture" :video-size="500" :file-type="['png', 'jpg', 'jpeg', 'mp4']" :is-show-tip="false"
:action="'/oss/api/oss/upload'" @change="handleImageChange" @file-change="handleFileChange" />
:limit="9"
:image-size="10"
:video-size="500"
:file-type="['png', 'jpg', 'jpeg', 'mp4']"
:is-show-tip="false"
@change="handleImageChange"
@file-change="handleFileChange"
/>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div v-for="(item, index) in imageRequireList" :key="item.key" class="imgTip"> <div v-for="(item, index) in imageRequireList" :key="item.key" class="imgTip">
...@@ -90,7 +68,9 @@ ...@@ -90,7 +68,9 @@
</el-col> </el-col>
<el-col :span="24" v-if="imageInfo.count > 0 && imageInfo.count < 3"> <el-col :span="24" v-if="imageInfo.count > 0 && imageInfo.count < 3">
<div class="tipCon"> <div class="tipCon">
<el-icon color="red" :size="20" style="margin-right: 5px"><Warning /></el-icon> <el-icon color="red" :size="20" style="margin-right: 5px">
<Warning />
</el-icon>
<span>请上传至少3张产品主图</span> <span>请上传至少3张产品主图</span>
</div> </div>
</el-col> </el-col>
...@@ -338,6 +318,10 @@ function submitProduct() { ...@@ -338,6 +318,10 @@ function submitProduct() {
}) })
} }
if (imageInfo.value.fileList && imageInfo.value.fileList.length > 0) { if (imageInfo.value.fileList && imageInfo.value.fileList.length > 0) {
if (imageInfo.value.fileList.length < 3) {
proxy.$modal.msgError('请上传3张产品图片')
return
}
imageInfo.value.fileList.forEach(item => { imageInfo.value.fileList.forEach(item => {
mainUrlsList.push(item.url) mainUrlsList.push(item.url)
}) })
...@@ -395,6 +379,7 @@ searchProduct() ...@@ -395,6 +379,7 @@ searchProduct()
overflow: hidden; overflow: hidden;
overflow-y: scroll; */ overflow-y: scroll; */
} }
.form-content { .form-content {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
...@@ -404,15 +389,18 @@ searchProduct() ...@@ -404,15 +389,18 @@ searchProduct()
/* padding: 20px; */ /* padding: 20px; */
/* background-color: #fff; */ /* background-color: #fff; */
} }
.formHeader { .formHeader {
margin-bottom: 20px; margin-bottom: 20px;
font-size: 22px; font-size: 22px;
font-weight: 600; font-weight: 600;
} }
.nameTip { .nameTip {
font-size: 13px; font-size: 13px;
margin-top: 10px; margin-top: 10px;
} }
.tipCon { .tipCon {
/* width: 450px; */ /* width: 450px; */
width: fit-content; width: fit-content;
...@@ -426,23 +414,28 @@ searchProduct() ...@@ -426,23 +414,28 @@ searchProduct()
font-size: 14px; font-size: 14px;
display: flex; display: flex;
align-items: center; align-items: center;
span { span {
color: rgb(111 111 111); color: rgb(111 111 111);
} }
} }
.commonHeader { .commonHeader {
font-size: 16px; font-size: 16px;
margin-bottom: 15px; margin-bottom: 15px;
} }
.imgTip { .imgTip {
color: #ccc; color: #ccc;
font-size: 14px; font-size: 14px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.classTip { .classTip {
color: #ccc; color: #ccc;
font-size: 14px; font-size: 14px;
} }
.bottomBtn { .bottomBtn {
border-top: 1px solid rgb(247 247 247); border-top: 1px solid rgb(247 247 247);
width: 100%; width: 100%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment