|
|
@@ -2,7 +2,7 @@
|
|
|
<div class="app-container">
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px" style="margin-bottom:40px">
|
|
|
<div class="bj-divider">
|
|
|
- <div class="left">
|
|
|
+ <div class="left">
|
|
|
<span class="default-text">三方订单基本信息</span>
|
|
|
<div class="button"></div>
|
|
|
<span class="tips"></span>
|
|
|
@@ -29,7 +29,7 @@
|
|
|
<el-select style="width:100%" @change="channelChange" v-model="form.channelType" :placeholder="storePlaceholder" clearable size="small">
|
|
|
<el-option
|
|
|
v-for="item in channelTypeOptions"
|
|
|
- :key="'channelType'+item.dictValue"
|
|
|
+ :key="'channelType'+item.dictValue"
|
|
|
:label="item.dictLabel"
|
|
|
:value="item.dictValue"/>
|
|
|
</el-select>
|
|
|
@@ -40,16 +40,16 @@
|
|
|
<el-select style="width:100%" :disabled="storeAvailable" ref="storeId" v-model="form.storeId" placeholder="请选择销售店铺" clearable size="small">
|
|
|
<el-option
|
|
|
v-for="item in stores"
|
|
|
- :key="'omsStore'+item.storeId"
|
|
|
+ :key="'omsStore'+item.storeId"
|
|
|
:label="item.storeName"
|
|
|
:value="item.storeId"/>
|
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="18">
|
|
|
<el-form-item label-width="100px" label="商家备注" prop="channelType">
|
|
|
<el-input type="textarea" v-model="form.orderRemark" show-word-limit maxlength="200"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
@@ -86,7 +86,7 @@
|
|
|
|
|
|
<el-col :span="9">
|
|
|
<el-form-item label-width="10px" prop="cityIds">
|
|
|
- <el-input v-model="form.userAddress" placeholder="详情地址" />
|
|
|
+ <el-input v-model="form.userAddress" placeholder="详情地址" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -94,10 +94,10 @@
|
|
|
<el-col :span="18">
|
|
|
<el-form-item label-width="100px" label="买家备注" prop="buyerRemark" >
|
|
|
<el-input type="textarea" v-model="form.buyerRemark" show-word-limit maxlength="200"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
-
|
|
|
+
|
|
|
<div class="bj-divider"><div class="left"><span class="default-text">支付信息</span><div class="button"></div><span class="tips"></span></div></div>
|
|
|
<el-row>
|
|
|
<el-col :span="8">
|
|
|
@@ -105,7 +105,7 @@
|
|
|
<el-select style="width:100%" v-model="form.payType" placeholder="请选择支付方式" clearable size="small">
|
|
|
<el-option
|
|
|
v-for="item in payTypeOptions"
|
|
|
- :key="'payType'+item.dictValue"
|
|
|
+ :key="'payType'+item.dictValue"
|
|
|
:label="item.dictLabel"
|
|
|
:value="item.dictValue"/>
|
|
|
</el-select>
|
|
|
@@ -113,7 +113,7 @@
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
<el-form-item label-width="100px" label="支付金额" prop="buyerPayAmount" style="margin-right:20px">
|
|
|
- <el-input v-model="form.buyerPayAmount" type="number" placeholder="请输入" />
|
|
|
+ <el-input v-model="form.buyerPayAmount" type="number" placeholder="请输入" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
@@ -130,7 +130,7 @@
|
|
|
<el-select style="width:100%" v-model="form.payStatus" placeholder="请选择" clearable size="small">
|
|
|
<el-option
|
|
|
v-for="item in payStatusOptions"
|
|
|
- :key="'payStatus'+item.dictValue"
|
|
|
+ :key="'payStatus'+item.dictValue"
|
|
|
:label="item.dictLabel"
|
|
|
:value="item.dictValue"/>
|
|
|
</el-select>
|
|
|
@@ -157,7 +157,7 @@
|
|
|
<el-radio :key="'isThirdDiscount'+item.dictValue" :label="item.dictValue" v-for="item in isThirdDiscountOptions" >{{item.dictLabel}}</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col>
|
|
|
<el-col :span="9" v-if="form.isThirdDiscount!='0'">
|
|
|
<el-form-item label-width="10" label="" prop="thirdDiscount">
|
|
|
<el-input v-model="form.thirdDiscount" placeholder="三方平台优惠金额" />
|
|
|
@@ -167,7 +167,7 @@
|
|
|
<el-form-item label-width="100px" label="优惠承担" prop="thirdDiscountAmount" style="margin-right:10px">
|
|
|
<el-input v-model="form.thirdDiscountAmount" placeholder="三方平台承担优惠金额" />
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col>
|
|
|
<el-col :span="9" v-if="form.isThirdDiscount!='0'">
|
|
|
<el-form-item label-width="10" label="" prop="businessDiscountAmount">
|
|
|
<el-input v-model="form.businessDiscountAmount" placeholder="商家承担优惠金额" />
|
|
|
@@ -181,7 +181,7 @@
|
|
|
<span class="tips"></span>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-row>
|
|
|
+ <el-row>
|
|
|
<el-col :span="24">
|
|
|
<el-form-item label="" label-width="0" prop="productList" style="margin-left:0" >
|
|
|
<el-table border width="100%" style="margin-top:5px;" :data="products">
|
|
|
@@ -239,7 +239,7 @@
|
|
|
</el-col>
|
|
|
</el-row> -->
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -540,7 +540,7 @@ export default {
|
|
|
};
|
|
|
</script>
|
|
|
|
|
|
-<style lang="scss" scoped>
|
|
|
+<style lang="scss" scoped>
|
|
|
|
|
|
.app-main{
|
|
|
background: #ffffff;
|
|
|
@@ -585,7 +585,7 @@ export default {
|
|
|
display: flex
|
|
|
}
|
|
|
.bj-divider .default-text {
|
|
|
- border-left: 4px #13c2c2 solid;
|
|
|
+ border-left: 4px #409eff solid;
|
|
|
padding-left: 16px;
|
|
|
font-size: 18px
|
|
|
}
|
|
|
@@ -634,4 +634,4 @@ export default {
|
|
|
background: #ffffff;
|
|
|
height: 65px;
|
|
|
}
|
|
|
-</style>
|
|
|
+</style>
|
