Skip to content

S
SuperMan
Commit b0aa4b90 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

合并index.js

parents 935ade21 0c5083db
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 101 deletions
src/components/Contract/ElectronicContract.vue
View file @ b0aa4b90
......@@ -321,8 +321,8 @@
/*弹出层*/
.qrCodeDiv {
width: 200px;
height: 235px;
width: 236px;
height: 275px;
background-color: #fff;
text-align: center;
border: 1px solid #d1d1d1;
......@@ -355,7 +355,7 @@
</style>
<template>
<div class="ECMain clearfix">
<div class="ECMain clearfix" v-loading="pdfLoading">
<div class="EC_left">
<ul>
<li :class="{'CMcked':cked==1}" @click="cked=1">使用说明</li>
......@@ -1170,9 +1170,9 @@
</p>
</div>
<div class="EC_floatdiv">
<input type="button" class="normalBtn" @click="getinvalid()" value="作废" />
<input type="button" class="normalBtn" @click="isShowFade=true" value="客户签字" />
<input type="button" class="normalBtn" value="下载" @click="toContractPDF('测试一下')" />
<input type="button" class="normalBtn" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="normalBtn" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
</div>
</div>
<div class="fade" v-show="isShowFade"></div>
......@@ -1181,13 +1181,12 @@
<div id="qrcode" style="margin:25px;" ref="qrcode">
<img class="WeiXinShare" :src="'data:image/png;base64,'+QRCodeStr" />
</div>
<i class="iconfont icon-cha Ec_cha"></i>
<i class="iconfont icon-cha Ec_cha" @click="isShowFade=false"></i>
</div>
</div>
</template>
<script>
import moment from 'moment'
// import QRCode from 'qrcodejs2' // 引入qrcode
export default {
data() {
return {
......@@ -1202,11 +1201,12 @@
dataList: [],
isShowFade: false,
QRCodeStr: "",
pdfLoading:false
};
},
methods: {
// 生成pdf
// 生成二维码
GetQrCode: function () {
let urlObj = this.domainManager();
let msg = {
......@@ -1240,6 +1240,7 @@
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
};
this.pdfLoading=true;
this.$http({
headers: {
'Content-Type': 'application/json'
......@@ -1258,36 +1259,19 @@
'.pdf&&fPath=' + res.data.data);
a.click();
} else {
this.$message.error('PDF获取失败');
this.Error('PDF获取失败');
}
this.pdfLoading = false
}).catch(err => {
})
},
// qrcode () {
// let qrcode = new QRCode('qrcode', {
// width: 150,
// height: 150,
// // text: "http://test.erp.viitto.com/#/clientConfirm?"+'TCID='+this.msg.TCID+'&'+'orderID='+this.msg.orderID, // 二维码地址
// // text: "http://www.test.com/#/clientConfirm?"+'TCID='+this.msg.TCID+'&'+'orderID='+this.msg.orderID, // 二维码地址
// // text: "192.168.0.119:8080/#/clientConfirm?"+'TCID='+this.msg.TCID+'&'+'orderID='+this.msg.orderID, // 二维码地址
// //text: "https://baidu.com", // 二维码地址
// text: "http://192.168.0.119:8080/#/clientConfirm?"+'TCID='+this.msg.TCID+'&'+'orderID='+this.msg.orderID, // 二维码地址
// colorDark : "#000",
// colorLight : "#fff",
// })
// },
// disQrCode(){
// this.isShowFade=false;
// this.$refs.qrcode.innerHTML='';
// },
//获取数据
getList() {
this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
console.log(this.dataList);
} else {
this.Error(res.data.message);
}
......@@ -1334,23 +1318,20 @@
//作废
getinvalid() {
this.$confirm('是否作废?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.CtObj.status = 0;
this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
}, null);
this.dataList.status=0;
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},null);
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
this.$message.info('取消删除');
});
}
},
......@@ -1358,7 +1339,6 @@
this.msg.TCID = this.$route.query.TCID;
this.msg.orderID = this.$route.query.orderID;
this.getList();
this.GetQrCode();
}
};
......
src/components/Contract/TravelContract.vue
View file @ b0aa4b90
......@@ -751,7 +751,7 @@
<th>手机号</th>
</tr>
<tr v-for="item in guestList">
<td>{{item.name}}</td>
<td>{{item.surName+''+item.name}}</td>
<td>{{item.nationalityName}}</td>
<td></td>
<td>{{item.sex==1?'男':'女'}}</td>
......@@ -821,9 +821,9 @@
</div>
</el-form>
<div>
<input type="button" class="normalBtn" style="margin:40px 0 30px 60px;" value="提交审核"/>
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:40px 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
<input type="button" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
<input type="button" class="normalBtn" @click="goUrl()" value="预览">
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="goUrl()" value="预览">
<input type="button" class="normalBtn" v-if="CtObj.status==1" @click="getinvalid()" value="作废">
</div>
</div>
......@@ -1047,7 +1047,6 @@
//获取数据
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) {
this.CtObj = res.data.data;
this.guestList = res.data.data.guestList;
......@@ -1055,7 +1054,6 @@
this.CtObj.businessCertificate = '0000000';
this.CtObj.tcid = this.$route.query.TCID;
this.CtObj.orderId = this.$route.query.orderID;
console.log(this.CtObj,'ctobjjjjjjj');
if(this.CtObj.clientCountryid>0){
this.GetSubAreaList(this.CtObj.clientCountryid,1,1);
}
......@@ -1191,6 +1189,7 @@
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
......@@ -1219,6 +1218,7 @@
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
......@@ -1240,7 +1240,18 @@
return false;
}
});
},
},
sendAudit(){
this.CtObj.auditContract=1;
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.CtObj,res => {
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},null);
}
},
mounted() {
this.GetCounrty();
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ b0aa4b90
......@@ -321,7 +321,7 @@
<el-input v-model="da.UnitPrice" type="text" @keyup.native="checkPrice(da,'UnitPrice',true)" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></el-input>
</td>
<td height="26px">
<el-select filterable v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-select filterable :disabled="detailCurrDis" v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
<el-option v-for='item in coinGetList'
:label='item.Name'
:value='item.ID'
......@@ -360,7 +360,7 @@
<el-input v-model="detailList.UnitPrice" type="text" @keyup.native="checkPrice(detailList,'UnitPrice',true)" @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></el-input>
</td>
<td>
<el-select filterable :disabled="detailCurrDis" v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
<el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
<el-option v-for='item in coinGetList'
:label='item.Name'
:value='item.ID'
......@@ -832,10 +832,10 @@ export default {
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
},
AddFinancial(z){ //保存
if(this.orderObj&&this.orderObj.CurrencyId){
this.msg.detailList=[];
this.msg.detailList.push(this.detailList);
}
// if(this.orderObj&&this.orderObj.CurrencyId){
// this.msg.detailList=[];
// this.msg.detailList.push(this.detailList);
// }
if(z){
this.msg.Status = 0;
......@@ -1037,7 +1037,6 @@ export default {
})
},
getRate(cID,i,t,index){ // 根据选择币种获取汇率
this.coinGetList.forEach(x=>{
if(x.ID==i){
if(t==1){
......@@ -1050,7 +1049,6 @@ export default {
this.$forceUpdate();
}
})
console.log("this.coinGetList",this.coinGetList)
console.log("this.detailList.Rate",this.detailList.Rate)
this.Calculation(t,index+1)
},
......@@ -1149,7 +1147,6 @@ export default {
this.apipost('Financial_post_GetCostTypeList',{ID:id}, res => {
if(res.data.resultCode == 1) {
this.GetCostTypeList = res.data.data;
console.log(this.GetCostTypeList,'type');
if(type){
this.msg.detailList.forEach(x=>{
this.GetCostTypeList.forEach(y=>{
......@@ -1169,6 +1166,7 @@ export default {
this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
if(res.data.resultCode == 1) {
this.coinGetList = res.data.data;
console.log("this.coinGetList 522555",this.coinGetList )
}
}, err => {})
},
......@@ -1182,9 +1180,9 @@ export default {
// })
// TCID.split(0,TCID.length-1)
this.apipost('Financial_post_Get',{ID:id,TempId:tempId,TCIDList:(this.orderObj&&this.orderObj.TCIDList)?this.orderObj.TCIDList:[]}, res => {
// console.log(this.orderObj.TCIDList)
if(res.data.resultCode == 1) {
console.log("res.data",res.data)
// console.log("res.data",res.data)
let data= res.data.data;
this.editTemplateId=data.TemplateId;
this.getCompany();
......@@ -1245,6 +1243,7 @@ export default {
this.msg.OrderID = this.orderObj.OrderID?this.orderObj.OrderID:0;
this.OrderSource = this.msg.OrderSource = this.orderObj.OrderSource?this.orderObj.OrderSource:0;
this.msg.TCID = this.orderObj.TCID?this.orderObj.TCID:0;
this.financeinfo_post_GetList(this.msg.TCID);
this.msg.TCIDList = this.orderObj.TCIDList?this.orderObj.TCIDList:[];
this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
......@@ -1260,6 +1259,7 @@ export default {
this.detailCurrDis=true;
this.detailList.CostTypeId=this.orderObj.CostType?this.orderObj.CostType: '';
this.getRate(this.detailList.CostTypeId,this.detailList.CurrencyId,1)
this.addList(1);
}
......@@ -1365,7 +1365,6 @@ export default {
this.companyList = data;
}
}
console.log('this.companyList', this.companyList)
}, err => {})
}
......
src/components/SalesModule/groupTourOrder.vue
View file @ b0aa4b90
......@@ -1819,7 +1819,7 @@
</span>
</div>
<span class="GO_Contract" @click="goContract(item)" style="display:none;">领取合同</span>
<span class="GO_Contract" @click="goContract(item)" >领取合同</span>
</td>
</tr>
<tr>
......
src/components/administrative/ElectronicAudit.vue
View file @ b0aa4b90
......@@ -22,16 +22,12 @@
<el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList" class="w210"></el-input>
</li>
<li>
<el-date-picker
@change="dateChange"
size="small"
value-format="yyyy-MM-dd"
v-model="DateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="返回日期">
</el-date-picker>
<label>日期</label>
<el-date-picker v-model='msg.startDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
-
<el-date-picker v-model='msg.returnDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
......@@ -49,33 +45,38 @@
<th>返回日期</th>
<th width="200">操作</th>
</tr>
<tr>
<td>123</td>
<td>456</td>
<td>123123213</td>
<td>123</td>
<td>2019-08-06</td>
<td>2019-08-13</td>
<tr v-for="item in dataList">
<td>{{item.contractNum}}</td>
<td>{{item.orderId}}</td>
<td>{{item.tcid}}</td>
<td>{{item.productName}}</td>
<td>{{getDate(item.startDate)}}</td>
<td>{{getDate(item.returnDate)}}</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="审核通过" placement="top-start">
<el-button type="primary" icon="iconfont icon-shenpi" circle></el-button>
<el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(2)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="驳回" placement="top-start">
<el-button type="danger" icon="iconfont icon-shenhebohui" @click="AuditElec(0)" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="查看" placement="top-start">
<el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail()" circle></el-button>
<el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</table>
<!-- <div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div> -->
<div class="noData" v-show="dataList.length<1">
<i class="iconfont icon-kong" style="font-size:100px;"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
......@@ -87,12 +88,24 @@ export default {
startDate:'',
returnDate:''
},
DateList:[],
// pickerOptions0: {
// disabledDate(time) {
// return time.getTime() < Date.now() - 8.64e7;
// }
// },
dataList:[],
loading:false,
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.returnDate == null) {
return false;
} else {
let endTime = new Date(this.msg.returnDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.startDate)
return startTime.getTime() >= time.getTime()
}
}
};
},
methods: {
......@@ -103,23 +116,46 @@ export default {
}
},
//跳转至详情
goToDetail(){
goToDetail(item){
this.$router.push({
name: 'ElectronicContract',
query: {
// TCID: this.$route.query.TCID,
// orderID: this.$route.query.orderID,
TCID:5560,
orderID:28807,
TCID: item.tcid,
orderID: item.orderId,
blank: "y",
}
});
},
getList() {
this.loading=true;
this.apiJavaPost("/api/contract/auditContract",this.msg,res => {
this.loading=false;
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
this.Error(res.data.message);
}
},null);
},
//审核通过或者驳回
AuditElec(type){
let msg = this.dataList[0];
msg.auditContract=type;
this.apiJavaPost("/api/contract/dosaveOrUpdate",msg,res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
},null);
},
getDate(date) {
return moment(date).format("YYYY-MM-DD");
},
},
mounted() {
this.getList();
}
......
src/components/clientConfirm.vue
View file @ b0aa4b90
......@@ -784,7 +784,7 @@
methods: {
//获取数据
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
this.apiJavaPost("/api/contract/getContractInfoForCode",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......
src/plug/index.js
View file @ b0aa4b90
......@@ -120,8 +120,8 @@ export default {
let locationName = window.location.hostname;
domainUrl = "http://192.168.2.214:8082";
domainUrl = "http://192.168.2.65:8025";
// domainUrl = "http://reborn.oytour.com";
// domainUrl = "http://192.168.2.16:8083";
domainUrl = "http://192.168.2.16:8083";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......@@ -402,6 +402,10 @@ export default {
})
} else if (res.resultCode == 10005) {
this.$router.go(-1)
} else if(res.data.data.isJumpTwoCode==1){
this.$router.push({
path: '/clientConfirm'
})
} else {
successCall(res)
}
......
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