Commit 656dad29 authored by yaya's avatar yaya

feat: bugfix

parent c19bed40
module.exports = { module.exports = {
NODE_ENV: '"production"', NODE_ENV: '"production"',
ENV_CONFIG: '"dep"', ENV_CONFIG: '"dev"',
BASE_API: '"http://cjxc-dev.wanwudezhi.com/admin"' BASE_API: '"http://cjxc-dev.wanwudezhi.com/admin"'
} }
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<div class="consign_content_item__text">{{ `藏品类目:${consignDetail.cidName || '-'}` }}</div> <div class="consign_content_item__text">{{ `藏品类目:${consignDetail.cidName || '-'}` }}</div>
<div class="consign_content_item__text">{{ `藏品名称:${consignDetail.name || '-'}` }}</div> <div class="consign_content_item__text">{{ `藏品名称:${consignDetail.name || '-'}` }}</div>
<div class="consign_content_item__text">{{ `详细介绍:${consignDetail.detail || '-'}` }}</div> <div class="consign_content_item__text">{{ `详细介绍:${consignDetail.detail || '-'}` }}</div>
<div class="consign_content_item__text">{{ `\u2003入手价:¥${consignDetail.price || '-'}` }}</div> <div class="consign_content_item__text">{{ `\u2003入手价:${consignDetail.price ? '¥' + consignDetail.price : '-'}` }}</div>
<div class="consign_content_item__image"> <div class="consign_content_item__image">
<div style="width: 180px">藏品图片/视频:</div> <div style="width: 180px">藏品图片/视频:</div>
<div class="image_content"> <div class="image_content">
...@@ -141,9 +141,9 @@ ...@@ -141,9 +141,9 @@
title="完成寄售"> title="完成寄售">
<el-form ref="finish" :model="finishForm" :rules="finishRules"> <el-form ref="finish" :model="finishForm" :rules="finishRules">
<el-form-item label="成交金额" label-width="80px" prop="dealPrice"> <el-form-item label="成交金额" label-width="80px" prop="dealPrice">
<el-input v-model="finishForm.dealPrice" style="width: 400px" maxlength="10" placeholder="请输入成交金额"> <el-input-number v-model="finishForm.dealPrice" style="width: 400px" maxlength="10" type="number" placeholder="请输入成交金额">
<template slot="append"></template> <template slot="append"></template>
</el-input> </el-input-number>
</el-form-item> </el-form-item>
<el-form-item label="成交平台" label-width="80px" prop="remark"> <el-form-item label="成交平台" label-width="80px" prop="remark">
<el-input v-model="finishForm.remark" style="width: 400px" maxlength="10" placeholder="请输入成交平台" /> <el-input v-model="finishForm.remark" style="width: 400px" maxlength="10" placeholder="请输入成交平台" />
...@@ -248,7 +248,12 @@ export default { ...@@ -248,7 +248,12 @@ export default {
finishDialogShow: false, finishDialogShow: false,
finishRules: { finishRules: {
dealPrice: [ dealPrice: [
{ required: true, message: '成交金额不能为空', trigger: 'blur' } { required: true, message: '成交金额不能为空', trigger: 'blur' },
{
pattern: /^[1-9]\d*$/,
message:
'格式不正确,请输入正整数!'
}
], ],
remark: [ remark: [
{ required: true, message: '原因不能为空', trigger: 'blur' } { required: true, message: '原因不能为空', trigger: 'blur' }
...@@ -471,7 +476,7 @@ export default { ...@@ -471,7 +476,7 @@ export default {
flex-direction: row; flex-direction: row;
.consign_content_item__text { .consign_content_item__text {
margin-top: 15px; margin-top: 20px;
} }
.consign_content_item__image { .consign_content_item__image {
......
...@@ -29,7 +29,11 @@ ...@@ -29,7 +29,11 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="名称" prop="itemName" /> <el-table-column align="center" label="名称" prop="itemName" >
<template slot-scope="scope" >
<Line2Hidden :text="scope.row.itemName" />
</template>
</el-table-column>
<el-table-column align="center" label="状态" prop="systemStateName" /> <el-table-column align="center" label="状态" prop="systemStateName" />
<el-table-column align="center" label="下单时间" prop="saleTime" /> <el-table-column align="center" label="下单时间" prop="saleTime" />
...@@ -136,7 +140,7 @@ ...@@ -136,7 +140,7 @@
title="完成寄售"> title="完成寄售">
<el-form ref="finish" :model="finishForm" :rules="finishRules"> <el-form ref="finish" :model="finishForm" :rules="finishRules">
<el-form-item label="成交金额" label-width="80px" prop="dealPrice"> <el-form-item label="成交金额" label-width="80px" prop="dealPrice">
<el-input v-model="finishForm.dealPrice" style="width: 400px" maxlength="10" placeholder="请输入成交金额" ><template slot="append"></template></el-input> <el-input v-model="finishForm.dealPrice" style="width: 400px" maxlength="10" type="number" placeholder="请输入成交金额" ><template slot="append"></template></el-input>
</el-form-item> </el-form-item>
<el-form-item label="成交平台" label-width="80px" prop="remark"> <el-form-item label="成交平台" label-width="80px" prop="remark">
<el-input v-model="finishForm.remark" style="width: 400px" maxlength="10" placeholder="请输入成交平台" /> <el-input v-model="finishForm.remark" style="width: 400px" maxlength="10" placeholder="请输入成交平台" />
...@@ -255,7 +259,12 @@ export default { ...@@ -255,7 +259,12 @@ export default {
finishDialogShow: false, finishDialogShow: false,
finishRules: { finishRules: {
dealPrice: [ dealPrice: [
{ required: true, message: '成交金额不能为空', trigger: 'blur' } { required: true, message: '成交金额不能为空', trigger: 'blur' },
{
pattern: /^[1-9]\d*$/,
message:
'格式不正确,请输入正整数!'
}
], ],
remark: [ remark: [
{ required: true, message: '原因不能为空', trigger: 'blur' } { required: true, message: '原因不能为空', trigger: 'blur' }
......
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