add
This commit is contained in:
parent
264c157bd7
commit
8abd1c7f17
|
|
@ -223,7 +223,7 @@
|
|||
<el-button v-if="scope.row.paid === 0 && scope.row.is_del===0 && scope.row.activity_type != 2" type="text" size="small" @click="edit(scope.row.order_id)">编辑</el-button>
|
||||
<el-button v-if="(scope.row.order_type == 0 || scope.row.order_type == 2) && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click="send(scope.row,scope.row.order_id)">发送货</el-button>
|
||||
<el-button v-if="scope.row.is_del !== 0" type="text" size="small" @click.native="handleDelete(scope.row, scope.$index)">删除</el-button>
|
||||
<el-button type="text" size="small" @click="onOrderOpenRefund(scope.row.order_id)">开启退款</el-button>
|
||||
<el-button type="text" size="small" @click="onOrderOpenRefund(scope.row.order_id)">开启售后</el-button>
|
||||
<el-button v-if="scope.row.order_type == 1 && scope.row.status === 0 && scope.row.paid === 1" type="text" size="small" @click.native="orderCancellation(scope.row.verify_code)">去核销</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -703,9 +703,9 @@ export default {
|
|||
this.getStoreList()
|
||||
},
|
||||
methods: {
|
||||
// 开启退款
|
||||
// 开启售后
|
||||
onOrderOpenRefund(id) {
|
||||
this.$confirm('此操作将开启退款, 是否继续?', '提示', {
|
||||
this.$confirm('此操作将开启售后, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
|
|
@ -714,7 +714,7 @@ export default {
|
|||
if(res.status == '200'){
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '开启退款!'
|
||||
message: '开启售后!'
|
||||
});
|
||||
}else{
|
||||
this.$message({
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
<el-form-item label="商品关键字：">
|
||||
<el-input
|
||||
v-model="formValidate.keyword"
|
||||
:disabled='virStatus'
|
||||
placeholder="请输入商品关键字"
|
||||
size="small"
|
||||
class="pageWidth"
|
||||
|
|
@ -70,6 +71,7 @@
|
|||
<el-form-item label="是否为惠美乡村:">
|
||||
<el-radio-group
|
||||
v-model="formValidate.is_huimei"
|
||||
:disabled='virStatus'
|
||||
>
|
||||
<el-radio :label="1" class="radio">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
|
|
@ -195,6 +197,7 @@
|
|||
v-model="videoLink"
|
||||
size="small"
|
||||
class="perW50"
|
||||
:disabled='virStatus'
|
||||
placeholder="请输入MP4格式的视频链接"
|
||||
/>
|
||||
<input
|
||||
|
|
@ -208,6 +211,7 @@
|
|||
icon="ios-cloud-upload-outline"
|
||||
class="uploadVideo"
|
||||
size="small"
|
||||
:disabled='virStatus'
|
||||
@click="zh_uploadFile"
|
||||
>
|
||||
{{ videoLink ? "确认添加" : "上传视频" }}
|
||||
|
|
@ -244,12 +248,13 @@
|
|||
size="small"
|
||||
class="pageWidth"
|
||||
/> -->
|
||||
<el-select v-model="formValidate.unit_name" placeholder="请选择" class="perW50 mr10" clearable filterable="">
|
||||
<el-select :disabled='virStatus' v-model="formValidate.unit_name" placeholder="请选择" class="perW50 mr10" clearable filterable="">
|
||||
<el-option v-for="item in unitList" :key="item.label" :label="item.label" :value="item.label" />
|
||||
</el-select>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled='virStatus'
|
||||
@click="addUnit"
|
||||
>
|
||||
添加单位
|
||||
|
|
@ -263,6 +268,7 @@
|
|||
v-model="formValidate.store_info"
|
||||
type="textarea"
|
||||
:rows="3"
|
||||
:disabled='virStatus'
|
||||
placeholder="请输入商品简介"
|
||||
class="pageWidth"
|
||||
size="small"
|
||||
|
|
@ -299,6 +305,7 @@
|
|||
v-model="formValidate.qualification.brands_name"
|
||||
placeholder="请输入品牌商标"
|
||||
size="small"
|
||||
:disabled='virStatus'
|
||||
class="pageWidth"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -306,6 +313,7 @@
|
|||
<el-col :span="24">
|
||||
<el-form-item label="商品来源:">
|
||||
<el-radio-group
|
||||
:disabled='virStatus'
|
||||
v-model="formValidate.qualification.commodity_type"
|
||||
@input="handlCommodity('formValidate')"
|
||||
>
|
||||
|
|
@ -320,6 +328,7 @@
|
|||
<el-form-item label="企业名称：" prop="qualification.production_name">
|
||||
<el-input
|
||||
v-model="formValidate.qualification.production_name"
|
||||
:disabled='virStatus'
|
||||
placeholder="请输入生产企业名称"
|
||||
size="small"
|
||||
class="pageWidth"
|
||||
|
|
@ -388,9 +397,9 @@
|
|||
v-if="['application/pdf', 'image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(file.type) && file.response"
|
||||
:id="'image' + file.uid"
|
||||
class="el-upload-list__item-thumbnail"
|
||||
:src="file.response.data.src"
|
||||
:src="file.url"
|
||||
:ref="file.uid"
|
||||
:preview-src-list="[file.response.data.src]"
|
||||
:preview-src-list="[file.url]"
|
||||
/>
|
||||
<span class="el-upload-list__item-actions">
|
||||
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
|
||||
|
|
@ -428,9 +437,9 @@
|
|||
v-if="['application/pdf', 'image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(file.type) && file.response"
|
||||
:id="'image' + file.uid"
|
||||
class="el-upload-list__item-thumbnail"
|
||||
:src="file.response.data.src"
|
||||
:src="file.url"
|
||||
:ref="file.uid"
|
||||
:preview-src-list="[file.response.data.src]"
|
||||
:preview-src-list="[file.url]"
|
||||
/>
|
||||
<span class="el-upload-list__item-actions">
|
||||
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
|
||||
|
|
@ -467,9 +476,9 @@
|
|||
v-if="['application/pdf', 'image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(file.type) && file.response"
|
||||
:id="'image' + file.uid"
|
||||
class="el-upload-list__item-thumbnail"
|
||||
:src="file.response.data.src"
|
||||
:src="file.url"
|
||||
:ref="file.uid"
|
||||
:preview-src-list="[file.response.data.src]"
|
||||
:preview-src-list="[file.url]"
|
||||
/>
|
||||
<span class="el-upload-list__item-actions">
|
||||
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
|
||||
|
|
@ -507,9 +516,9 @@
|
|||
v-if="['application/pdf', 'image/jpeg', 'image/png', 'image/jpg', 'image/gif'].includes(file.type) && file.response"
|
||||
:id="'image' + file.uid"
|
||||
class="el-upload-list__item-thumbnail"
|
||||
:src="file.response.data.src"
|
||||
:src="file.url"
|
||||
:ref="file.uid"
|
||||
:preview-src-list="[file.response.data.src]"
|
||||
:preview-src-list="[file.url]"
|
||||
/>
|
||||
<span class="el-upload-list__item-actions">
|
||||
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
|
||||
|
|
@ -571,6 +580,7 @@
|
|||
<el-form-item label="企业名称：" prop="qualification.import_name">
|
||||
<el-input
|
||||
v-model="formValidate.qualification.import_name"
|
||||
:disabled='virStatus'
|
||||
placeholder="请输入进口/企业境内总代企业名称"
|
||||
size="small"
|
||||
class="pageWidth"
|
||||
|
|
@ -814,6 +824,7 @@
|
|||
<el-form-item label="商品规格：" props="spec_type">
|
||||
<el-radio-group
|
||||
v-model="formValidate.spec_type"
|
||||
:disabled='virStatus'
|
||||
@change="onChangeSpec(formValidate.spec_type)"
|
||||
>
|
||||
<el-radio :label="0" class="radio">单规格</el-radio>
|
||||
|
|
@ -1031,10 +1042,12 @@
|
|||
</div>
|
||||
<div v-else>
|
||||
<el-input
|
||||
v-if="formThead[iii].title === '商品编号'"
|
||||
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接' || formThead[iii].title === '售价' || formThead[iii].title === '市场价'"
|
||||
v-model="scope.row[iii]"
|
||||
type="text"
|
||||
size="small"
|
||||
:disabled="virStatus&&formThead[iii].title === '依据链接'"
|
||||
@input="handleCost(scope.row,iii,$event)"
|
||||
class="priceBox"
|
||||
/>
|
||||
<el-input
|
||||
|
|
@ -1051,6 +1064,7 @@
|
|||
type="number"
|
||||
min="0"
|
||||
size="small"
|
||||
:disabled="formThead[iii].title === '成本价'"
|
||||
class="priceBox"
|
||||
controls-position="right"
|
||||
/>
|
||||
|
|
@ -1199,7 +1213,7 @@
|
|||
|
||||
<div v-else>
|
||||
<el-input
|
||||
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接' || formThead[iii].title === '售价'"
|
||||
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接' || formThead[iii].title === '售价' || formThead[iii].title === '市场价'"
|
||||
v-model="scope.row[iii]"
|
||||
type="text"
|
||||
size="small"
|
||||
|
|
@ -1211,6 +1225,7 @@
|
|||
v-else
|
||||
v-model="scope.row[iii]"
|
||||
:min="0"
|
||||
type="number"
|
||||
size="small"
|
||||
:disabled="formThead[iii].title === '成本价'"
|
||||
class="priceBox"
|
||||
|
|
@ -1366,12 +1381,21 @@
|
|||
/>
|
||||
</div>
|
||||
<div v-else>
|
||||
<el-input
|
||||
<!-- <el-input
|
||||
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
|
||||
v-model="scope.row[iii]"
|
||||
type="text"
|
||||
size="small"
|
||||
class="priceBox"
|
||||
/> -->
|
||||
<el-input
|
||||
v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接' || formThead[iii].title === '售价' || formThead[iii].title === '市场价'"
|
||||
v-model="scope.row[iii]"
|
||||
type="text"
|
||||
size="small"
|
||||
:disabled="virStatus&&formThead[iii].title === '依据链接'"
|
||||
@input="handleCost(scope.row,iii,$event)"
|
||||
class="priceBox"
|
||||
/>
|
||||
<el-input
|
||||
v-else-if="formThead[iii].title === '库存' && formValidate.type == 2"
|
||||
|
|
@ -1385,8 +1409,10 @@
|
|||
v-else
|
||||
v-model="scope.row[iii]"
|
||||
:min="0"
|
||||
type="number"
|
||||
size="small"
|
||||
class="priceBox"
|
||||
:disabled="formThead[iii].title === '成本价'"
|
||||
controls-position="right"
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -1480,6 +1506,7 @@
|
|||
<el-checkbox-group
|
||||
v-model="checkboxGroup"
|
||||
size="small"
|
||||
:disabled='virStatus'
|
||||
@change="onChangeGroup"
|
||||
>
|
||||
<el-checkbox
|
||||
|
|
@ -1523,6 +1550,7 @@
|
|||
<el-form-item v-if="deductionStatus > 0" label="积分抵扣比例：">
|
||||
<el-radio-group
|
||||
v-model="deduction_set"
|
||||
:disabled='virStatus'
|
||||
@change="changeIntergral(deduction_set)"
|
||||
>
|
||||
<el-radio :label="1" class="radio">单独设置</el-radio>
|
||||
|
|
@ -1583,7 +1611,7 @@
|
|||
<el-col v-if="deliveryList.length > 0" :span="24">
|
||||
<el-form-item label="送货方式：" prop="delivery_way">
|
||||
<div class="acea-row">
|
||||
<el-checkbox-group v-model="formValidate.delivery_way">
|
||||
<el-checkbox-group :disabled='virStatus' v-model="formValidate.delivery_way">
|
||||
<el-checkbox
|
||||
v-for="item in deliveryList"
|
||||
:key="item.value"
|
||||
|
|
@ -1605,7 +1633,7 @@
|
|||
:span="24"
|
||||
>
|
||||
<el-form-item label="是否包邮：">
|
||||
<el-radio-group v-model="formValidate.delivery_free">
|
||||
<el-radio-group :disabled='virStatus' v-model="formValidate.delivery_free">
|
||||
<el-radio :label="0" class="radio">否</el-radio>
|
||||
<el-radio :label="1">是</el-radio>
|
||||
</el-radio-group>
|
||||
|
|
@ -1626,6 +1654,7 @@
|
|||
<el-select
|
||||
v-model="formValidate.temp_id"
|
||||
size="small"
|
||||
:disabled='virStatus'
|
||||
placeholder="请选择"
|
||||
class="pageWidth"
|
||||
>
|
||||
|
|
@ -1638,6 +1667,7 @@
|
|||
</el-select>
|
||||
<el-button
|
||||
class="ml15"
|
||||
:disabled='virStatus'
|
||||
size="small"
|
||||
@click="addTem"
|
||||
>添加运费模板</el-button>
|
||||
|
|
@ -1648,6 +1678,7 @@
|
|||
<el-col>
|
||||
<el-form-item label="最少购买件数：">
|
||||
<el-input-number
|
||||
:disabled='virStatus'
|
||||
v-model="formValidate.once_min_count"
|
||||
:min="0"
|
||||
size="small"
|
||||
|
|
@ -1660,7 +1691,7 @@
|
|||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="限购类型：">
|
||||
<el-radio-group v-model="formValidate.pay_limit">
|
||||
<el-radio-group :disabled='virStatus' v-model="formValidate.pay_limit">
|
||||
<el-radio :label="0" class="radio">不限购</el-radio>
|
||||
<el-radio :label="1">单次限购</el-radio>
|
||||
<el-radio :label="2">长期限购</el-radio>
|
||||
|
|
@ -1674,6 +1705,7 @@
|
|||
v-model="formValidate.once_max_count"
|
||||
:min="formValidate.once_min_count"
|
||||
size="small"
|
||||
:disabled='virStatus'
|
||||
controls-position="right"
|
||||
placeholder="请输入购买件数"
|
||||
/>
|
||||
|
|
@ -1686,6 +1718,7 @@
|
|||
<el-form-item label="排序：">
|
||||
<el-input-number
|
||||
v-model="formValidate.sort"
|
||||
:disabled='virStatus'
|
||||
controls-position="right"
|
||||
placeholder="请输入排序"
|
||||
size="small"
|
||||
|
|
@ -1886,6 +1919,7 @@
|
|||
<el-form-item label="商品提报备注：">
|
||||
<el-input
|
||||
v-model="formValidate.remark"
|
||||
:disabled='virStatus'
|
||||
placeholder="请输入商品提报备注"
|
||||
size="small"
|
||||
class="pageWidth"
|
||||
|
|
@ -2174,6 +2208,7 @@ export default {
|
|||
imageUrlPrefix: '',
|
||||
imageActionName: 'upfile',
|
||||
imageMaxSize: 2048000,
|
||||
readonly:false,
|
||||
imageAllowFiles: ['.png', '.jpg', '.jpeg', '.gif', '.bmp']
|
||||
},
|
||||
optionsCate: {
|
||||
|
|
@ -2284,16 +2319,16 @@ export default {
|
|||
// required: true, message: '请上传生产许可证图片或者PDF', trigger: 'blur'
|
||||
// }
|
||||
// ],
|
||||
'qualification.trademarkList': [
|
||||
{
|
||||
required: true, message: '请上传商标注册证图片或者PDF', trigger: 'blur'
|
||||
}
|
||||
],
|
||||
'qualification.authorizedList': [
|
||||
{
|
||||
required: true, message: '请上传销售授权及其他图片或者PDF', trigger: 'blur'
|
||||
}
|
||||
],
|
||||
// 'qualification.trademarkList': [
|
||||
// {
|
||||
// required: true, message: '请上传商标注册证图片或者PDF', trigger: 'blur'
|
||||
// }
|
||||
// ],
|
||||
// 'qualification.authorizedList': [
|
||||
// {
|
||||
// required: true, message: '请上传销售授权及其他图片或者PDF', trigger: 'blur'
|
||||
// }
|
||||
// ],
|
||||
'qualification.commodityList': [
|
||||
{
|
||||
required: true, message: '请上传商品检测报告及相关文件图片或者PDF', trigger: 'blur'
|
||||
|
|
@ -2574,9 +2609,20 @@ export default {
|
|||
},
|
||||
methods: {
|
||||
handleCost(val,i,e){
|
||||
// console.log(val);
|
||||
if(i=='price'){
|
||||
val.price=val.price.replace(/[^\d|\.]/g, '')
|
||||
val.cost = (e * 0.6).toFixed(2)
|
||||
}
|
||||
if(i=='ot_price'){
|
||||
val.ot_price=val.ot_price.replace(/[^\d|\.]/g, '')
|
||||
if(!val.price){
|
||||
this.$message.error('成本价低于0')
|
||||
}
|
||||
if(+val.ot_price<val.price){
|
||||
this.$message.error('市场价需大于或等于售价')
|
||||
}
|
||||
}
|
||||
},
|
||||
handlCommodity(name) {
|
||||
console.log(this.importBusinessList);
|
||||
|
|
@ -2863,6 +2909,7 @@ export default {
|
|||
},
|
||||
// 选择店铺推荐商品
|
||||
openRecommend() {
|
||||
if(this.virStatus) return this.$message.error('无法编辑')
|
||||
this.recommendVisible = true
|
||||
},
|
||||
getRecommend(selected) {
|
||||
|
|
@ -2874,6 +2921,7 @@ export default {
|
|||
},
|
||||
// 删除店铺推荐商品
|
||||
deleteRecommend(index) {
|
||||
if(this.virStatus) return this.$message.error('无法编辑')
|
||||
this.goodList.splice(index, 1)
|
||||
},
|
||||
addCoupon() {
|
||||
|
|
@ -3410,6 +3458,7 @@ export default {
|
|||
if (this.oneFormBatch[0].bar_code != null && this.oneFormBatch[0].bar_code != '') this.$set(val, 'bar_code', this.oneFormBatch[0].bar_code)
|
||||
if (this.oneFormBatch[0].weight != null && this.oneFormBatch[0].weight != '') this.$set(val, 'weight', this.oneFormBatch[0].weight)
|
||||
if (this.oneFormBatch[0].volume != null && this.oneFormBatch[0].volume != '') this.$set(val, 'volume', this.oneFormBatch[0].volume)
|
||||
if (this.oneFormBatch[0].gist_url != null && this.oneFormBatch[0].gist_url != '') this.$set(val, 'gist_url', this.oneFormBatch[0].gist_url)
|
||||
if (this.oneFormBatch[0].extension_one != null && this.oneFormBatch[0].extension_one != '') this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
|
||||
if (this.oneFormBatch[0].extension_two != null && this.oneFormBatch[0].extension_two != '') this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
|
||||
if (this.formValidate.type == 2) {
|
||||
|
|
@ -3548,7 +3597,10 @@ export default {
|
|||
});
|
||||
},
|
||||
infoData(info) {
|
||||
if(info.is_show){
|
||||
this.myConfig.readonly = true
|
||||
this.virStatus = true
|
||||
}
|
||||
this.deduction_set = info.integral_rate == -1 ? -1 : 1;
|
||||
this.goodList = info.goodList || [];
|
||||
this.attrs = info.attr || [];
|
||||
|
|
@ -3651,7 +3703,7 @@ export default {
|
|||
},
|
||||
// 点击商品图
|
||||
modalPicTap(tit, num, i) {
|
||||
if(this.virStatus) return
|
||||
if(tit !== "1" && this.virStatus) return
|
||||
const _this = this;
|
||||
const attr = [];
|
||||
this.$modalUpload(function(img) {
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@
|
|||
复制商品
|
||||
</router-link>
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item v-if="tableFrom.type !== '5'" @click.native="onEditLabel(scope.row)">编辑标签</el-dropdown-item>
|
||||
<!-- <el-dropdown-item v-if="tableFrom.type !== '5'" @click.native="onEditLabel(scope.row)">编辑标签</el-dropdown-item> -->
|
||||
<el-dropdown-item v-if="tableFrom.type != 5">
|
||||
<router-link :to="{path: roterPre + '/product/reviews/?product_id=' + scope.row.product_id}">
|
||||
查看评价
|
||||
|
|
|
|||
|
|
@ -598,7 +598,7 @@
|
|||
</span>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="商品操作记录" name="records">
|
||||
<!-- <el-tab-pane label="商品操作记录" name="records">
|
||||
<div class="section">
|
||||
<el-form size="small" label-width="80px">
|
||||
<div class="acea-row">
|
||||
|
|
@ -673,7 +673,7 @@
|
|||
<el-pagination :page-size="recordForm.limit" :current-page="recordForm.page" layout="prev, pager, next, jumper" :total="recordData.total" @size-change="handleSizeChange" @current-change="pageChange" />
|
||||
</div>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tab-pane> -->
|
||||
</el-tabs>
|
||||
</div>
|
||||
</el-drawer>
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
<div>
|
||||
<!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
|
||||
<!-- <div class="pay_type">请使用微信扫码支付</div> -->
|
||||
<div class="pay_price">￥{{ merData.margin }}元</div>
|
||||
<div class="pay_price">￥{{ merData.service_cost }}元</div>
|
||||
<div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
|
||||
<div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
|
||||
<div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<div>
|
||||
<!-- <vue-qr class="bicode" :text="goodsQrcode" :size="310" /> -->
|
||||
<!-- <div class="pay_type">请使用微信扫码支付</div> -->
|
||||
<div class="pay_price">￥{{ merData.margin }}元</div>
|
||||
<div class="pay_price">￥{{ merData.goods_cost }}元</div>
|
||||
<div class="pay_time">支付账户名称： {{ merData.bank_info.bank_account_name }}</div>
|
||||
<div class="pay_time">开户银行： {{ merData.bank_info.bank_name }}</div>
|
||||
<div class="pay_time">银行卡号： {{ merData.bank_info.bank_account_code }}</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue