weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev #5

Merged
mkm merged 26 commits from dev into master 2024-12-30 16:22:20 +08:00
Conversation 0 Commits 26 Files Changed 61 +22 -15
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c807a39032 - Show all commits

6
config/app.js
View File

@ -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:

13
pageQuota/purchase_product_offer/index.vue
View File

@ -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,6 +95,7 @@
}) })
} }
const show = ref(false) const show = ref(false)
const pickerText = ref('')
const pickerShow = ref(false) const pickerShow = ref(false)
const formData = ref({ const formData = ref({
"id": '', "id": '',
@ -152,6 +158,7 @@
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)
pickerText.value=e.value[0].name
formData.value.outbound_price = (parseInt(formData.value.price) + outbound_price).toFixed(2) formData.value.outbound_price = (parseInt(formData.value.price) + outbound_price).toFixed(2)
} }
const OutboundFloatingLv = () => { const OutboundFloatingLv = () => {