开发环境配置修改与采购产品报价页面优化
- 将环境变量从生产环境切换到本地环境 - 更新本地环境的BASE_URL地址 - 在采购产品报价页面添加确认已采购的时间显示 - 优化出库价输入框,增加选择器和动态显示文本 - 修复picker确认后pickerShow未重置的问题
This commit is contained in:
parent
659d89522c
commit
c807a39032
|
@ -3,9 +3,9 @@ let WSS_URL
|
||||||
import store from "@/store/user.js"
|
import store from "@/store/user.js"
|
||||||
// 环境
|
// 环境
|
||||||
// let env = "dev"
|
// let env = "dev"
|
||||||
let env = "prod"
|
// let env = "prod"
|
||||||
// let env = "release";
|
// let env = "release";
|
||||||
// let env = "local";
|
let env = "local";
|
||||||
|
|
||||||
switch (env) {
|
switch (env) {
|
||||||
case 'dev':
|
case 'dev':
|
||||||
|
@ -17,7 +17,7 @@ switch (env) {
|
||||||
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
||||||
break;
|
break;
|
||||||
case 'local':
|
case 'local':
|
||||||
BASE_URL = 'http://192.168.1.7:8545';
|
BASE_URL = 'http://192.168.1.22:8545';
|
||||||
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull'
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
<up-button size="small" type="primary" shape="circle" @click="cancleOrder(item)"
|
<up-button size="small" type="primary" shape="circle" @click="cancleOrder(item)"
|
||||||
v-if="item.buyer_confirm==0">确认已采购</up-button>
|
v-if="item.buyer_confirm==0">确认已采购</up-button>
|
||||||
<up-button size="small" type="success" shape="circle" v-else
|
<up-button size="small" type="success" shape="circle" v-else
|
||||||
disabled>{{item.buyer_confirm_name}}</up-button>
|
disabled>{{item.buyer_confirm_name}}/{{item.update_time}}</up-button>
|
||||||
</view>
|
</view>
|
||||||
<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
|
<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
|
||||||
</view>
|
</view>
|
||||||
|
@ -60,11 +60,16 @@
|
||||||
<up-input v-model="formData.total_price"></up-input>
|
<up-input v-model="formData.total_price"></up-input>
|
||||||
</up-form-item>
|
</up-form-item>
|
||||||
<up-form-item label="出库价">
|
<up-form-item label="出库价">
|
||||||
<up-input @click="pickerShow=true" v-model="formData.outbound_price"></up-input>
|
<up-input @click="pickerShow=true" v-model="formData.outbound_price">
|
||||||
|
<template #suffix>
|
||||||
|
<span>{{pickerText}}</span>
|
||||||
|
</template>
|
||||||
|
</up-input>
|
||||||
</up-form-item>
|
</up-form-item>
|
||||||
</up-form>
|
</up-form>
|
||||||
</up-modal>
|
</up-modal>
|
||||||
<up-picker :show="pickerShow" :columns="columns" keyName="name" @confirm="pickerConfirm" @cancel="pickerShow=false"></up-picker>
|
<up-picker :show="pickerShow" :columns="columns" keyName="name" @confirm="pickerConfirm"
|
||||||
|
@cancel="pickerShow=false"></up-picker>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -90,7 +95,8 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
const show = ref(false)
|
const show = ref(false)
|
||||||
const pickerShow=ref(false)
|
const pickerText = ref('')
|
||||||
|
const pickerShow = ref(false)
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
"id": '',
|
"id": '',
|
||||||
"store_name": '',
|
"store_name": '',
|
||||||
|
@ -98,7 +104,7 @@
|
||||||
'nums': '',
|
'nums': '',
|
||||||
'price': '',
|
'price': '',
|
||||||
'total_price': '',
|
'total_price': '',
|
||||||
'outbound_price':''
|
'outbound_price': ''
|
||||||
})
|
})
|
||||||
// tabsindex
|
// tabsindex
|
||||||
const tabIndex = ref(1)
|
const tabIndex = ref(1)
|
||||||
|
@ -149,14 +155,15 @@
|
||||||
getGoodsList()
|
getGoodsList()
|
||||||
}
|
}
|
||||||
const columns = ref([]);
|
const columns = ref([]);
|
||||||
const pickerConfirm=(e)=>{
|
const pickerConfirm = (e) => {
|
||||||
pickerShow.value=false
|
pickerShow.value = false
|
||||||
let outbound_price=(formData.value.price*e.value[0].value)
|
let outbound_price = (formData.value.price * e.value[0].value)
|
||||||
formData.value.outbound_price=(parseInt(formData.value.price)+outbound_price).toFixed(2)
|
pickerText.value=e.value[0].name
|
||||||
|
formData.value.outbound_price = (parseInt(formData.value.price) + outbound_price).toFixed(2)
|
||||||
}
|
}
|
||||||
const OutboundFloatingLv=()=>{
|
const OutboundFloatingLv = () => {
|
||||||
purchaseProductOfferOutboundFloatingLv().then(res=>{
|
purchaseProductOfferOutboundFloatingLv().then(res => {
|
||||||
columns.value=res.data
|
columns.value = res.data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
getGoodsList()
|
getGoodsList()
|
||||||
|
|
Loading…
Reference in New Issue