root
/
O1-mobile
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化3

Browse Source
ncszh
jwg 3 days ago
parent d9ed066b5d
commit 02110e2f13
7 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File

13
.env.production
Unescape Escape View File

@ -2,7 +2,13 @@
# 页面 title 前缀 # 页面 title 前缀
VUE_APP_TITLE='链友融财务数字一体化信息系统' VUE_APP_TITLE='链友融财务数字一体化信息系统'
VUE_APP_ENVIRONMENT_TITLE='正式服'
#部署ip地址
VUE_APP_BASE_API = 'http://139.224.253.31:8081'
# 页面根路径 # 页面根路径
BASE_URL='/' BASE_URL='/'
@ -15,8 +21,11 @@ VUE_APP_API= '/'
# 方楠 # 方楠
# VUE_APP_BASE_API = 'http://one-h5.lyrfp.com' # VUE_APP_BASE_API = 'http://one-h5.lyrfp.com'
# 开发环境 不要删 # 开发环境 不要删
VUE_APP_BASE_API = 'http://192.168.3.128:58088' # VUE_APP_BASE_API = 'http://192.168.3.128:58088'
# VUE_APP_BASE_API = 'http://139.224.253.31:8081'
# VUE_APP_BASE_API = 'http://60.204.223.58:8080' # VUE_APP_BASE_API = 'http://60.204.223.58:8080'
#线上预览 #线上预览
VUE_APP_ONLINE_API = 'http://139.224.253.31:48012' VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
VUE_APP_ENVIRONMENT_TITLE='正式服'

4
src/views/contract/myGetPlan/components/UserList.vue
Unescape Escape View File

@ -16,13 +16,13 @@
clearable clearable
input-align="left" input-align="left"
/> />
<van-field <!-- <van-field
v-model="queryForm.contractName" v-model="queryForm.contractName"
placeholder="请输入" placeholder="请输入"
label="合同名称" label="合同名称"
clearable clearable
input-align="left" input-align="left"
/> /> -->
<RePick <RePick
v-model="queryForm.customerCompanyId" v-model="queryForm.customerCompanyId"
titleKey="companyName" titleKey="companyName"

34
src/views/contract/mySupplier/components/UserList.vue
Unescape Escape View File

@ -33,7 +33,7 @@
<span>回到顶部</span> <span>回到顶部</span>
</div> </div>
</div> </div>
<div <!-- <div
class="common-bottom-btns" class="common-bottom-btns"
v-hasPermi="['bs:supplier-contract:create']" v-hasPermi="['bs:supplier-contract:create']"
style="bottom: 10rem" style="bottom: 10rem"
@ -42,7 +42,7 @@
<img src="@/assets/images/icons/add.png" alt="" /> <img src="@/assets/images/icons/add.png" alt="" />
<span>添加申请</span> <span>添加申请</span>
</div> </div>
</div> </div> -->
<div class="common-bottom-btns" style="bottom: 6rem"> <div class="common-bottom-btns" style="bottom: 6rem">
<div class="common-bottom-btn" @click="handleBack"> <div class="common-bottom-btn" @click="handleBack">
<img src="@/assets/images/icons/home.png" alt="" /> <img src="@/assets/images/icons/home.png" alt="" />
@ -60,12 +60,12 @@ import { mapState } from 'vuex'
import dayjs from 'dayjs' import dayjs from 'dayjs'
export default { export default {
props: { props: {
listType: String, // EnrollmentOrder: 报名订单 EnrollmentCollection: 报名收款 ShiftRecord: 换班记录 WaitPay: 待支付 listType: String // EnrollmentOrder: 报名订单 EnrollmentCollection: 报名收款 ShiftRecord: 换班记录 WaitPay: 待支付
}, },
components: { components: {
HeaderFilter: () => import('./HeaderFilter.vue'), HeaderFilter: () => import('./HeaderFilter.vue'),
RMList: () => import('@/components/ReComponents/RMList'), RMList: () => import('@/components/ReComponents/RMList'),
MySupplierListCard: () => import('@/components/MySupplierListCard'), MySupplierListCard: () => import('@/components/MySupplierListCard')
}, },
data() { data() {
return { return {
@ -98,15 +98,15 @@ export default {
files: null, files: null,
other: null, other: null,
createTime: [], createTime: [],
processInstanceId: null, processInstanceId: null
}, }
} }
}, },
computed: { computed: {
...mapState({ ...mapState({
singlePageSize: (state) => state.common.setting.singlePageSize, singlePageSize: (state) => state.common.setting.singlePageSize,
pageSize: (state) => state.common.setting.pageSize, pageSize: (state) => state.common.setting.pageSize
}), })
}, },
activated() { activated() {
this.handleScrollInit() this.handleScrollInit()
@ -124,7 +124,7 @@ export default {
handleInitSpList() { handleInitSpList() {
let queryParams = { let queryParams = {
pageNo: 1, pageNo: 1,
pageSize: this.singlePageSize, pageSize: this.singlePageSize
} }
getSupplierCompanyPage(queryParams).then((res) => { getSupplierCompanyPage(queryParams).then((res) => {
this.spList = res.data.list || [] this.spList = res.data.list || []
@ -134,7 +134,7 @@ export default {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let listQuery = { let listQuery = {
pageNo: 1, pageNo: 1,
pageSize: this.singlePageSize, pageSize: this.singlePageSize
} }
getSupplierContractPage(listQuery) getSupplierContractPage(listQuery)
.then((res) => { .then((res) => {
@ -166,8 +166,8 @@ export default {
...paramProp, ...paramProp,
invoiceDate: paramProp.startDate && [ invoiceDate: paramProp.startDate && [
dayjs(paramProp.startDate).format('YYYY-MM-DD HH:ss:mm'), dayjs(paramProp.startDate).format('YYYY-MM-DD HH:ss:mm'),
dayjs(paramProp.endDate).format('YYYY-MM-DD HH:ss:mm'), dayjs(paramProp.endDate).format('YYYY-MM-DD HH:ss:mm')
], ]
} }
this.finished = false this.finished = false
this.handleRefresh() this.handleRefresh()
@ -191,8 +191,8 @@ export default {
this.$router.push({ this.$router.push({
path: '/supplier', path: '/supplier',
query: { query: {
type: 'add', type: 'add'
}, }
}) })
}, },
handleAllRefresh() { handleAllRefresh() {
@ -223,7 +223,7 @@ export default {
getTableList(val) { getTableList(val) {
// const { shellIdsLocal, collegeInfoIdLocal, startDate, endDate, keyword, type, method, targets, usePersonId, teacherIds, chargePersonIds } = this.listQuery // const { shellIdsLocal, collegeInfoIdLocal, startDate, endDate, keyword, type, method, targets, usePersonId, teacherIds, chargePersonIds } = this.listQuery
const query = { const query = {
...this.listQuery, ...this.listQuery
} }
this.moreLoading = true this.moreLoading = true
this.$loading(true, 'tableLoading') this.$loading(true, 'tableLoading')
@ -248,8 +248,8 @@ export default {
}) })
// this.$loading(false, `cTableLoading_${this.listType}`) // this.$loading(false, `cTableLoading_${this.listType}`)
}) })
}, }
}, }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">

2
src/views/contract/mySupplierMsg/components/UserList.vue
Unescape Escape View File

@ -23,7 +23,7 @@
title="供应商类别" title="供应商类别"
:name="`companyType`" :name="`companyType`"
label="供应商类别" label="供应商类别"
:list="getDictDatas(DICT_TYPE.BS_ENTERPRISEL_TYPE)" :list="getDictDatas(DICT_TYPE.ENTERPRISE_LIST)"
isCell isCell
clearable clearable
input-align="left" input-align="left"

2
src/views/contract/payPlan/index.vue
Unescape Escape View File

@ -329,6 +329,8 @@ export default {
this.form.paymentPlanDetailDOList[0].status == 2 this.form.paymentPlanDetailDOList[0].status == 2
? '通过' ? '通过'
: '待审核' : '待审核'
} else {
this.form.paymentPlanDetailDOList[0].status = '待审核'
} }
this.isAuthorised = res.data.isAuthorised this.isAuthorised = res.data.isAuthorised
this.$nextTick(() => { this.$nextTick(() => {

14
src/views/login/index.vue
Unescape Escape View File

@ -64,12 +64,12 @@
</div> </div>
</div> </div>
<!-- 企业微信登录 --> <!-- 企业微信登录 -->
<van-button <!-- <van-button
type="primary" type="primary"
@click="handleWxLogin" @click="handleWxLogin"
style="left: 50%; transform: translateX(-50%); width: 90%" style="left: 50%; transform: translateX(-50%); width: 90%"
>企业微信登录</van-button >企业微信登录</van-button
> > -->
<!-- 图形验证码 --> <!-- 图形验证码 -->
<!-- <Verify ref="verify" :captcha-type="'blockPuzzle'" :img-size="{width:'800px',height:'400px'}" @success="handleLogin" /> --> <!-- <Verify ref="verify" :captcha-type="'blockPuzzle'" :img-size="{width:'800px',height:'400px'}" @success="handleLogin" /> -->
</div> </div>
@ -192,11 +192,11 @@ export default {
handleWxLogin() { handleWxLogin() {
// 发起授权定向 // 发起授权定向
Wxlogin({ Wxlogin({
// appid: 'ww844f700e3bdef940', appid: 'ww844f700e3bdef940',
// response_type: 'code', response_type: 'code',
// scope: 'snsapi_privateinfo', scope: 'snsapi_privateinfo',
// agentid: '1000002', agentid: '1000002',
// type: 30, type: 30,
redirectUri: process.env.VUE_APP_BASE_API + '/#/login' redirectUri: process.env.VUE_APP_BASE_API + '/#/login'
}).then((res) => { }).then((res) => {
// 构造重定向的 URL // 构造重定向的 URL

5
vue.config.js
Unescape Escape View File

@ -23,9 +23,10 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
['/proxy-api']: { ['/proxy-api']: {
// target: `http://localhost:48080`, // target: `http://localhost:48080`,
target: `http://192.168.3.81:48080`, // target: `http://192.168.3.81:48080`,
// target: `http://one.lyrfp.com`, // target: `http://one.lyrfp.com`,
// target: `http://192.168.3.243:48080`, target: `http://192.168.3.243:48080`,
// target: `http://192.168.3.171:48080`,
// target: `http://api-dashboard.yudao.iocoder.cn`, // target: `http://api-dashboard.yudao.iocoder.cn`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {

Write Preview
Loading…
Cancel
Save