|
|
@@ -115,10 +115,7 @@
|
|
|
alt=""
|
|
|
/>
|
|
|
<span>{{ goods_sitem.good_name }}</span>
|
|
|
- <span
|
|
|
- v-for="(si, i) in goods_sitem.specinfo"
|
|
|
- :key="si.spec_id + i"
|
|
|
- >
|
|
|
+ <span v-for="(si, i) in goods_sitem.specinfo" :key="si.spec_id + i">
|
|
|
<span>{{ i === 0 ? "--" : "__" }}</span
|
|
|
><span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
|
|
|
</span>
|
|
|
@@ -139,9 +136,7 @@
|
|
|
</span>
|
|
|
</template>
|
|
|
<template slot="exclusive">
|
|
|
- <span
|
|
|
- v-for="(si, sii) in goods_sitem.exclusive"
|
|
|
- :key="si.id"
|
|
|
+ <span v-for="(si, sii) in goods_sitem.exclusive" :key="si.id"
|
|
|
><span v-if="sii !== 0">/</span><span>{{ si.name }}</span>
|
|
|
</span>
|
|
|
</template>
|
|
|
@@ -158,9 +153,7 @@
|
|
|
>
|
|
|
<span v-if="goods_sitem.metal_id"
|
|
|
>--{{
|
|
|
- goods_sitem.noble_weight
|
|
|
- ? goods_sitem.noble_weight
|
|
|
- : "0"
|
|
|
+ goods_sitem.noble_weight ? goods_sitem.noble_weight : "0"
|
|
|
}}g--{{ goods_sitem.metal_name }}---{{
|
|
|
goods_sitem.gold_price ? goods_sitem.gold_price : "0"
|
|
|
}}元/g--{{
|
|
|
@@ -198,10 +191,7 @@
|
|
|
placement="top"
|
|
|
class="fr"
|
|
|
>
|
|
|
- <i
|
|
|
- class="el-icon-search tb-icon"
|
|
|
- @click="showVoucherFun"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-search tb-icon" @click="showVoucherFun"></i>
|
|
|
</el-tooltip>
|
|
|
|
|
|
<el-tooltip
|
|
|
@@ -211,18 +201,12 @@
|
|
|
placement="top"
|
|
|
class="fr"
|
|
|
>
|
|
|
- <i
|
|
|
- class="el-icon-circle-close tb-icon"
|
|
|
- @click="proof_close"
|
|
|
- ></i>
|
|
|
+ <i class="el-icon-circle-close tb-icon" @click="proof_close"></i>
|
|
|
</el-tooltip>
|
|
|
|
|
|
<ul class="shangchuan-ul">
|
|
|
<li v-if="ruleForm.proof_url" class="shiping">
|
|
|
- <div
|
|
|
- v-if="ruleForm.proof_type === '1'"
|
|
|
- class="clearfix"
|
|
|
- >
|
|
|
+ <div v-if="ruleForm.proof_type === '1'" class="clearfix">
|
|
|
<i
|
|
|
class="el-icon-video-camera hover fl"
|
|
|
style="
|
|
|
@@ -237,21 +221,12 @@
|
|
|
/>
|
|
|
|
|
|
<video width="250" controls class="fl">
|
|
|
- <source
|
|
|
- :src="ruleForm.proof_url"
|
|
|
- type="video/mp4"
|
|
|
- />
|
|
|
- <source
|
|
|
- :src="ruleForm.proof_url"
|
|
|
- type="video/avi"
|
|
|
- />
|
|
|
+ <source :src="ruleForm.proof_url" type="video/mp4" />
|
|
|
+ <source :src="ruleForm.proof_url" type="video/avi" />
|
|
|
您的浏览器不支持Video标签。
|
|
|
</video>
|
|
|
</div>
|
|
|
- <div
|
|
|
- v-else-if="ruleForm.proof_type === '2'"
|
|
|
- class="clearfix"
|
|
|
- >
|
|
|
+ <div v-else-if="ruleForm.proof_type === '2'" class="clearfix">
|
|
|
<img
|
|
|
style="width: 28px; height: 28px"
|
|
|
:src="ruleForm.proof_url"
|
|
|
@@ -259,9 +234,7 @@
|
|
|
/>
|
|
|
</div>
|
|
|
<div v-else class="clearfix">
|
|
|
- <a :href="ruleForm.proof_url" download="凭证文件"
|
|
|
- >点击下载</a
|
|
|
- >
|
|
|
+ <a :href="ruleForm.proof_url" download="凭证文件">点击下载</a>
|
|
|
</div>
|
|
|
</li>
|
|
|
<li v-else class="shiping">暂无凭证</li>
|
|
|
@@ -322,8 +295,7 @@
|
|
|
ruleForm &&
|
|
|
ruleForm.goodtype &&
|
|
|
ruleForm.goodtype.length === 2 &&
|
|
|
- (ruleForm.goodtype[1] == '2' ||
|
|
|
- ruleForm.goodtype[1] == '3')
|
|
|
+ (ruleForm.goodtype[1] == '2' || ruleForm.goodtype[1] == '3')
|
|
|
? 0
|
|
|
: 100000000000
|
|
|
"
|
|
|
@@ -424,9 +396,7 @@
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
v-if="scope.row.edit"
|
|
|
- :prop="
|
|
|
- 'order_addr.' + scope.$index + '.' + 'receipt_quantity'
|
|
|
- "
|
|
|
+ :prop="'order_addr.' + scope.$index + '.' + 'receipt_quantity'"
|
|
|
:rules="addrRules.receipt_quantity"
|
|
|
:size="'mini'"
|
|
|
:style="{ marginBottom: scope.row.edit ? '13px' : '0' }"
|
|
|
@@ -438,9 +408,7 @@
|
|
|
:disabled="!scope.row.edit"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <span v-if="!scope.row.edit">{{
|
|
|
- scope.row.receipt_quantity
|
|
|
- }}</span>
|
|
|
+ <span v-if="!scope.row.edit">{{ scope.row.receipt_quantity }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
@@ -516,9 +484,7 @@
|
|
|
@selectChange="select_area_change($event, scope.$index)"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <span v-if="!scope.row.edit">{{
|
|
|
- scope.row.addr_code_name
|
|
|
- }}</span>
|
|
|
+ <span v-if="!scope.row.edit">{{ scope.row.addr_code_name }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -648,19 +614,13 @@
|
|
|
justify-content: space-between;
|
|
|
"
|
|
|
>
|
|
|
- <p>
|
|
|
- 订单总金额：{{
|
|
|
- accMul(ruleForm.good_num, ruleForm.new_good_price) || 0
|
|
|
- }}
|
|
|
- </p>
|
|
|
- <el-button :size="'mini'" type="primary" @click="submitForm"
|
|
|
- >保 存
|
|
|
- </el-button>
|
|
|
+ <p>订单总金额：{{ accMul(ruleForm.good_num, ruleForm.new_good_price) || 0 }}</p>
|
|
|
+ <el-button :size="'mini'" type="primary" @click="submitForm">保 存 </el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</template>
|
|
|
- <script>
|
|
|
+<script>
|
|
|
import mixinPage from "@/mixins/elPaginationHandle";
|
|
|
import resToken from "@/mixins/resToken";
|
|
|
import asyncRequest from "@/apis/service/sellOut/salesOrder";
|
|
|
@@ -750,14 +710,14 @@ export default {
|
|
|
value: "1",
|
|
|
label: "常规商品",
|
|
|
},
|
|
|
- // {
|
|
|
- // value: "2",
|
|
|
- // label: "赠品",
|
|
|
- // },
|
|
|
- // {
|
|
|
- // value: "3",
|
|
|
- // label: "样品",
|
|
|
- // },
|
|
|
+ {
|
|
|
+ value: "2",
|
|
|
+ label: "赠品",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: "3",
|
|
|
+ label: "样品",
|
|
|
+ },
|
|
|
],
|
|
|
},
|
|
|
{
|
|
|
@@ -944,8 +904,7 @@ export default {
|
|
|
m += s2.split(".")[1].length;
|
|
|
} catch (e) {}
|
|
|
return (
|
|
|
- (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) /
|
|
|
- Math.pow(10, m)
|
|
|
+ (Number(s1.replace(".", "")) * Number(s2.replace(".", ""))) / Math.pow(10, m)
|
|
|
);
|
|
|
},
|
|
|
async initForm() {
|
|
|
@@ -1075,8 +1034,7 @@ export default {
|
|
|
});
|
|
|
this.goodtype_options[1].children = [];
|
|
|
this.goodtype_options[1].children.push(...actlist);
|
|
|
- let goodItem =
|
|
|
- good.length > 0 ? JSON.parse(JSON.stringify(good[0])) : {};
|
|
|
+ let goodItem = good.length > 0 ? JSON.parse(JSON.stringify(good[0])) : {};
|
|
|
if (goodItem.good_name) {
|
|
|
this.goodtype_options[0].children.map((b) => {
|
|
|
b.activity_stock = goodItem ? goodItem.stock_num + "" : "0";
|
|
|
@@ -1097,8 +1055,7 @@ export default {
|
|
|
if (code === 0) {
|
|
|
this.goods_sitem = data;
|
|
|
// console.log("1111111111111111", this.goods_sitem);
|
|
|
- this.goods_sitem.good_info_img =
|
|
|
- this.goods_sitem.good_info_img.split(",");
|
|
|
+ this.goods_sitem.good_info_img = this.goods_sitem.good_info_img.split(",");
|
|
|
const { weight } = this.goods_sitem;
|
|
|
let kgnum = parseInt((weight * 1) / 1000);
|
|
|
let gnum = (weight * 1) % 1000;
|
|
|
@@ -1284,8 +1241,7 @@ export default {
|
|
|
});
|
|
|
if (code === 0) {
|
|
|
const { province, city, area } = data;
|
|
|
- let province_name =
|
|
|
- province && province.name ? province.name : "";
|
|
|
+ let province_name = province && province.name ? province.name : "";
|
|
|
let city_name = city && city.name ? city.name : "";
|
|
|
let area_name = area && area.name ? area.name : "";
|
|
|
this.addrForm.order_addr[rowIndex].addr_code_name =
|
|
|
@@ -1428,10 +1384,7 @@ export default {
|
|
|
|
|
|
let oldGood_type = goodtype.length === 2 ? goodtype[1] : "";
|
|
|
|
|
|
- if (
|
|
|
- key_0 === "is_activity_0" &&
|
|
|
- (oldGood_type == 2 || oldGood_type == 3)
|
|
|
- ) {
|
|
|
+ if (key_0 === "is_activity_0" && (oldGood_type == 2 || oldGood_type == 3)) {
|
|
|
resModel.price = 0 + "";
|
|
|
}
|
|
|
} else if (code >= 100 && code <= 104) {
|
|
|
@@ -1446,9 +1399,7 @@ export default {
|
|
|
},
|
|
|
};
|
|
|
</script>
|
|
|
- <style lang="scss" scoped>
|
|
|
+<style lang="scss" scoped>
|
|
|
.salesOrderDetail {
|
|
|
}
|
|
|
</style>
|
|
|
-
|
|
|
-
|
