Skip to content

S
SuperMan
Commit 6f2df67d authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parents 3eef6579 03c13027
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 69 deletions
src/assets/common/lang/zh.js
View file @ 6f2df67d
......@@ -255,8 +255,6 @@ export const admin={ //行政
admin_lnLoginPwd:'请输入登录密码',
admin_Department:'部门',
admin_Post:'岗位',
admin_xueli:'学历',
admin_Entrytime:'入职时间',
admin_Departuretime:'离职时间',
......@@ -1059,6 +1057,76 @@ export const fnc = {
khyuanbi: '（原币）',
khbweibi: '（本位币）',
jylshuihao: '交易流水号',
shzhuangtai: '审核状态',
yjdanju: '佣金单据',
mbleixing: '模板类型',
djleixing: '单据类型',
yingshou: '应收',
yingfu: '应付',
shishou: '实收',
shifu: '实付',
zjdiaobo: '资金调拨',
tuanqi: '团期',
hkriqi: '汇款日期',
fybumen: '费用部门',
zdrenyuan: '制单人员',
zhleixing: '账户类型',
sfkzhanghu: '收付款账户',
dxleixing: '对象类型',
ddbianhao: '订单编号',
bzleixing: '币种类型',
djjine: '单据金额',
zdriqi: '制单日期',
spriqi: '审批日期',
gjchaxun: '高级查询',
piltijiao: '批量提交',
gzweituo: '工作委托',
shoukuan: '收款',
fukuan: '付款',
duixiang: '对象',
dqzhuangtai: '当前状态',
gnjpqishu: '国内票务期数',
qzbianhao: '签证编号',
tsbianhao: '投诉编号',
smjpbianhao: '散卖机票编号',
chakan: '查看',
shenhe: '审核',
zhuanjiao: '转交',
tzjyriqi: '调整交易日期',
xzzjiaoren: '选择转交人',
zhuanjiaoren: '转交人',
yjyriqi: '原交易日期',
cwbaobiao: '财务报表',
shuoming:'说明',
djbianhao: '单据编号',
cjshijian: '创建时间',
xiangqing: '详情',
zjdbbiao: '资金调拨报表',
zongbu: '总部',
fgongsi: '分公司',
zjdbodan: '资金调拨单',
skduixiang: '收款对象',
skfangshi: '收款方式',
dkzhanghu: '到款账户',
bwyue: '本位金额',
dbriqi: '调拨日期',
qingkong: '清空',
bnshanchu: '不能删除了！',
zhibiao: '制表',
bwbjine: '本位币金额',
shliucheng: '审核流程',
shouqi: '收起',
zhankai: '展开',
faqi: '发起',
daishen: '待审',
bohui: '驳回',
you: '由',
gei: '给',
zjbeizhu: '转交备注',
jieshu: '结束',
ljhaoshi: '累计耗时',
xsfujian: '显示附件',
ycfujian: '隐藏附件',
}
export const tips = {
tips: '提示',
......@@ -1118,6 +1186,8 @@ export const tips = {
jiaoyifangshi: '交易方式',
tips_deletealldepart: '删除该部门，会将其子部门全部删除！是否删除?',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1136,6 +1206,19 @@ export const Operation = {
Op_Project:'项目',
Op_notInvoled:'未参与',
Op_ManageDepartment:'管理部门',
Op_LineDirection:'线路方向',
Op_leaveCountry:'出境',
Op_theEntry:'入境',
Op_Cdreservation:'成都机位出发',
Op_localrevervation:'当地机位出发',
Op_headOfficePrice:'总公司价格',
Op_branchPrice:'分公司价格',
Op_affiliate:'代销商价格',
Op_profitsBelong:'当团利润归属',
Op_localzongprice:'当地总公司价格',
Op_localBranchPrice:'当地分公司价格',
Op_localdaiPrice:'当地代销商价格',
Op_localDangPrice:'当地当团利润归属',
}
export const rule = {
company: '请选择公司',
......@@ -1214,7 +1297,6 @@ export const rule = {
qxzfkdzhanghu: '请选择付款账户',
qxzxybsheren: '请选择下一步审核人',
qxzzdbumen:' 请选择制单部门',
qsrbmmingchen:"请输入部门名称",
qxzbmcengji:"请选择部门层级",
qxzfuzeren:"请选择负责人",
......@@ -1224,8 +1306,12 @@ export const rule = {
qsrname:"请输入姓名",
qsrtelphone:"请输入正确的手机",
qsrIdnum:"请输正确的身份证号",
qxzzjiaoren: '请选择转交人',
qtxzjbeizhu: '请填写转交备注',
qxztzhdjyriqi: '请选择调整后的交易日期',
qtxshuoming: '请填写说明',
qxzygxytjddanju: '请选择一个需要提交的单据！',
qxzbmen: '请选择部门',
}
export const adm={
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ 6f2df67d
......@@ -89,7 +89,7 @@
<div v-loading="loading">
<div class="sfd_header">
<ul class="clearfix">
<li><span>{{$t('scen.sc_temID')}}:</span>{{TCNUM}}</li>
<li><span>团队编号：</span>{{TCNUM}}</li>
<!-- <li><span>订单号：</span>{{orderId}}</li> -->
<li> </li>
<li><span>已收总金额：</span>{{moneyFormat(allMoney)}}</li>
......@@ -106,7 +106,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">单号</th>
<th width="200">{{$t('fnc.fyleixing')}}</th>
<th width="200">费用类型</th>
<th width="350">交易方式</th>
<th width="100">同行转款</th>
<th width="100">应收</th>
......
src/components/SalesModule/groupInquiry.vue
View file @ 6f2df67d
......@@ -130,17 +130,7 @@
border: 1px solid #d95454 !important;
box-sizing: border-box;
}
/* 名单 */
.RL-remarkTitle {
display: inline-block;
width: 36px;
white-space: nowrap;
font-size: 14px;
}
.RL-remarkCon span {
margin-right: 5px;
}
.person_fan{
width: 100%;
border-top: 1px solid #e5e5e5;
......@@ -182,7 +172,7 @@
</el-tabs>
</ul> -->
<div class="GQ_companyList" v-if="queryCommonData.IsParentCompany==1">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span>
</div>
<div class="TC_Content TC-MyList">
......@@ -190,17 +180,17 @@
<ul>
<li>
<span>
<em>{{$t('system.table_ssLine')}}</em>
<em>所属线路</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="(item,index) in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='index+10000'>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('active.ad_xlmc')}}</em>
<em>系列名称</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
......@@ -210,14 +200,14 @@
</li>
<li>
<span>
<em>{{$t('visa.v_tuanhao')}}</em>
<em>团号</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
<em>发团日期</em>
<el-date-picker class="w150" type="date" v-model='queryMsg.StartGroupDate' :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder="">
</el-date-picker>
......@@ -230,21 +220,21 @@
<span>
<em>{{$t('visa.v_qianzhengst')}}</em>
<el-select v-model="queryMsg.TCVisaStatus" clearable class="w150" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option :label="$t('visa.v_weibanli')" value="1"></el-option>
<el-option :label="$t('visa.v_banlizhong')" value="2"></el-option>
<el-option :label="$t('visa.v_yibanli')" value="3"></el-option>
<el-option label="不限" value="-1"></el-option>
<el-option label="未办理" value="1"></el-option>
<el-option label="办理中" value="2"></el-option>
<el-option label="已办理" value="3"></el-option>
</el-select>
</span>
</li>
<li class="advancedLi">
<el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
<div>
<div class="TC_queryTitle">{{$t('visa.v_tkgjcx')}}</div>
<div class="TC_queryTitle">团控高级查询</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span>{{$t('system.query_airCompanyName')}}</span>
<span>航空公司</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150">
<el-option :label='$t("system.ph_buxian")' :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId">
......@@ -252,7 +242,7 @@
</el-select>
</div>
<div>
<span>{{$t('visa.v_czuser')}}</span>
<span>操作人员</span>
<el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'>
......@@ -260,13 +250,13 @@
</el-select>
</div>
<div>
<span>{{$t('visa.v_xcdays')}}</span>
<span>行程天数</span>
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div>
<span>{{$t('visa.v_lycity')}}</span>
<span>联运城市</span>
<el-select class='w150' filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
......@@ -277,7 +267,7 @@
</div>
<div class="TC_rightSearch">
<div>
<span>{{$t('visa.v_teamnum')}}</span>
<span>团队人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input>
-
......@@ -285,7 +275,7 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div>
<span>{{$t('leader.leader_registraNum')}}</span>
<span>报名人数</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input>
-
......@@ -293,11 +283,11 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div class="OnlyShowOverTeam">
<span>{{$t('visa.v_zkbaochaotuan')}}</span>
<span>只看报超团</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch>
</div>
<div>
<span>{{$t('visa.v_salecompany')}}</span>
<span>销售公司</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" v-model="queryMsg.SaleBranchId" multiple>
<el-option v-for='item in queryCommonData.companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
......@@ -306,9 +296,9 @@
</div>
</div>
<div class="comSearchDiv">
<span>{{$t('scen.sc_temStatu')}}</span>
<span>团队状态</span>
<span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group>
......@@ -316,7 +306,7 @@
</div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>销售平台</span>
<span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
......@@ -325,7 +315,7 @@
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('visa.v_tqstatus')}}</span>
<span>团期状态</span>
<span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
......@@ -334,7 +324,7 @@
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('visa.v_hbstatus')}}</span>
<span>航班状态</span>
<span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
......@@ -344,7 +334,7 @@
<button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">查询</button>
</div>
<span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}<i class="iconfont icon-xiaotuziCduan_1"></i></span>
<span class="advancedQuery" slot="reference">高级查询<i class="iconfont icon-xiaotuziCduan_1"></i></span>
</el-popover>
</li>
<li>
......@@ -372,23 +362,23 @@
v-for="plat in item.SalePlatList" :key="plat.subCode">
{{$tripUtils.getPlatName(plat)}}
</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">{{$t('visa.v_dwanshan')}}</span>
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span>
<span class="TC_xiajia" v-if="item.TCState==2">已下架</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">已取消</span>
</div>
</div>
</div>
<div class="el-col" style="width:200px;">
<div class="d2">
<p class="TCLflight_GO"><i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}</p>
<p class="TCLflight_GO"><i class="iconfont icon-hangban1"></i>航班</p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">{{$t('system.query_stopCity')}}</th>
<th width="150">起飞时间</th>
<th width="80">到达时间</th>
<th width="100">经停城市</th>
</tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666">
......@@ -419,8 +409,8 @@
<span>{{subItem.StopoverName}}</span>
<span v-if="subItem.ArrivalCityName">-</span>
<span>{{subItem.ArrivalCityName}}</span>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【{{$t('pub.sureBtn')}}】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span>
</div>
</div>
</el-popover>
......@@ -643,7 +633,7 @@
<div style="display: inline-block;vertical-align: top;white-space: nowrap;">
<el-form-item label="国家" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'">
<el-select class="groupInquiry_admission_input2" v-model="msg_admission.EuropeSchengen" @change="SchengenChange" placeholder="选择国家">
<el-option v-for="(item, index) in EuropeSchengenList" :key="index+2000" :label='item.Name' :value='item.Id'></el-option>
<el-option v-for="(item, index) in EuropeSchengenList" :key="index" :label='item.Name' :value='item.Id'></el-option>
</el-select>
</el-form-item>
<el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'">
......@@ -824,7 +814,7 @@ export default {
},
flightStatus: [{
Id: 0,
Name: this.$t('pub.unlimitedSel'),
Name: '不限',
Checked:true
}, {
Id: 1,
......@@ -1204,7 +1194,7 @@ export default {
})
}
});
console.log("this.queryCommonData.dataList",this.queryCommonData.dataList)
// console.log("this.queryCommonData.dataList",this.queryCommonData.dataList)
}
},
err => {}
......
src/components/administrative/departmentManagement.vue
View file @ 6f2df67d
......@@ -226,20 +226,20 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_xueli')" prop="EmEducation">
<el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
<el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
:placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_Entrytime')" prop="EmEntry">
<el-form-item label="入职时间" prop="EmEntry">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmEntry' type="date"></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="6">
<el-form-item :label="$t('admin.admin_Departuretime')" prop="EmLeave">
<el-form-item label="离职时间" prop="EmLeave">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmLeave' type="date"
disabled></el-date-picker>
</el-form-item>
......@@ -269,7 +269,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_Birthday')" prop="EmBirthday">
<el-form-item label="生日" prop="EmBirthday">
<el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmBirthday' type="date"></el-date-picker>
</el-form-item>
</el-col>
......@@ -279,7 +279,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_password')" prop="EmPassword">
<el-form-item label="密码" prop="EmPassword">
<el-input type="password" v-model="addMsg1.EmPassword" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
......@@ -287,8 +287,8 @@
<el-row :gutter="10">
<el-col :span="24">
<input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
@click="resetForm('addMsg1'),treeLayerShowUser=false" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')" />
@click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
<button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
</el-col>
</el-row>
......@@ -346,19 +346,19 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
<el-form-item label="部门排序" prop="Sort">
<el-input type="text" v-model="addMsg.Sort" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('admin.admin_isleader')" prop="IsLeader">
<el-form-item label='是否领队' prop="IsLeader">
<el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="24">
<el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
<el-form-item label="绑定岗位" prop="PostIdArr">
<el-select filterable class='w400 multiple_input' multiple v-model='addMsg.PostIdArr'
:placeholder="$t('pub.pleaseSel')">
<el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
......@@ -388,14 +388,14 @@
<th>{{$t('admin.admin_departmentLevel')}}</th>
<th>{{$t('admin.admin_leader')}}</th>
<th>{{$t('admin.admin_dphone')}}</th>
<th width="300">{{$t('admin.admin_Bindingposition')}}</th>
<th>{{$t('admin.admin_sort')}}</th>
<th width="300">绑定岗位</th>
<th>排序</th>
<th>{{$t('admin.admin_operate')}}</th>
</tr>
<tr v-for="(item,index) in DataList">
<td>{{item.RB_Branch_Name}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.Tier}}{{$t('admin.admin_level')}}</td>
<td>{{item.Tier}}级</td>
<td>{{item.DepartmentManagerName}}</td>
<td>{{item.DepartmentTel}}</td>
<td>{{item.PostName}}</td>
......
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