Commit be2612ce authored by 黄奎's avatar 黄奎

前端js调整

parent 0041f961
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
.zidingyiFz i { .zidingyiFz i {
font-size: 14px !important; font-size: 14px !important;
} }
.page_addFD { .page_addFD {
margin-top: 20px; margin-top: 20px;
position: relative; position: relative;
...@@ -268,7 +269,8 @@ ...@@ -268,7 +269,8 @@
._addUpload_box>div:hover { ._addUpload_box>div:hover {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
/deep/._addUpload_box .el-upload-dragger{
/deep/._addUpload_box .el-upload-dragger {
width: 126px !important; width: 126px !important;
height: 80px !important; height: 80px !important;
} }
...@@ -366,8 +368,9 @@ ...@@ -366,8 +368,9 @@
top: 10px; top: 10px;
cursor: pointer; cursor: pointer;
} }
</style>
<template> </style>
<template>
<div class="flexOne"> <div class="flexOne">
<div class="query-box"> <div class="query-box">
<ul class="user_time_picker"> <ul class="user_time_picker">
...@@ -378,9 +381,11 @@ ...@@ -378,9 +381,11 @@
</li> </li>
<li> <li>
<span><em>{{$t('objFill.v101.administrative.kaishi')}}/{{$t('MarketingActi.endTime')}}</em> <span><em>{{$t('objFill.v101.administrative.kaishi')}}/{{$t('MarketingActi.endTime')}}</em>
<el-date-picker v-model="msg.QStartDate" value-format="yyyy-MM-dd" class="w150" type="date" :clearable="false"></el-date-picker> <el-date-picker v-model="msg.QStartDate" value-format="yyyy-MM-dd" class="w150" type="date"
:clearable="false"></el-date-picker>
- -
<el-date-picker v-model="msg.QEndDate" value-format="yyyy-MM-dd" class="w150" type="date" :clearable="false"></el-date-picker> <el-date-picker v-model="msg.QEndDate" value-format="yyyy-MM-dd" class="w150" type="date"
:clearable="false"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -411,7 +416,8 @@ ...@@ -411,7 +416,8 @@
<td width="150px">{{ item.Name }}</td> <td width="150px">{{ item.Name }}</td>
<td style="min-width: 200px;max-width: 400px;cursor: pointer;"> <td style="min-width: 200px;max-width: 400px;cursor: pointer;">
<el-tooltip class="item" effect="dark" :content="item.Content" placement="bottom"> <el-tooltip class="item" effect="dark" :content="item.Content" placement="bottom">
<div style="overflow: hidden;white-space: wrap;width: 100%;text-overflow: ellipsis;">{{ item.Content }}</div> <div style="overflow: hidden;white-space: wrap;width: 100%;text-overflow: ellipsis;">{{ item.Content }}
</div>
</el-tooltip> </el-tooltip>
</td> </td>
<td width="200px"> <td width="200px">
...@@ -424,8 +430,7 @@ ...@@ -424,8 +430,7 @@
</div> </div>
<div v-if="file.FileType==2" style="width: 30px;height: 30px;" @click="showUpLoadFile(file)"> <div v-if="file.FileType==2" style="width: 30px;height: 30px;" @click="showUpLoadFile(file)">
<div class="iconfont " style="line-height: 19px;font-size: 18px;" <div class="iconfont " style="line-height: 19px;font-size: 18px;"
:class="file.Name.substring(file.Name.lastIndexOf('.')+1,file.Name.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" :class="file.Name.substring(file.Name.lastIndexOf('.')+1,file.Name.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'">
>
</div> </div>
</div> </div>
<div v-if="file.FileType==3" style="width: 30px;height: 30px;" @click="showUpLoadFile(file)"> <div v-if="file.FileType==3" style="width: 30px;height: 30px;" @click="showUpLoadFile(file)">
...@@ -460,8 +465,7 @@ ...@@ -460,8 +465,7 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<el-dialog custom-class="w800" :title="dialogTitle" :visible.sync="outerVisible" center <el-dialog custom-class="w800" :title="dialogTitle" :visible.sync="outerVisible" center :close="closeChangeMachie">
:close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<table class="layerTable layerNoIcon"> <table class="layerTable layerNoIcon">
<tr> <tr>
...@@ -473,7 +477,8 @@ ...@@ -473,7 +477,8 @@
</td> </td>
<td> <td>
<el-form-item :label="$t('pub.date')" prop="Date" style="margin-bottom: 10px;"> <el-form-item :label="$t('pub.date')" prop="Date" style="margin-bottom: 10px;">
<el-date-picker value-format="yyyy-MM-dd" class="w217" v-model="addMsg.Date" type="date" :clearable="false"> <el-date-picker value-format="yyyy-MM-dd" class="w217" v-model="addMsg.Date" type="date"
:clearable="false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</td> </td>
...@@ -547,8 +552,8 @@ ...@@ -547,8 +552,8 @@
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
...@@ -605,7 +610,7 @@ ...@@ -605,7 +610,7 @@
}; };
}, },
mounted() { mounted() {
this.userInfo=this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.msg.QStartDate = this.getYMD() this.msg.QStartDate = this.getYMD()
this.addMsg.Date = this.getYMD() this.addMsg.Date = this.getYMD()
this.getList(); this.getList();
...@@ -670,7 +675,7 @@ ...@@ -670,7 +675,7 @@
typeOk = true; typeOk = true;
} }
}) })
let FileName = file.file.name.substring(0,file.file.name.lastIndexOf(".")) let FileName = file.file.name.substring(0, file.file.name.lastIndexOf("."))
if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile')); if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
let newArr = []; let newArr = [];
newArr.push(file.file) newArr.push(file.file)
...@@ -693,7 +698,7 @@ ...@@ -693,7 +698,7 @@
let myToday = myDate.getDate(); //获取当前日(1-31) let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0' + myMonth myMonth = myMonth > 9 ? myMonth : '0' + myMonth
myToday = myToday > 9 ? myToday : '0' + myToday myToday = myToday > 9 ? myToday : '0' + myToday
let nowDate = myYear +'-'+ myMonth +'-' + myToday let nowDate = myYear + '-' + myMonth + '-' + myToday
return nowDate return nowDate
}, },
getList() { getList() {
...@@ -712,7 +717,7 @@ ...@@ -712,7 +717,7 @@
err => {} err => {}
); );
}, },
addClick(){ addClick() {
this.addMsg = { this.addMsg = {
Id: 0, Id: 0,
Date: this.getYMD(), Date: this.getYMD(),
...@@ -722,7 +727,7 @@ ...@@ -722,7 +727,7 @@
} }
}, },
addData() { addData() {
if(this.isleaveBtn) return if (this.isleaveBtn) return
this.isleaveBtn = true; this.isleaveBtn = true;
this.apipost( this.apipost(
"hotel_get_SetHotelMemo", "hotel_get_SetHotelMemo",
...@@ -738,11 +743,13 @@ ...@@ -738,11 +743,13 @@
} }
this.isleaveBtn = false this.isleaveBtn = false
}, },
err => {this.isleaveBtn = false} err => {
this.isleaveBtn = false
}
); );
this.getList(); this.getList();
}, },
deleteData(item){ deleteData(item) {
let that = this; let that = this;
that.$confirm(this.$t('objFill.v101.hote.shifousc'), this.$t('tips.tips'), { that.$confirm(this.$t('objFill.v101.hote.shifousc'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
...@@ -819,4 +826,4 @@ ...@@ -819,4 +826,4 @@
} }
}; };
</script> </script>
...@@ -2280,7 +2280,7 @@ ...@@ -2280,7 +2280,7 @@
}} }}
</td> </td>
<td> <td>
{{ priceFormat2(item.VisaPrice) }}(-{{ {{ priceFormat(item.VisaPrice) }}(-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice) item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}}) }})
</td> </td>
...@@ -2942,25 +2942,7 @@ export default { ...@@ -2942,25 +2942,7 @@ export default {
} }
return x1 + x2; return x1 + x2;
}, },
priceFormat2(value) {
if (value == null) {
return this.$t('objFill.yibaohan');
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = this.$t('objFill.yibaohan');
}
return result;
},
}, },
methods: { methods: {
GetSupperOrderEditAuth() { GetSupperOrderEditAuth() {
......
...@@ -28,8 +28,6 @@ ...@@ -28,8 +28,6 @@
<span @click="resGetList">{{$t('objFill.v101.administrative.fenxianggwd')}}</span> <span @click="resGetList">{{$t('objFill.v101.administrative.fenxianggwd')}}</span>
<span v-for="(item,index) in NavList" @click="getNavTree(item,index)">{{item.name}}</span> <span v-for="(item,index) in NavList" @click="getNavTree(item,index)">{{item.name}}</span>
</div> </div>
<table class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable myDocumentsTable" border="0" cellspacing="0" cellpadding="0">
<tbody v-if='!isChildFiles'> <tbody v-if='!isChildFiles'>
<tr> <tr>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<tr v-for="(item,index) in DataList"> <tr v-for="(item,index) in DataList">
<td>{{item.MenuName}}</td> <td>{{item.MenuName}}</td>
<td>{{item.MenuUrl}}</td> <td>{{item.MenuUrl}}</td>
<td>{{item.Tier | tierFormat(item.Tier)}}</td> <td>{{tierFormat(item.Tier)}}</td>
<td>{{item.MenuStatus==0?$t('pub.openSel'):$t('pub.closeSel')}}</td> <td>{{item.MenuStatus==0?$t('pub.openSel'):$t('pub.closeSel')}}</td>
<td>{{item.Sort}}</td> <td>{{item.Sort}}</td>
<td>{{item.LowVersion}}</td> <td>{{item.LowVersion}}</td>
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<tr v-for="(item,index) in DataList"> <tr v-for="(item,index) in DataList">
<td>{{item.MenuName}}</td> <td>{{item.MenuName}}</td>
<td>{{item.MenuUrl}}</td> <td>{{item.MenuUrl}}</td>
<td>{{item.Tier | tierFormat(item.Tier)}}</td> <td>{{tierFormat(item.Tier)}}</td>
<td>{{item.MenuStatus==0?$t('pub.openSel'):$t('pub.closeSel')}}</td> <td>{{item.MenuStatus==0?$t('pub.openSel'):$t('pub.closeSel')}}</td>
<td> <td>
{{item.GroupingCode}} {{item.GroupingCode}}
......
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