Skip to content

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

修改

parent 2b57881e
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
src/assets/css/comSummary.css
View file @ 191e78e2
......@@ -135,13 +135,14 @@
white-space: nowrap;
overflow: hidden;
padding:0 3px;
margin-bottom:5px;
}
.comSummary .listInfo {
width: 50px;
text-align: left;
}
.comSummary .circleDiv {
height: 10px;
height: 5px;
position: relative;
}
.comSummary .listName {
......@@ -250,6 +251,8 @@
overflow: hidden;
line-height: 16px;
position:relative;
vertical-align: top;
padding:10px 0 5px 0;
/* border-left:1px solid #fff;
border-right:1px solid #fff; */
}
......
src/components/Contract/TravelContract.vue
View file @ 191e78e2
......@@ -821,7 +821,8 @@
</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" v-if="CtObj.auditContract==0" class="normalBtn" @click="submitForm('CtObj')" value="保存"/>
<input type="button" v-if="CtObj.status==1&&CtObj.auditContract==3" class="normalBtn" style="margin:0 0 30px 60px;" @click="sendAudit()" value="审核已被驳回,重新提交"/>
<input type="button" v-if="CtObj.auditContract==0||CtObj.auditContract==3" 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>
......@@ -1075,7 +1076,6 @@
if(this.CtObj.regulatorProvinceid>0){
this.GetJianAreaList(this.CtObj.regulatorProvinceid,2,1);
}
console.log(this.CtObj,'CTOBJ');
} else {
this.Error(res.data.message);
}
......@@ -1452,13 +1452,13 @@
y.childItem.subTraffic.forEach((z, i) => {
title += z.startCityName;
if (z.arrivalType == 1) {
title += '<i class="iconfont icon-feiji"></i>';
title += '-';
} else if (z.arrivalType == 2) {
title += '<i class="iconfont icon-bus"></i>';
title += '-';
} else if (z.arrivalType == 3) {
title += '<i class="iconfont icon-icon31"></i>';
title += '-';
} else {
title += '<i class="iconfont icon-gaotiedongche"></i>';
title += '-';
}
if (i + 1 == y.childItem.subTraffic.length) {
title += z.arrivalCityName;
......
src/components/LeaderManagement/leaderSummary.vue
View file @ 191e78e2
......@@ -100,9 +100,9 @@
<span v-else>无信息</span>
</div>
</td>
<td v-for="(k,lineindex) in Calendar" :key="k.subCode" height="80px;" @mouseover="columnsMouseOver(lineindex)">
<div v-for="(ss,index) in st.SubList" :key="ss.subCode">
<div v-if="ss.DayStr==k.CurrentDay">
<td v-for="(k,lineindex) in Calendar" :key="k.subCode" min-height="80px;" @mouseover="columnsMouseOver(lineindex)">
<div v-for="(ss,index) in st.SubList" :key="ss.subCode" v-if="ss.DayStr==k.CurrentDay">
<!-- <div v-if="ss.DayStr==k.CurrentDay"> -->
<div class="cir" slot="reference" :class="{'stateOne':ss.OrderState==0,'stateTwo':ss.OrderState==1,'stateThree':ss.OrderState==-1,'stateFour':ss.OrderState==2,'disNoneCir':ss.OrderState==-100}"></div>
<div class="circleDiv" v-if="ss.OrderState==-100">
<div class="lineLeftList"></div>
......@@ -112,13 +112,10 @@
<div class="lineleft" :class="{'disNone':index==0}"></div>
<div class="lineright" :class="{'disNone':index==st.SubList.length-1}"></div>
</div>
<el-tooltip class="item" effect="dark" v-if="ss.CityName" :content="ss.CityName" placement="bottom-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="ss.CityName" placement="bottom-start" popper-class="max-w250">
<div class="AddressIn">{{ss.CityName}}</div>
</el-tooltip>
</div>
<div v-else>
</div>
<!-- </div> -->
</div>
<div class="leftLine" v-if="lineindex==columnLine"></div>
<div class="rightLine" v-if="lineindex==columnLine"></div>
......
src/components/administrative/ElectronicAudit.vue
View file @ 191e78e2
......@@ -37,7 +37,7 @@
<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='3'></el-option>
<el-option label='待审核' :value='1'></el-option>
<el-option label='审核通过' :value='2'></el-option>
</el-select>
......@@ -86,7 +86,7 @@
</template>
</td>
<td>
<span v-if="item.auditContract==0" style="color:red;">已驳回</span>
<span v-if="item.auditContract==3" 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>
......@@ -96,7 +96,7 @@
<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" v-if="item.auditContract!=0" icon="iconfont icon-shenhebohui" @click="AuditElec(item,0)" circle></el-button>
<el-button type="danger" v-if="item.auditContract!=3" icon="iconfont icon-shenhebohui" @click="AuditElec(item,3)" 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>
......
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