Skip to content

D
dd_school
Commit c7d670fd by zhaopanyu
Options

zpy

parent 2c87e8dd
Showing with 12 additions and 11 deletions
.DS_Store
No preview for this file type
ruoyi-ui/src/views/smartSchool/electronicArchives/basicInformation/index.vue
...@@ -187,12 +187,13 @@ ...@@ -187,12 +187,13 @@
</el-table-column> </el-table-column>
<!-- <el-table-column label="现具备专技资格" :min-width="screenWidth * 0.08" align="center" <!-- <el-table-column label="现具备专技资格" :min-width="screenWidth * 0.08" align="center"
prop="currentHiringProfessionalTitle" sortable="custom" show-overflow-tooltip /> --> prop="currentHiringProfessionalTitle" sortable="custom" show-overflow-tooltip /> -->
<el-table-column label="现职称" :min-width="screenWidth * 0.05" align="center" prop="currentHiringProfessionalTitle" <el-table-column label="现职称" :min-width="screenWidth * 0.05" align="center"
sortable="custom" show-overflow-tooltip> prop="currentHiringProfessionalTitle" sortable="custom" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <span style="white-space: normal;">现具备专<br />技资格</span> --> <!-- <span style="white-space: normal;">现具备专<br />技资格</span> -->
<!-- <span style="white-space: normal;">现职称</span> --> <!-- <span style="white-space: normal;">现职称</span> -->
<dict-tag :options="dict.type.current_professional" :value="scope.row.currentHiringProfessionalTitle" /> <dict-tag :options="dict.type.current_professional"
:value="scope.row.currentHiringProfessionalTitle" />
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable="custom" <!-- <el-table-column label="毕业院校" align="center" prop="graduationInstitution3" sortable="custom"
...@@ -374,7 +375,7 @@ ...@@ -374,7 +375,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现聘职称时间" prop="currentHiringProfessionalTitleTime"> <el-form-item label="现聘职称时间" prop="currentHiringProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width: 100%;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 100%;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -386,7 +387,7 @@ ...@@ -386,7 +387,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现职称取得时间" prop="currentProfessionalTitleTime"> <el-form-item label="现职称取得时间" prop="currentProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width:100%;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width:100%;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -414,7 +415,7 @@ ...@@ -414,7 +415,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime"> <el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime">
<el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month" <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month"
value-format="yyyy-MM" placeholder="请选择" :style="{ width: '100%' }"> value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -723,7 +724,7 @@ ...@@ -723,7 +724,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现职称取得时间" prop="currentProfessionalTitleTime"> <el-form-item label="现职称取得时间" prop="currentProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width: 190px;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -744,7 +745,7 @@ ...@@ -744,7 +745,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现聘职称时间" prop="currentHiringProfessionalTitleTime"> <el-form-item label="现聘职称时间" prop="currentHiringProfessionalTitleTime">
<el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month" <el-date-picker clearable v-model="form.currentHiringProfessionalTitleTime" type="month"
value-format="yyyy-MM" placeholder="请选择" style="width: 190px;"> value-format="yyyy-MM-dd" placeholder="请选择" style="width: 190px;">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -771,7 +772,7 @@ ...@@ -771,7 +772,7 @@
<el-col :span="8" class="custom-margin"> <el-col :span="8" class="custom-margin">
<el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime"> <el-form-item label="现岗位等级聘任时间" prop="currentJobLevelAppointmentTime">
<el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month" <el-date-picker clearable v-model="form.currentJobLevelAppointmentTime" type="month"
value-format="yyyy-MM" placeholder="请选择" :style="{ width: '100%' }"> value-format="yyyy-MM-dd" placeholder="请选择" :style="{ width: '100%' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<!-- <div>{{ item.unit }}</div> --> <!-- <div>{{ item.unit }}</div> -->
</div> </div>
<div class="qrCodeRight"> <div class="qrCodeRight">
<div>非涉密{{ item.equipmentName }}：{{ item.model }}</div> <div>{{ item.equipmentName }}</div>
<!--新加字段 2024-7-11 --> <!--新加字段 2024-7-11 -->
<div v-if="item.bh !== undefined && item.bh !== ''">编号:{{ item.bh }}</div> <div v-if="item.bh !== undefined && item.bh !== ''">编号:{{ item.bh }}</div>
<div v-if="item.bmmc !== undefined && item.bmmc !== ''">部门:{{ item.bmmc }}</div> <div v-if="item.bmmc !== undefined && item.bmmc !== ''">部门:{{ item.bmmc }}</div>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<!-- <div>{{ item.unit }}</div> --> <!-- <div>{{ item.unit }}</div> -->
</div> </div>
<div class="printRight"> <div class="printRight">
<div>非涉密{{ item.equipmentName }}：{{ item.model }}</div> <div>{{ item.equipmentName }}</div>
<!--新加字段 2024-7-11 --> <!--新加字段 2024-7-11 -->
<div v-if="item.bh !== undefined && item.bh !== ''">编号:{{ item.bh }}</div> <div v-if="item.bh !== undefined && item.bh !== ''">编号:{{ item.bh }}</div>
<div v-if="item.bmmc !== undefined && item.bmmc !== ''">部门:{{ item.bmmc }}</div> <div v-if="item.bmmc !== undefined && item.bmmc !== ''">部门:{{ item.bmmc }}</div>
......
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