Skip to content

S
SuperMan
Commit c1796abc authored by zhengke's avatar zhengke
Browse files
Options

修改合同

parent 220bb8e8
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 49 deletions
src/components/Contract/ElectronicContract.vue
View file @ c1796abc
......@@ -1171,7 +1171,7 @@
</div>
<div class="EC_floatdiv">
<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==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
</div>
</div>
......
src/components/Contract/TravelContract.vue
View file @ c1796abc
......@@ -10,7 +10,6 @@
float:left;
width: 150px;
height: 100%;
/* margin-left: 30px; */
position: fixed;
margin-top:100px;
}
......@@ -822,7 +821,7 @@
</el-form>
<div style="margin-top:20px;">
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==0" class="normalBtn" style="margin:0 0 30px 60px;" @click="sendAudit()" value="提交审核"/>
<input type="button" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
<input type="button" v-if="CtObj.auditContract==0" class="normalBtn" @click="submitForm('CtObj')" 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>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ c1796abc
......@@ -5057,6 +5057,17 @@
},
//跳转至领取合同
goContract(item){
if(item.ContractNum){
let routeData = this.$router.resolve({
name: 'ElectronicContract',
query: {
TCID: item.TCID,
orderID:item.OrderId,
blank: 'y'
}
})
window.open(routeData.href, '_blank')
}else{
let routeData = this.$router.resolve({
name: 'TravelContract',
query: {
......@@ -5066,6 +5077,7 @@
}
})
window.open(routeData.href, '_blank')
}
},
Discount(TCID) {
this.SpecialOffer = true
......
src/components/administrative/ElectronicAudit.vue
View file @ c1796abc
<style>
.ElectronicAudit .icon-shenhebohui{
color:#fff;
}
</style>
<template>
......@@ -6,28 +9,49 @@
<div class="query-box">
<ul>
<li>
<label class="">合同编号</label>
<span>
<em>合同编号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.contractNum" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label class="">产品名称</label>
<span>
<em>产品名称</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.productName" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label class="">订单号</label>
<span>
<em>订单号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.orderID" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label class="">团号</label>
<span>
<em>团号</em>
<el-input :placeholder="$t('system.ph_in')" v-model="msg.tcid" @keyup.native.enter="getList" class="w210"></el-input>
</span>
</li>
<li>
<label>日期</label>
<span>
<em>状态</em>
<el-select v-model='msg.auditContract' filterable :placeholder="$t('pub.pleaseSel')">
<el-option label='不限' value=''></el-option>
<el-option label='驳回' :value='0'></el-option>
<el-option label='待审核' :value='1'></el-option>
<el-option label='审核通过' :value='2'></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>日期</em>
<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>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
......@@ -43,6 +67,7 @@
<th>产品名称</th>
<th>出发日期</th>
<th>返回日期</th>
<th>状态</th>
<th width="200">操作</th>
</tr>
<tr v-for="item in dataList">
......@@ -50,15 +75,28 @@
<td>{{item.orderId}}</td>
<td>{{item.tcid}}</td>
<td>{{item.productName}}</td>
<td>{{getDate(item.startDate)}}</td>
<td>{{getDate(item.returnDate)}}</td>
<td>
<template v-if="item.startDate!=null">
{{getDate(item.startDate)}}
</template>
</td>
<td>
<template v-if="item.returnDate!=null">
{{getDate(item.returnDate)}}
</template>
</td>
<td>
<span v-if="item.auditContract==0" style="color:red;">已驳回</span>
<span v-if="item.auditContract==1" style="color:blue;">待审核</span>
<span v-if="item.auditContract==2" style="color:green;">审核通过</span>
</td>
<td>
<el-row>
<el-tooltip class="item" effect="dark" content="审核通过" placement="top-start">
<el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(2)" circle></el-button>
<el-button type="primary" icon="iconfont icon-shenpi" @click="AuditElec(item,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-button type="danger" v-if="item.auditContract!=0" icon="iconfont icon-shenhebohui" @click="AuditElec(item,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(item)" circle></el-button>
......@@ -86,7 +124,8 @@ export default {
orderID:'',
tcid:'',
startDate:'',
returnDate:''
returnDate:'',
auditContract:''
},
dataList:[],
loading:false,
......@@ -130,7 +169,6 @@ export default {
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 {
......@@ -139,10 +177,9 @@ export default {
},null);
},
//审核通过或者驳回
AuditElec(type){
let msg = this.dataList[0];
msg.auditContract=type;
this.apiJavaPost("/api/contract/dosaveOrUpdate",msg,res => {
AuditElec(item,type){
item.auditContract=type;
this.apiJavaPost("/api/contract/dosaveOrUpdate",item,res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.getList();
......@@ -153,8 +190,7 @@ export default {
},
getDate(date) {
return moment(date).format("YYYY-MM-DD");
},
}
},
mounted() {
this.getList();
......
src/components/clientConfirm.vue
View file @ c1796abc
......@@ -34,17 +34,6 @@
.dic_content .content_table font{min-width:0;}
.dic_content .float_div {position:fixed;bottom:0;line-height:50px;background-color:#F2F2F2;width:1190px;padding-left:10px;height:50px;display:block;vertical-align:middle;text-align:match-parent;}
.dic_content .btn_mine {font-size: 15px;color: #fff;text-align: center;position: relative;display: inline-block;height: 24px;background-color: #b00;border-radius: 5px;-webkit-border-radius: 5px;-moz-border-radius: 5px;border: none;
cursor: pointer;
min-width: 80px;
background-image: -webkit-gradient(
linear,
0% 0%,
0% 100%,
color-stop(0, #d95454),
color-stop(1,#b00)
);
}
.dic_content .leftSign{float:left;width:50%;margin:70px 0;height:auto;line-height:45px;}
.dic_content .rightSign{float:right;width:49%;height:auto;margin:70px 0;line-height:45px;}
.dic_content .leftSign span{display:inline-block;width:170px;text-align:right;}
......@@ -748,12 +737,12 @@
<p style="margin:20px 0;">出境社经办人：<font>{{dataList.agentName}}</font></p>
</div>
<div style="text-align:center;margin:20px 0">
<input type="button" class="CliConfirmBtn" value="签字确认" @click="dialogVisible=true" />
<input type="button" class="CliConfirmBtn" v-if="dataList.companySignature==''" value="签字确认" @click="dialogVisible=true" />
</div>
</div>
</div>
<div class="CliSignDiv" :class="dialogVisible?'isShowSign':''" @touchmove.prevent>
<div id="canvas">
<div id="canvas" style="position:relative;top:0">
</div>
<div style="text-align:center;margin-top:20px;">
<input type="button" @click="handelClearEl()" class="CV_Btn" value="清除" />
......@@ -789,7 +778,6 @@
//获取数据
getList(){
this.apiJavaPost("/api/contract/getContractInfo",this.msg,res => {
console.log(res,'resss');
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
} else {
......@@ -886,7 +874,6 @@
//提交数据
SaveMsg(){
this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
console.log(res,'ressss');
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.dialogVisible = false;
......@@ -903,7 +890,7 @@
this.msg.orderID = this.$route.query.orderID;
var h = window.screen.height;
var cHeight=document.getElementsByClassName("CliSignDiv")[0];
cHeight.style.height=700+'px';
cHeight.style.height=900+'px';
this.getList();
this.getCanvas();
}
......
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