1111
This commit is contained in:
@@ -8,7 +8,7 @@ VUE_APP_BASE_API = '/api'
|
|||||||
# VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"
|
# VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"
|
||||||
|
|
||||||
|
|
||||||
VUE_APP_URL = "http://192.168.2.106:7201"
|
VUE_APP_URL = "http://192.168.2.111:7201"
|
||||||
VUE_APP_REPORT_URL = "http://192.168.2.106:7202"
|
VUE_APP_REPORT_URL = "http://192.168.2.106:7202"
|
||||||
##VUE_APP_REPORT_URL = "https://lpk.yyundong.com"
|
##VUE_APP_REPORT_URL = "https://lpk.yyundong.com"
|
||||||
##VUE_APP_REPORT_URL = "https://supervise.yxtsoft.com/lpk"
|
##VUE_APP_REPORT_URL = "https://supervise.yxtsoft.com/lpk"
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ export default {
|
|||||||
// 初始化礼包
|
// 初始化礼包
|
||||||
AppletGiftBagInit: function(data) {
|
AppletGiftBagInit: function(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/lpkgiftbag/giftBagInit/'+data,
|
url: '/appletgiftbag/giftBagInit/'+data,
|
||||||
method: 'get'
|
method: 'get'
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -142,9 +142,11 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="商品名称" prop="name" align="center" />
|
<el-table-column label="商品名称" prop="name" align="center" />
|
||||||
<el-table-column label="商品数量" prop="goodsNumber" align="center" />
|
<el-table-column label="份数" prop="goodsNumber" align="center" />
|
||||||
<el-table-column label="商品价格" prop="price" align="center" />
|
<el-table-column label="价格(元/斤)" prop="price" align="center" />
|
||||||
<el-table-column label="商品单位" prop="unitName" align="center" />
|
<el-table-column label="商品单位" prop="specificationUnit" align="center" />
|
||||||
|
<el-table-column label="规格(斤份)" prop="weight" align="center" />
|
||||||
|
<el-table-column label="小计" prop="subtotal" align="center" />
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
@@ -175,17 +177,31 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>单价</td>
|
<td>价格(元/斤)</td>
|
||||||
<td>
|
<td>
|
||||||
<!-- <span style="width:100%">{{GiftBagGood.price}}</span> -->
|
<!-- <span style="width:100%">{{GiftBagGood.price}}</span> -->
|
||||||
<el-input v-model="GiftBagGood.price" style="width:100%"
|
<el-input v-model="GiftBagGood.price" style="width:100%"
|
||||||
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" ></el-input>
|
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')"></el-input>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>商品单位</td>
|
<td>商品单位</td>
|
||||||
<td>
|
<td>
|
||||||
<span style="width:100%">{{GiftBagGood.unitName}}</span>
|
<span style="width:100%">{{GiftBagGood.specificationUnit}}</span>
|
||||||
|
<!-- <el-input v-model="GiftBagGood.unitName" style="width:100%"></el-input> -->
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>规格(斤份)</td> <!-- // 一份多少斤 -->
|
||||||
|
<td>
|
||||||
|
<span style="width:100%">{{GiftBagGood.weight}}</span>
|
||||||
|
<!-- <el-input v-model="GiftBagGood.unitName" style="width:100%"></el-input> -->
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>小计</td> <!-- // 份数*份单价 -->
|
||||||
|
<td>
|
||||||
|
<span style="width:100%">{{GiftBagGood.subtotal}}</span>
|
||||||
<!-- <el-input v-model="GiftBagGood.unitName" style="width:100%"></el-input> -->
|
<!-- <el-input v-model="GiftBagGood.unitName" style="width:100%"></el-input> -->
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -233,6 +249,9 @@
|
|||||||
name: "",
|
name: "",
|
||||||
unitName: "",
|
unitName: "",
|
||||||
price: "",
|
price: "",
|
||||||
|
specificationUnit: "",
|
||||||
|
weight: "",
|
||||||
|
subtotal: "0.00"
|
||||||
|
|
||||||
},
|
},
|
||||||
goods: [],
|
goods: [],
|
||||||
@@ -254,6 +273,8 @@
|
|||||||
const index = this.formobj.goods.findIndex((item) => item.goodsSid === sid)
|
const index = this.formobj.goods.findIndex((item) => item.goodsSid === sid)
|
||||||
console.log("index》》》》", index)
|
console.log("index》》》》", index)
|
||||||
this.formobj.goods.splice(index, 1)
|
this.formobj.goods.splice(index, 1)
|
||||||
|
|
||||||
|
this.countPrice()
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
save() {
|
save() {
|
||||||
@@ -289,6 +310,9 @@
|
|||||||
name: "",
|
name: "",
|
||||||
unitName: "",
|
unitName: "",
|
||||||
price: "",
|
price: "",
|
||||||
|
specificationUnit: "",
|
||||||
|
weight: "",
|
||||||
|
subtotal: "0.00"
|
||||||
|
|
||||||
}
|
}
|
||||||
this.editDialog = false
|
this.editDialog = false
|
||||||
@@ -306,31 +330,34 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
countPrice(){
|
countPrice() {
|
||||||
|
|
||||||
let num = 0
|
let num = 0
|
||||||
|
|
||||||
for (var i = 0; i < this.formobj.goods.length; i++) {
|
for (var i = 0; i < this.formobj.goods.length; i++) {
|
||||||
var item = this.formobj.goods[i]
|
var item = this.formobj.goods[i]
|
||||||
|
|
||||||
num+=item.goodsNumber*item.price
|
num += Number(item.subtotal)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("num",num);
|
console.log("num", num);
|
||||||
|
|
||||||
this.formobj.price = num.toFixed(2)
|
this.formobj.price = Number(num).toFixed(2)
|
||||||
this.formobj.preferentialPrice = num.toFixed(2)
|
this.formobj.preferentialPrice = Number(num).toFixed(2)
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
handleCancle(){
|
handleCancle() {
|
||||||
this.GiftBagGood = {
|
this.GiftBagGood = {
|
||||||
goodsSid: "",
|
goodsSid: "",
|
||||||
goodsNumber: "",
|
goodsNumber: "",
|
||||||
name: "",
|
name: "",
|
||||||
unitName: "",
|
unitName: "",
|
||||||
price: "",
|
price: "",
|
||||||
|
specificationUnit: "",
|
||||||
|
weight: "",
|
||||||
|
subtotal: "0.00"
|
||||||
|
|
||||||
}
|
}
|
||||||
this.editDialog = false
|
this.editDialog = false
|
||||||
@@ -338,6 +365,10 @@
|
|||||||
input(val) {
|
input(val) {
|
||||||
console.log("input》》》》", val)
|
console.log("input》》》》", val)
|
||||||
this.GiftBagGood.goodsNumber = val
|
this.GiftBagGood.goodsNumber = val
|
||||||
|
|
||||||
|
this.GiftBagGood.subtotal = this.GiftBagGood.goodsNumber * this.GiftBagGood.price * this.GiftBagGood.weight
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
add() {
|
add() {
|
||||||
this.editDialog = true
|
this.editDialog = true
|
||||||
@@ -358,6 +389,8 @@
|
|||||||
this.GiftBagGood.name = choose[0].name
|
this.GiftBagGood.name = choose[0].name
|
||||||
this.GiftBagGood.unitName = choose[0].unitName
|
this.GiftBagGood.unitName = choose[0].unitName
|
||||||
this.GiftBagGood.price = choose[0].price
|
this.GiftBagGood.price = choose[0].price
|
||||||
|
this.GiftBagGood.specificationUnit = choose[0].specificationUnit
|
||||||
|
this.GiftBagGood.weight = choose[0].weight
|
||||||
|
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -32,15 +32,38 @@
|
|||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="4" class="trightb">
|
<el-col :span="4" class="trightb">
|
||||||
<el-form-item class="trightb_item">
|
<el-form-item class="trightb_item">
|
||||||
<span slot="label">边界金额</span>
|
<!-- <span slot="label">边界金额</span> -->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="8">
|
<el-col :span="8">
|
||||||
<el-form-item class="trightb_item">
|
<el-form-item class="trightb_item">
|
||||||
<span slot="label">{{formobj.boundaryPrice}}</span>
|
<!-- <span slot="label">{{formobj.boundaryPrice}}</span> -->
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
<el-row>
|
||||||
|
<el-col :span="4" class="trightb">
|
||||||
|
<el-form-item class="trightb_item">
|
||||||
|
<span slot="label">礼包总价格</span>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item class="trightb_item">
|
||||||
|
<span slot="label">{{formobj.price}}</span>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="4" class="trightb">
|
||||||
|
<el-form-item class="trightb_item">
|
||||||
|
<span slot="label">优惠后价格</span>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="8">
|
||||||
|
<el-form-item class="trightb_item">
|
||||||
|
<span slot="label">{{formobj.preferentialPrice}}</span>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="4" class="trightb">
|
<el-col :span="4" class="trightb">
|
||||||
<el-form-item class="trightb_item">
|
<el-form-item class="trightb_item">
|
||||||
@@ -63,28 +86,6 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-row>
|
|
||||||
<el-col :span="4" class="trightb">
|
|
||||||
<el-form-item class="trightb_item">
|
|
||||||
<span slot="label">发放条件</span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item class="trightb_item">
|
|
||||||
<span slot="label">{{formobj.boundary}}</span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="4" class="trightb">
|
|
||||||
<el-form-item class="trightb_item">
|
|
||||||
<span slot="label"></span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="8">
|
|
||||||
<el-form-item class="trightb_item">
|
|
||||||
<span></span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="4" class="trightb">
|
<el-col :span="4" class="trightb">
|
||||||
@@ -126,9 +127,11 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column> -->
|
</el-table-column> -->
|
||||||
<el-table-column label="商品名称" prop="name" align="center" />
|
<el-table-column label="商品名称" prop="name" align="center" />
|
||||||
<el-table-column label="商品数量" prop="goodsNumber" align="center" />
|
<el-table-column label="份数" prop="goodsNumber" align="center" />
|
||||||
<el-table-column label="商品价格" prop="price" align="center" />
|
<el-table-column label="价格(元/斤)" prop="price" align="center" />
|
||||||
<el-table-column label="商品单位" prop="unitName" align="center" />
|
<el-table-column label="商品单位" prop="specificationUnit" align="center" />
|
||||||
|
<el-table-column label="规格(斤份)" prop="weight" align="center" />
|
||||||
|
<el-table-column label="小计" prop="subtotal" align="center" />
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
@@ -186,7 +189,7 @@
|
|||||||
},
|
},
|
||||||
showAdd(row) {
|
showAdd(row) {
|
||||||
console.log("showAdd》》》》", row)
|
console.log("showAdd》》》》", row)
|
||||||
req.giftBagInit(row.sid)
|
req.AppletGiftBagInit(row.sid)
|
||||||
.then(resp => {
|
.then(resp => {
|
||||||
if (resp.success) {
|
if (resp.success) {
|
||||||
this.formobj = resp.data
|
this.formobj = resp.data
|
||||||
|
|||||||
Reference in New Issue
Block a user