|
@@ -1,9 +1,6 @@
|
|
|
<template>
|
|
|
<div class="orderConfirm pagePadding">
|
|
|
- <div
|
|
|
- style="width: 100%"
|
|
|
- v-if=" powers.some((i) => i == '001')"
|
|
|
- >
|
|
|
+ <div style="width: 100%" v-if="powers.some((i) => i == '001')">
|
|
|
<show-data-table
|
|
|
style="margin: 0 0 10px 0; padding: 0"
|
|
|
:sitem="sitem"
|
|
@@ -12,12 +9,9 @@
|
|
|
border
|
|
|
>
|
|
|
<template #status>
|
|
|
- <el-tag
|
|
|
- :size="'mini'"
|
|
|
- :type="sitem.status_type"
|
|
|
- style="margin: auto"
|
|
|
- >{{ sitem.status_name }}</el-tag
|
|
|
- >
|
|
|
+ <el-tag :size="'mini'" :type="sitem.status_type" style="margin: auto">{{
|
|
|
+ sitem.status_name
|
|
|
+ }}</el-tag>
|
|
|
</template>
|
|
|
<template #error_msg>
|
|
|
<span :style="{ color: sitem.error_msg ? 'red' : '' }">{{
|
|
@@ -81,12 +75,7 @@
|
|
|
<el-input
|
|
|
v-model="ruleForm.platform_code"
|
|
|
maxlength="100"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="平台订单号"
|
|
|
/> </el-form-item
|
|
|
></el-col>
|
|
@@ -96,12 +85,7 @@
|
|
|
<el-input
|
|
|
v-model="ruleForm.po_code"
|
|
|
maxlength="100"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="其他单号"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -179,10 +163,7 @@
|
|
|
><span>{{ conGoodData.platform_code_en }}</span>
|
|
|
</li> -->
|
|
|
</ul>
|
|
|
- <i
|
|
|
- class="el-icon-warning-outline fr"
|
|
|
- slot="reference"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-warning-outline fr" slot="reference"></i>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
|
|
@@ -195,25 +176,17 @@
|
|
|
><span>{{ conGoodData.companyNo }}</span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
- <i
|
|
|
- class="el-icon-warning-outline fr"
|
|
|
- slot="reference"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-warning-outline fr" slot="reference"></i>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
|
|
|
<template slot="cat_info">
|
|
|
- <span
|
|
|
- v-for="(si, sii) in conGoodData.cat_info"
|
|
|
- :key="si + sii"
|
|
|
+ <span v-for="(si, sii) in conGoodData.cat_info" :key="si + sii"
|
|
|
>{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
|
|
|
>
|
|
|
</template>
|
|
|
<template slot="exclusive">
|
|
|
- <span
|
|
|
- v-for="(si, sii) in conGoodData.exclusive"
|
|
|
- :key="si.id"
|
|
|
- >
|
|
|
+ <span v-for="(si, sii) in conGoodData.exclusive" :key="si.id">
|
|
|
<span v-if="sii !== 0">/</span>
|
|
|
<span>{{ si.name }}</span>
|
|
|
</span>
|
|
@@ -224,9 +197,8 @@
|
|
|
:size="'mini'"
|
|
|
v-text="
|
|
|
(
|
|
|
- options4.find(
|
|
|
- (item) => item.id == conGoodData.is_stock
|
|
|
- ) || {}
|
|
|
+ options4.find((item) => item.id == conGoodData.is_stock) ||
|
|
|
+ {}
|
|
|
).name || '--'
|
|
|
"
|
|
|
/>
|
|
@@ -244,12 +216,7 @@
|
|
|
v-model="ruleForm.platform_time"
|
|
|
style="width: 100%"
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
:picker-options="pickerOptions"
|
|
|
@change="selectTime"
|
|
|
>
|
|
@@ -261,20 +228,12 @@
|
|
|
v-model="ruleForm.plat_code"
|
|
|
maxlength="100"
|
|
|
readonly
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
@focus="showModel = true"
|
|
|
placeholder="平台商品编号"
|
|
|
/></el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col
|
|
|
- :span="24"
|
|
|
- v-if="subGoodData && subGoodData.good_thumb_img"
|
|
|
- >
|
|
|
+ <el-col :span="24" v-if="subGoodData && subGoodData.good_thumb_img">
|
|
|
<show-data-table
|
|
|
:sitem="subGoodData"
|
|
|
:columns="onlineColumns"
|
|
@@ -298,11 +257,7 @@
|
|
|
<span v-else>_</span>
|
|
|
<span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
|
|
|
</span>
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="300"
|
|
|
- trigger="hover"
|
|
|
- >
|
|
|
+ <el-popover placement="top" width="300" trigger="hover">
|
|
|
<ul>
|
|
|
<li>
|
|
|
<span>上线商品编号:</span
|
|
@@ -324,44 +279,29 @@
|
|
|
><span>{{ subGoodData.platform_code_en }}</span>
|
|
|
</li> -->
|
|
|
</ul>
|
|
|
- <i
|
|
|
- class="el-icon-warning-outline fr"
|
|
|
- slot="reference"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-warning-outline fr" slot="reference"></i>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
|
|
|
<template slot="company">
|
|
|
<span>{{ subGoodData.company }}</span>
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="300"
|
|
|
- trigger="hover"
|
|
|
- >
|
|
|
+ <el-popover placement="top" width="300" trigger="hover">
|
|
|
<ul>
|
|
|
<li>
|
|
|
<span>业务企业编号:</span
|
|
|
><span>{{ subGoodData.companyNo }}</span>
|
|
|
</li>
|
|
|
</ul>
|
|
|
- <i
|
|
|
- class="el-icon-warning-outline fr"
|
|
|
- slot="reference"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-warning-outline fr" slot="reference"></i>
|
|
|
</el-popover>
|
|
|
</template>
|
|
|
<template slot="cat_info">
|
|
|
- <span
|
|
|
- v-for="(si, sii) in subGoodData.cat_info"
|
|
|
- :key="si + sii"
|
|
|
+ <span v-for="(si, sii) in subGoodData.cat_info" :key="si + sii"
|
|
|
>{{ sii === 0 ? "" : "_" }}{{ si.name }}</span
|
|
|
>
|
|
|
</template>
|
|
|
<template slot="exclusive">
|
|
|
- <span
|
|
|
- v-for="(si, sii) in subGoodData.exclusive"
|
|
|
- :key="si.id"
|
|
|
- >
|
|
|
+ <span v-for="(si, sii) in subGoodData.exclusive" :key="si.id">
|
|
|
<span v-if="sii !== 0">/</span>
|
|
|
<span>{{ si.name }}</span>
|
|
|
</span>
|
|
@@ -414,12 +354,7 @@
|
|
|
v-model="ruleForm.mode"
|
|
|
style="width: 100%"
|
|
|
clearable
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="收费模式"
|
|
|
>
|
|
|
<el-option
|
|
@@ -438,12 +373,7 @@
|
|
|
v-model="ruleForm.sale_source"
|
|
|
style="width: 100%"
|
|
|
clearable
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="销售渠道"
|
|
|
>
|
|
|
<el-option
|
|
@@ -488,12 +418,7 @@
|
|
|
<el-input
|
|
|
v-model="ruleForm.contactor"
|
|
|
maxlength="100"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="收货人"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -503,12 +428,7 @@
|
|
|
<el-input
|
|
|
v-model="ruleForm.mobile"
|
|
|
maxlength="100"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="收货电话"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -533,9 +453,7 @@
|
|
|
</div></el-col
|
|
|
>
|
|
|
<el-col :span="9">
|
|
|
- <div style="min-height: 26px">
|
|
|
- {{ confirmSitem.addr_name }}
|
|
|
- </div>
|
|
|
+ <div style="min-height: 26px">{{ confirmSitem.addr_name }} </div>
|
|
|
<div style="min-height: 26px">{{ confirmSitem.addr }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="11" class="nop">
|
|
@@ -545,12 +463,7 @@
|
|
|
<select-area
|
|
|
:value="ruleForm.addr_code"
|
|
|
:size="'mini'"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="收货省市区"
|
|
|
@selectChange="select_area_change($event)"
|
|
|
/>
|
|
@@ -561,12 +474,7 @@
|
|
|
<el-input
|
|
|
v-model="ruleForm.addr"
|
|
|
maxlength="100"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="详细地址"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -578,9 +486,7 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="tab-row">
|
|
|
- <div class="tab-item-label">
|
|
|
- <label style="color: red">*</label>订单备注
|
|
|
- </div>
|
|
|
+ <div class="tab-item-label"><label style="color: red">*</label>订单备注</div>
|
|
|
<div class="tab-item-main">
|
|
|
<el-row class="tab-title">
|
|
|
<el-col :span="4" style="min-height: 26px">{{
|
|
@@ -594,11 +500,7 @@
|
|
|
<el-input
|
|
|
v-model="ruleForm.order_remark"
|
|
|
maxlength="100"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' && powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
placeholder="订单备注" /></el-form-item
|
|
|
></el-col>
|
|
|
</el-row>
|
|
@@ -634,12 +536,7 @@
|
|
|
:size="'mini'"
|
|
|
:controls="false"
|
|
|
:append="''"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
@reschange="number_change($event, 'num')"
|
|
|
/>
|
|
|
</el-form-item>
|
|
@@ -650,12 +547,7 @@
|
|
|
:values="ruleForm.price"
|
|
|
:placeholder="'单价'"
|
|
|
:min="price_min"
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' &&
|
|
|
- powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
:max="100000000000"
|
|
|
:position="'right'"
|
|
|
:precision="2"
|
|
@@ -690,11 +582,7 @@
|
|
|
v-model="ruleForm.activity_code"
|
|
|
style="width: 100%"
|
|
|
clearable
|
|
|
- :disabled="
|
|
|
- !(
|
|
|
- status === '2' && powers.some((i) => i == '008')
|
|
|
- )
|
|
|
- "
|
|
|
+ :disabled="!(status === '2' && powers.some((i) => i == '008'))"
|
|
|
@change="get_new_price"
|
|
|
placeholder="活动名称"
|
|
|
>
|
|
@@ -729,10 +617,8 @@
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div
|
|
|
- class="tab-row"
|
|
|
- v-if="status === '2' && powers.some((i) => i == '008')"
|
|
|
- >
|
|
|
+
|
|
|
+ <div class="tab-row" v-if="status === '2' && powers.some((i) => i == '008')">
|
|
|
<div class="tab-item-label">
|
|
|
<label style="color: transparent">*</label>
|
|
|
</div>
|
|
@@ -761,7 +647,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <script>
|
|
|
+<script>
|
|
|
import mixinPage from "@/mixins/elPaginationHandle";
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
import asyncRequest from "@/apis/service/orderEntry/orderConfirm";
|
|
@@ -790,9 +676,8 @@ export default {
|
|
|
computed: {
|
|
|
powers() {
|
|
|
const tran =
|
|
|
- this.$store.getters.btnList.find(
|
|
|
- (item) => item.menu_route == "orderConfirm"
|
|
|
- ) || {};
|
|
|
+ this.$store.getters.btnList.find((item) => item.menu_route == "orderConfirm") ||
|
|
|
+ {};
|
|
|
const { action } = tran ?? {};
|
|
|
return action ?? [];
|
|
|
},
|
|
@@ -987,8 +872,7 @@ export default {
|
|
|
activity_code: activity_code || "", //优惠活动名称
|
|
|
order_remark: order_remark || "", //订单备注
|
|
|
addr: addr || "", //联系地址
|
|
|
- addr_code:
|
|
|
- addr_code && addr_code.length > 0 ? addr_code.split(",") : [], //省市区
|
|
|
+ addr_code: addr_code && addr_code.length > 0 ? addr_code.split(",") : [], //省市区
|
|
|
};
|
|
|
this.ruleForm.before_discount_all_price = this.accMul(
|
|
|
this.ruleForm.num,
|
|
@@ -1037,20 +921,14 @@ export default {
|
|
|
error_msg,
|
|
|
};
|
|
|
this.importSitem = simport ? JSON.parse(JSON.stringify(simport)) : null;
|
|
|
- this.confirmSitem = confirm
|
|
|
- ? JSON.parse(JSON.stringify(confirm))
|
|
|
- : null;
|
|
|
+ this.confirmSitem = confirm ? JSON.parse(JSON.stringify(confirm)) : null;
|
|
|
|
|
|
this.status = status;
|
|
|
- if (
|
|
|
- !(this.status === "3" || this.status === "4" || this.status === "5")
|
|
|
- ) {
|
|
|
+ if (!(this.status === "3" || this.status === "4" || this.status === "5")) {
|
|
|
console.log(12345);
|
|
|
this.subSitem = confirm ? JSON.parse(JSON.stringify(confirm)) : null;
|
|
|
} else {
|
|
|
- this.subSitem = user_update
|
|
|
- ? JSON.parse(JSON.stringify(user_update))
|
|
|
- : null;
|
|
|
+ this.subSitem = user_update ? JSON.parse(JSON.stringify(user_update)) : null;
|
|
|
}
|
|
|
if (
|
|
|
this.confirmSitem !== null &&
|
|
@@ -1183,8 +1061,7 @@ export default {
|
|
|
if (!isok) {
|
|
|
this.ruleForm.price = "0";
|
|
|
} else {
|
|
|
- if (price * 1 >= this.ruleForm.price * 1)
|
|
|
- this.ruleForm.price = price;
|
|
|
+ if (price * 1 >= this.ruleForm.price * 1) this.ruleForm.price = price;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1225,7 +1102,7 @@ export default {
|
|
|
async submitForm() {
|
|
|
await this.$refs.ruleForm.validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
- if (this.loading) {
|
|
|
+ if (this.loading) {
|
|
|
return;
|
|
|
}
|
|
|
this.loading = true;
|
|
@@ -1264,8 +1141,7 @@ export default {
|
|
|
} catch (e) {}
|
|
|
|
|
|
return (
|
|
|
- (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
|
|
|
- Math.pow(10, m)
|
|
|
+ (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) / Math.pow(10, m)
|
|
|
);
|
|
|
},
|
|
|
async set_salegetprice(model) {
|
|
@@ -1294,7 +1170,7 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
- <style lang="scss" scoped>
|
|
|
+<style lang="scss" scoped>
|
|
|
.orderConfirm {
|
|
|
font-size: 13px;
|
|
|
|
|
@@ -1338,5 +1214,3 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
</style>
|
|
|
-
|
|
|
-
|