|
|
@@ -1,13 +1,12 @@
|
|
|
<template>
|
|
|
<view class="affirm-page">
|
|
|
<view class="affirm-view overscroll">
|
|
|
- <!-- 门店信息 -->
|
|
|
<form>
|
|
|
<view class="module-com">
|
|
|
<view class="commodity-view">
|
|
|
<view class="commodity-list">
|
|
|
<view class="commodity-item" v-for="(item, index) in selectList" :key="index">
|
|
|
- <image class="item-icon" :src="item.itemCover || item.cover" alt="商品图" />
|
|
|
+ <image class="item-icon" :src="item.itemCover || item.cover" alt="" />
|
|
|
<view class="item-info">
|
|
|
<view class="info-line">
|
|
|
<text class="item-name">{{ item.itemName }}</text>
|
|
|
@@ -45,19 +44,20 @@
|
|
|
<AppDatePicker v-if="canIEdit" :dateVal.sync="form.entryTime" :placeholder="'默认实时'"/>
|
|
|
<view v-else>{{ form.entryTime || "默认实时" }}</view>
|
|
|
</tui-list-cell>
|
|
|
- <tui-list-cell class="line-cell" :hover="false">
|
|
|
+
|
|
|
+ <tui-list-cell v-if="myShopInfo.cgModel == 0" class="line-cell" :hover="false">
|
|
|
<view class="tui-title ">打包费</view>
|
|
|
<input type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.packingCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
|
|
|
</tui-list-cell>
|
|
|
|
|
|
- <tui-list-cell class="line-cell" :hover="false" :arrow="false">
|
|
|
+ <tui-list-cell v-if="myShopInfo.cgModel == 0" class="line-cell" :hover="false" :arrow="false">
|
|
|
<view class="tui-title">运费支付</view>
|
|
|
<button @click="changeYfPayWay(1)" class="admin-button-com mini-btn" :class="form.yfPayWay == 1 ? 'blue' : 'default'">寄付</button>
|
|
|
<button @click="changeYfPayWay(2)" class="admin-button-com mini-btn" :class="form.yfPayWay == 2 ? 'blue' : 'default'" style="margin-left:20rpx;">到付</button>
|
|
|
</tui-list-cell>
|
|
|
</view>
|
|
|
|
|
|
- <view class="module-com input-line-wrap">
|
|
|
+ <view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
|
|
|
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
<view class="tui-title ">短途运费</view>
|
|
|
@@ -70,7 +70,7 @@
|
|
|
|
|
|
</view>
|
|
|
|
|
|
- <view class="module-com input-line-wrap">
|
|
|
+ <view v-if="myShopInfo.cgModel == 0" class="module-com input-line-wrap">
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
<view class="tui-title ">提货费</view>
|
|
|
<input type="digit" @input="inputFn" :disabled="!canIEdit" v-model="form.pickCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写"/>
|
|
|
@@ -104,7 +104,8 @@
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
<view class="tui-title ">每公斤运费</view>
|
|
|
- <view>{{perKgFreight}}</view>
|
|
|
+ <view v-if="myShopInfo.cgModel == 0">{{perKgFreight}}</view>
|
|
|
+ <input v-else style="border: 1px solid #eee;color: #3385FF;width: calc(100%);height:70rpx;" type="digit" :disabled="!canIEdit" @focus="form.avgKgWeight=''" v-model="form.avgKgWeight" placeholder-class="phcolor" class="tui-input" name="avgKgWeight" placeholder="请输入每公斤的运费成本"/>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
<view class="tui-title">备注</view>
|
|
|
@@ -139,9 +140,7 @@ import productMins from "@/mixins/product";
|
|
|
import {getPurchaseDetailApi,createPurchaseOrderApi} from "@/api/purchase/index";
|
|
|
import { PURCHASE_ORDER_STATUS } from "@/utils/declare";
|
|
|
import AppDatePicker from "@/components/app-date-picker";
|
|
|
-
|
|
|
export default {
|
|
|
- // 采购详情
|
|
|
components: {
|
|
|
TuiListCell,
|
|
|
AppAvatarModule,
|
|
|
@@ -165,6 +164,7 @@ export default {
|
|
|
ghsId: null,
|
|
|
yfPayWay:1,
|
|
|
remark:"",
|
|
|
+ avgKgWeight:''
|
|
|
},
|
|
|
showCustomer: false,
|
|
|
detailsInfo: {},
|
|
|
@@ -176,6 +176,9 @@ export default {
|
|
|
},
|
|
|
onLoad(option) {
|
|
|
this.form.ghsId = option.ghsId
|
|
|
+ if(this.myShopInfo.cgModel == 1){
|
|
|
+ this.form.avgKgWeight = this.myShopInfo.cgPerCost
|
|
|
+ }
|
|
|
this.initData();
|
|
|
},
|
|
|
onShow(){
|
|
|
@@ -189,6 +192,7 @@ export default {
|
|
|
},
|
|
|
computed: {
|
|
|
...mapGetters(["getMerchantInfo", "getLoginInfo"]),
|
|
|
+ ...mapGetters({ myShopInfo: "getMyShopInfo" }),
|
|
|
selectAllPrice(){
|
|
|
let price = 0;
|
|
|
if (this.selectList) {
|
|
|
@@ -328,12 +332,12 @@ export default {
|
|
|
if (!this.getMerchantInfo) {
|
|
|
await this.initMerchantInfo();
|
|
|
}
|
|
|
- await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice});
|
|
|
+ const res = await createPurchaseOrderApi({...formData,modifyPrice:this.modifyPrice,cgModel:this.myShopInfo.cgModel});
|
|
|
uni.setStorageSync('flowersItemInfo', itemInfo);
|
|
|
|
|
|
this.removeMemory()
|
|
|
|
|
|
- uni.navigateTo({url:'/pagesPurchase/components/pageSuccess?title=新增成功'})
|
|
|
+ uni.navigateTo({url:'/pagesPurchase/components/pageSuccess?orderSn='+res.data.orderSn})
|
|
|
} catch (error) {}
|
|
|
},
|
|
|
formSubmitFun(){
|
|
|
@@ -344,8 +348,6 @@ export default {
|
|
|
success: function (res) {
|
|
|
if (res.confirm) {
|
|
|
self.confirmFn();
|
|
|
- } else if (res.cancel) {
|
|
|
- console.log('用户点击取消');
|
|
|
}
|
|
|
}
|
|
|
});
|
shish