Commit dba236bb authored by Mac's avatar Mac

1

parent f1ebfc69
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<q-btn color="accent" size="sm" class="q-mr-md" icon="cloud_upload" label="上传"> <q-btn color="accent" size="sm" class="q-mr-md" icon="cloud_upload" label="上传">
</q-btn> </q-btn>
</el-upload> </el-upload>
<div style="margin-top: 20px;"> <div style="margin-top: 20px;line-height: 25px;">
(上传文件大小不超过20MB,支持DOC、DOCX、XLS、XLSX、CSV、PPT、PPTX、TXT、PDF及Xmind格式。) (上传文件大小不超过20MB,支持DOC、DOCX、XLS、XLSX、CSV、PPT、PPTX、TXT、PDF及Xmind格式。)
</div> </div>
</div> </div>
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
<div v-if="addMsg.MediumModel && addMsg.MediumModel.length>0"> <div v-if="addMsg.MediumModel && addMsg.MediumModel.length>0">
<div class="row items-center" v-for="(x,y) in addMsg.MediumModel" :key="y"> <div class="row items-center" v-for="(x,y) in addMsg.MediumModel" :key="y">
<i class="el-icon-link"></i> <i class="el-icon-link"></i>
<span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span> <span style="margin-left: 10px;cursor: pointer;display: inline-block;height: 40px;line-height: 40px;" >{{getType(x,'title')}}</span>
<i style="margin-left: 10px;cursor: pointer" class="el-icon-close" <i style="margin-left: 10px;cursor: pointer" class="el-icon-close"
@click="deleteModel(y)"></i> @click="deleteModel(y)"></i>
</div> </div>
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<div v-if="MediumModel.length>0"> <div v-if="MediumModel.length>0">
<div class="row items-center" v-for="(x,y) in MediumModel" :key="y"> <div class="row items-center" v-for="(x,y) in MediumModel" :key="y">
<i class="el-icon-link"></i> <i class="el-icon-link"></i>
<span style="margin-left: 10px;cursor: pointer;" >{{getType(x,'title')}}</span> <span style="margin-left: 10px;cursor: pointer;display: inline-block;height: 40px;line-height: 40px;" >{{getType(x,'title')}}</span>
<i style="margin-left: 10px;cursor: pointer" class="el-icon-close" <i style="margin-left: 10px;cursor: pointer" class="el-icon-close"
@click="deleteModel(y)"></i> @click="deleteModel(y)"></i>
</div> </div>
......
...@@ -76,6 +76,10 @@ ...@@ -76,6 +76,10 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.addchannelcode .weekstyle2 .weekstyle2_item div{
height: 40px;
line-height: 40px;
}
.addchannelcode .tsbox .el-date-editor.el-input, .addchannelcode .tsbox .el-date-editor.el-input,
.addchannelcode .tsbox .el-date-editor.el-input__inner { .addchannelcode .tsbox .el-date-editor.el-input__inner {
...@@ -189,7 +193,7 @@ ...@@ -189,7 +193,7 @@
</div> </div>
<div style="width: 80%;display: flex;align-items: flex-start;" v-if="addMsg.Type==1"> <div style="width: 80%;display: flex;align-items: flex-start;" v-if="addMsg.Type==1">
<div v-for="(x,y) in lsweeklist" :key="y+'b'" class="weekstyle2"> <div v-for="(x,y) in lsweeklist" :key="y+'b'" class="weekstyle2">
<div v-for="(item,index) in x.lsMsg" :key="index+'a1'" <div v-for="(item,index) in x.lsMsg" :key="index+'a1'" class="weekstyle2_item"
style="width: 100%;;display: flex;flex-direction: column;align-items: center;border-bottom: 1px solid #e8e8e8;"> style="width: 100%;;display: flex;flex-direction: column;align-items: center;border-bottom: 1px solid #e8e8e8;">
<div>{{item.StartHours}}~{{item.EndHours}}</div> <div>{{item.StartHours}}~{{item.EndHours}}</div>
<div> <div>
...@@ -201,7 +205,7 @@ ...@@ -201,7 +205,7 @@
</div> </div>
<div style="width: 80%;display: flex;align-items: flex-start;" v-if="addMsg.Type==2"> <div style="width: 80%;display: flex;align-items: flex-start;" v-if="addMsg.Type==2">
<div v-for="(x,y) in lsweeklist" :key="y+'b'" class="weekstyle2"> <div v-for="(x,y) in lsweeklist" :key="y+'b'" class="weekstyle2">
<div v-for="(item,index) in x.lsMsg" :key="index+'a1'" <div v-for="(item,index) in x.lsMsg" :key="index+'a1'" class="weekstyle2_item"
style="width: 100%;;display: flex;flex-direction: column;align-items: center;border-bottom: 1px solid #e8e8e8;"> style="width: 100%;;display: flex;flex-direction: column;align-items: center;border-bottom: 1px solid #e8e8e8;">
<div>{{item.StartHours}}~{{item.EndHours}}</div> <div>{{item.StartHours}}~{{item.EndHours}}</div>
<el-tooltip class="item" effect="dark" :content="item.EmpName" placement="top"> <el-tooltip class="item" effect="dark" :content="item.EmpName" placement="top">
...@@ -325,7 +329,7 @@ ...@@ -325,7 +329,7 @@
<q-btn color="white" v-if="addMsg.Type==2" text-color="black" icon='add' label="选择企业成员" @click="outerVisible=true,byval=EmpBackUpList,choiceapprovaltype='2'" /> <q-btn color="white" v-if="addMsg.Type==2" text-color="black" icon='add' label="选择企业成员" @click="outerVisible=true,byval=EmpBackUpList,choiceapprovaltype='2'" />
</div> </div>
<div style="color: red;">(备用员工的选择最好不要和员工上限模块里的人员重复)</div> <div style="color: red;height: 40px;line-height: 40px;">(备用员工的选择最好不要和员工上限模块里的人员重复)</div>
</el-form-item> </el-form-item>
......
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