Skip to content

C
confucius
Commit 35c311cf authored by 罗超's avatar 罗超
Browse files
Options

修改base_API

parent e76cd9ca
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 33 deletions
quasar.conf.js
View file @ 35c311cf
...@@ -51,12 +51,12 @@ module.exports = function (ctx) { ...@@ -51,12 +51,12 @@ module.exports = function (ctx) {
env: ctx.dev ? { env: ctx.dev ? {
//API: 'http://192.168.1.36:8300/api' //API: 'http://192.168.1.36:8300/api'
// API: 'https://localhost:5001/api' // API: 'https://localhost:5001/api'
API: 'http://192.168.1.13:8085/api', API: 'http://192.168.20.6:8085/api',
// API: 'http://eduapi.oytour.com/api' // API: 'http://eduapi.oytour.com/api'
API_ZC:'http://192.168.1.13:8087/api' API_ZC:'http://192.168.20.6:8087/api'
} : { } : {
API: 'http://eduapi.oytour.com/api', API: 'http://eduapi.oytour.com/api',
API_ZC:'http://propertyedu.oytour.com' API_ZC:'http://propertyedu.oytour.com/api'
}, },
// transpile: false, // transpile: false,
......
src/components/sale/orderlist.vue
View file @ 35c311cf
...@@ -287,8 +287,31 @@ ...@@ -287,8 +287,31 @@
<div class="col"> <div class="col">
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<!-- <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" /> -->
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div>
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div>
</q-banner>
</q-popup-proxy>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
...@@ -301,7 +324,28 @@ ...@@ -301,7 +324,28 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div>
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div>
</q-banner>
</q-popup-proxy>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
...@@ -487,7 +531,28 @@ ...@@ -487,7 +531,28 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>收款单据：</span> <span>收款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent"/>
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div>
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div>
</q-banner>
</q-popup-proxy>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.FinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.FinanceList" :index="j"
...@@ -500,7 +565,28 @@ ...@@ -500,7 +565,28 @@
<div class="row" style="justify-content: space-between"> <div class="row" style="justify-content: space-between">
<span>付款单据：</span> <span>付款单据：</span>
<q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn" <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" /> style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=!showChooseStudent" />
<q-popup-proxy v-if="showChooseStudent">
<q-banner>
<div>
<table class="Contract_Table" style="width: 500px;max-height:220px;overflow:auto;">
<tr>
<th>选择</th>
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td><q-radio dense v-model="chooseStudent" :val="subItem.Id"/>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
</tr>
</table>
<q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单" style="min-width:70px;float:right;margin-top:10px" />
</div>
</q-banner>
</q-popup-proxy>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j" <div class="finance row" v-for="(x,j) in item.RefundFinanceList" :index="j"
...@@ -656,14 +742,18 @@ ...@@ -656,14 +742,18 @@
isShowEduForm:false, isShowEduForm:false,
eduObj:{}, eduObj:{},
isShowPop:false isShowPop:false,
showChooseStudent:false,//收款单据，是否显示单选学生
chooseStudent:"",//收款单据，单选学生
} }
}, },
created() { created() {
this.initAuth(); this.initAuth();
this.Employee(); this.Employee();
},
mounted() {
}, },
mounted() {},
methods: { methods: {
//初始化权限信息 //初始化权限信息
initAuth() { initAuth() {
...@@ -895,6 +985,16 @@ ...@@ -895,6 +985,16 @@
}, },
//财务单据 //财务单据
chanceType(obj, type) { chanceType(obj, type) {
if(this.chooseStudent==""){
this.$q.notify({
icon: 'close',
color: 'accent',
timeout: 2000,
message: '请选择学生',
position: 'top'
})
return
}
let TCIDARR = [] let TCIDARR = []
//留学就业订单 //留学就业订单
if (obj && obj.OrderType == 2) { if (obj && obj.OrderType == 2) {
...@@ -936,6 +1036,7 @@ ...@@ -936,6 +1036,7 @@
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
'tradeWay': obj.tradeWay, 'tradeWay': obj.tradeWay,
"GuestId":this.chooseStudent
} }
}); });
}, },
......
src/pages/financial/CashAccount.vue
View file @ 35c311cf
...@@ -282,10 +282,9 @@ ...@@ -282,10 +282,9 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" style="marginRight:10px"/>
@click="resetPageIndex(),getList()" style="line-height: 30px;" /> <!-- 新增 -->
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" <q-btn color="primary" size="11px" :label="$t('pub.addBtn')" @click="addShow=true,text=$t('pub.addBtn'),ed=false"/>
@click="addShow=true,text=$t('pub.addBtn'),ed=false" style="line-height: 30px;" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -372,9 +371,8 @@ ...@@ -372,9 +371,8 @@
<p class="_tit">{{text}}{{$t('fnc.acc')}}</p> <p class="_tit">{{text}}{{$t('fnc.acc')}}</p>
</el-col> </el-col>
<el-col :span="4" class="_add_saveBtn"> <el-col :span="4" class="_add_saveBtn">
<button type="button" class="normalBtn" @click="submitForm('addMsg',1)">{{$t('pub.saveBtn')}}</button> <q-btn color="primary" size="11px" :label="$t('pub.saveBtn')" @click="submitForm('addMsg',1)" style="marginRight:10px"/>
<button class="hollowFixedBtn" type="button" <q-btn text-color="primary" size="11px" :label="$t('pub.cancelBtn')" @click="cancelEdit(),resetForm('addMsg'),addShow=false"/>
@click="cancelEdit(),resetForm('addMsg'),addShow=false">{{$t('pub.cancelBtn')}}</button>
</el-col> </el-col>
</el-row> </el-row>
<el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px"> <el-form class="_info_box clearfix" :model="addMsg" ref="addMsg" :rules="rules" label-width="110px">
......
src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue
View file @ 35c311cf
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments', path: '/financial/financalDocument/addReceivablesDocuments',
query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd, query:{"Handmsg":this.Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'} 'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单', GuestId:this.$route.query.GuestId}
}); });
} }
// 财务收据 // 财务收据
...@@ -135,14 +135,14 @@ ...@@ -135,14 +135,14 @@
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments', path: '/financial/financalDocument/addReceivablesDocuments',
query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd, query:{"Handmsg":Handmsg,"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'} 'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单',GuestId:this.$route.query.GuestId}
}); });
} }
else{ else{
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/addReceivablesDocuments', path: '/financial/financalDocument/addReceivablesDocuments',
query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd, query:{"tradeWay":this.tradeWay,"platformAccount":this.platformAccount,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单'} 'companyID':this.$route.query.companyID,blank:'y',tab:'新增收款单',GuestId:this.$route.query.GuestId}
}); });
} }
}else if(this.active==2){ }else if(this.active==2){
...@@ -152,24 +152,24 @@ ...@@ -152,24 +152,24 @@
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/' + path, path: '/financial/financalDocument/' + path,
query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd, query:{"czmsg":this.czmsg,"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'} 'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单',GuestId:this.$route.query.GuestId}
}); });
}else{ }else{
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/' + path, path: '/financial/financalDocument/' + path,
query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd, query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,
'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'} 'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单',GuestId:this.$route.query.GuestId}
}); });
} }
}else if(this.active==4){ }else if(this.active==4){
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/' + path, path: '/financial/financalDocument/' + path,
query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单'} query:{"id":id,"Name":Name,"Type":2,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增付款单',GuestId:this.$route.query.GuestId}
}); });
}else { }else {
this.$router.push({ this.$router.push({
path: '/financial/financalDocument/addFinancialGZDocuments', path: '/financial/financalDocument/addFinancialGZDocuments',
query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单'} query:{"id":id,"Name":Name,"Type":Type,"orderObj":this.orderObj,'path':this.$route.query.path,'IsUploadPic':IsUploadPic,'Cmd':this.$route.query.Cmd,'companyID':this.$route.query.companyID,blank:'y',tab:'新增挂账单',GuestId:this.$route.query.GuestId}
}); });
} }
}, },
......
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @ 35c311cf
...@@ -1312,7 +1312,7 @@ ...@@ -1312,7 +1312,7 @@
this.msg.OrderTradeWay = this.tradeWay; this.msg.OrderTradeWay = this.tradeWay;
this.msg.PlatformAccountId = this.platformAccount; this.msg.PlatformAccountId = this.platformAccount;
this.loading = true; this.loading = true;
this.msg.GuestId=this.$route.query.GuestId
this.apipost('Financial_post_Set', this.msg, res => { this.apipost('Financial_post_Set', this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), { this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
......
src/pages/financial/paySetting.vue
View file @ 35c311cf
...@@ -170,7 +170,8 @@ ...@@ -170,7 +170,8 @@
.page_paySetting .query-box .iconfont { .page_paySetting .query-box .iconfont {
cursor: pointer; cursor: pointer;
background-color: #E95252; /* background-color: #E95252; */
background-color: var(--q-color-primary);
color: white; color: white;
width: 30px; width: 30px;
height: 30px; height: 30px;
...@@ -193,9 +194,11 @@ ...@@ -193,9 +194,11 @@
</span> </span>
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button> <!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button> -->
<button class="normalBtn" <q-btn color="primary" size="11px" :label="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" style="marginRight:10px"/>
@click="addShow=true,text=$t('pub.addBtn'),IsAdd=true,cancelEdit(),disabledOption()">{{$t('pub.addBtn')}}</button> <!-- <button class="normalBtn"
@click="addShow=true,text=$t('pub.addBtn'),IsAdd=true,cancelEdit(),disabledOption()">{{$t('pub.addBtn')}}</button> -->
<q-btn color="primary" size="11px" :label="$t('pub.addBtn')" @click="addShow=true,text=$t('pub.addBtn'),IsAdd=true,cancelEdit(),disabledOption()"/>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end"> <el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i> <i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
<i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i> <i v-if="transitionShow2" class="iconfont icon-icon-ssan" @click="switchMethod(2)"></i>
......
src/utils/erpindex.js
View file @ 35c311cf
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = 'http://192.168.1.13:8083'; let domainUrl = 'http://192.168.20.6:8083';
let viewFileUrl = 'http://192.168.1.36:8120'; let viewFileUrl = 'http://192.168.1.36:8120';
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (locationName.indexOf('testerp.oytour') !== -1) { if (locationName.indexOf('testerp.oytour') !== -1) {
......
src/utils/url.js
View file @ 35c311cf
export let url_jump_zc="http://zcedu.oytour.com/" export let url_jump_zc="http://zcedu.oytour.com/"
// export let UploadUrl="http://192.168.1.214:8120"//上传文件到本地服务器 export let UploadUrl="http://192.168.20.214:8120"//上传文件到本地服务器
export let UploadUrl="http://uploadfile.oytour.com" // export let UploadUrl="http://uploadfile.oytour.com"
// export let ViittoFileUrl="http://192.168.1.214:8120"//文件站点 export let ViittoFileUrl="http://192.168.20.214:8120"//文件站点
export let ViittoFileUrl="http://staticfile.oytour.com" // export let ViittoFileUrl="http://staticfile.oytour.com"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment