Skip to content

D
dd_school
Commit 85caf5ba by wangjian
Options

Merge remote-tracking branch 'origin/master'

parents 518c3482 7440ee7a
Showing with 74 additions and 46 deletions
ruoyi-ui/src/views/smartSchool/openRecruitment/examManage/components/examRoomAllocate.vue
...@@ -228,11 +228,11 @@ ...@@ -228,11 +228,11 @@
<th style="height: 30px;text-align: center;">{{ form.examAddress }}</th> <th style="height: 30px;text-align: center;">{{ form.examAddress }}</th>
</tr> </tr>
</table> </table>
<br/> <!-- <br/>-->
<div style="width: 800px;height:600px; margin: auto"> <!-- <div style="width: 800px;height:600px; margin: auto">-->
<b style="font-size: 16px; line-height: 30px">注意事项：</b> <!-- <b style="font-size: 16px; line-height: 30px">注意事项：</b>-->
<p v-html="form.notice" style="line-height: 22px; font-size: 14px"></p> <!-- <p v-html="form.notice" style="line-height: 22px; font-size: 14px"></p>-->
</div> <!-- </div>-->
</div> </div>
</el-card> </el-card>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -609,7 +609,7 @@ export default { ...@@ -609,7 +609,7 @@ export default {
.main { .main {
width: 95%; width: 95%;
height: 1200px; //height: 1200px;
margin: auto; margin: auto;
border: 1px solid rgb(101, 98, 98); border: 1px solid rgb(101, 98, 98);
} }
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="设备名称"> <el-form-item label="设备名称">
<el-input style="width: 100%" v-model="queryParams.equipmentName" clearable placeholder="请输入设备名称"></el-input> <el-input style="width: 100%" v-model="queryParams.equipmentName" clearable
placeholder="请输入设备名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item label="分类编码"> <el-form-item label="分类编码">
<treeselect v-model="queryParams.classificationCode" :options="classificationOptions" :normalizer="normalizer" <treeselect v-model="queryParams.classificationCode" :options="classificationOptions"
placeholder="请选择分类编码" filterable /> :normalizer="normalizer" placeholder="请选择分类编码" filterable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
...@@ -59,9 +60,10 @@ ...@@ -59,9 +60,10 @@
<el-table-column align="center" prop="encode" label="自编码" width="140" fixed="left"></el-table-column> <el-table-column align="center" prop="encode" label="自编码" width="140" fixed="left"></el-table-column>
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left"></el-table-column> <el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left"></el-table-column>
<el-table-column align="center" prop="model" label="型号" fixed="left"></el-table-column> <el-table-column align="center" prop="model" label="型号" fixed="left"></el-table-column>
<!-- <el-table-column align="center" prop="specification" label="规格" fixed="left"></el-table-column> --> <el-table-column align="center" prop="specification" label="出厂编号" fixed="left"></el-table-column>
<el-table-column align="center" prop="classificationCode" label="分类编码"></el-table-column> <el-table-column align="center" prop="classificationCode" label="分类编码"></el-table-column>
<el-table-column align="center" prop="unit" label="单位"></el-table-column> <el-table-column align="center" prop="unit" label="设备编码"></el-table-column>
<el-table-column align="center" prop="ph" label="批号"></el-table-column>
<el-table-column align="center" prop="affiliationType" label="归属类型"> <el-table-column align="center" prop="affiliationType" label="归属类型">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div> <div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
...@@ -130,21 +132,21 @@ ...@@ -130,21 +132,21 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="12">
<el-form-item label="规格:" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位:" prop="unit"> <el-form-item label="出厂编号:" prop="specification">
<el-input v-model="form.unit" placeholder="请输入单位" :disabled="nowOptionType == 2 ? true : false" <el-input v-model="form.specification" placeholder="请输入出厂编号" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设备编码:" prop="unit">
<el-input v-model="form.unit" placeholder="请输入设备编码" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="归属类型:" prop="affiliationType"> <el-form-item label="归属类型:" prop="affiliationType">
<el-select v-model="form.affiliationType" clearable placeholder="请选择归属类型" <el-select v-model="form.affiliationType" clearable placeholder="请选择归属类型"
...@@ -154,6 +156,9 @@ ...@@ -154,6 +156,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="设备状态:" prop="equipmentState"> <el-form-item label="设备状态:" prop="equipmentState">
<el-select v-model="form.equipmentState" clearable placeholder="请选择设备状态" <el-select v-model="form.equipmentState" clearable placeholder="请选择设备状态"
...@@ -163,31 +168,32 @@ ...@@ -163,31 +168,32 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否允许借出:" prop="isAllowLend"> <el-form-item label="是否允许借出:" prop="isAllowLend">
<el-select v-if="form.affiliationType === '3'" v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出" <el-select v-if="form.affiliationType === '3'" v-model="form.isAllowLend" clearable
:disabled="true" class="selectWidth" style="width: 100%;"> placeholder="请选择是否允许借出" :disabled="true" class="selectWidth" style="width: 100%;">
<el-option :key="'0'" :label="'否'" :value="'0'" /> <el-option :key="'0'" :label="'否'" :value="'0'" />
</el-select> </el-select>
<el-select v-else v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出" <el-select v-else v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出"
:disabled="isAllowLendDisabled || (nowOptionType == 2)" class="selectWidth"> :disabled="isAllowLendDisabled || (nowOptionType == 2)" class="selectWidth">
<el-option v-for="dict in dict.type.is_lend" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.is_lend" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否借出:" prop="isLend"> <el-form-item label="是否借出:" prop="isLend">
<el-select v-model="form.isLend" clearable placeholder="请选择是否借出" <el-select v-model="form.isLend" clearable placeholder="请选择是否借出"
:disabled="nowOptionType == 2 ? true : false" class="selectWidth" style="width: 100%;"> :disabled="nowOptionType == 2 ? true : false" class="selectWidth" style="width: 100%;">
<el-option v-for="dict in dict.type.is_lend" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.is_lend" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="安装时间:" prop="dateOfProduction"> <el-form-item label="安装时间:" prop="dateOfProduction">
...@@ -196,29 +202,31 @@ ...@@ -196,29 +202,31 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="价格:" prop="price"> <el-form-item label="价格:" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" :disabled="nowOptionType == 2 ? true : false" <el-input v-model="form.price" placeholder="请输入价格" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="效用年限:" prop="lifeOfUtility"> <el-form-item label="效用年限:" prop="lifeOfUtility">
<el-input v-model="form.lifeOfUtility" placeholder="请输入效用年限（年）" <el-input v-model="form.lifeOfUtility" placeholder="请输入效用年限（年）"
:disabled="nowOptionType == 2 ? true : false" clearable></el-input> :disabled="nowOptionType == 2 ? true : false" clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地点:" prop="place"> <el-form-item label="地点:" prop="place">
<el-input v-model="form.place" placeholder="请输入地点" :disabled="nowOptionType == 2 ? true : false" <el-input v-model="form.place" placeholder="请输入地点" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="使用人:" prop="useName"> <el-form-item label="使用人:" prop="useName">
<el-select v-model="form.useId" filterable placeholder="请选择使用人" <el-select v-model="form.useId" filterable placeholder="请选择使用人"
...@@ -228,6 +236,15 @@ ...@@ -228,6 +236,15 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<!-- 新增字段 -->
<el-col :span="12">
<el-form-item label="批号:" prop="ph">
<el-input v-model="form.ph" placeholder="请输入批号" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="备注:" prop="remark"> <el-form-item label="备注:" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"
...@@ -293,7 +310,7 @@ ...@@ -293,7 +310,7 @@
<div class="flexBlock printQrCode"> <div class="flexBlock printQrCode">
<div class="printLeft"> <div class="printLeft">
<div :id="'print' + index" class="printImg"></div> <div :id="'print' + index" class="printImg"></div>
<div>{{ item.encode }}</div> <div>{{ item.unit }}</div>
</div> </div>
<div class="printRight"> <div class="printRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div> <div>{{ item.equipmentName }}：{{ item.model }}</div>
...@@ -376,6 +393,7 @@ export default { ...@@ -376,6 +393,7 @@ export default {
useId: '', useId: '',
useName: '', useName: '',
remark: '', remark: '',
ph: '',
affiliationType: '', // 其他属性 affiliationType: '', // 其他属性
isAllowLend: '', // 其他属性 isAllowLend: '', // 其他属性
}, },
...@@ -499,6 +517,7 @@ export default { ...@@ -499,6 +517,7 @@ export default {
useName: '', useName: '',
useId: '', useId: '',
remark: '', remark: '',
ph: '',
} }
this.nowOptionType = type this.nowOptionType = type
this.getSelectUser() this.getSelectUser()
...@@ -546,6 +565,7 @@ export default { ...@@ -546,6 +565,7 @@ export default {
lifeOfUtility: this.form.lifeOfUtility, lifeOfUtility: this.form.lifeOfUtility,
place: this.form.place, place: this.form.place,
useName: this.form.useName, useName: this.form.useName,
ph: this.form.ph,
useId, useId,
remark: this.form.remark, remark: this.form.remark,
} }
...@@ -652,8 +672,8 @@ export default { ...@@ -652,8 +672,8 @@ export default {
console.log(baseUrl, 'baseUrl'); console.log(baseUrl, 'baseUrl');
const ids = this.electItem.join(','); const ids = this.electItem.join(',');
console.log(ids, 'ids'); console.log(ids, 'ids');
const encodes = this.chooseList.map(item => item.encode).join(','); const unit = this.chooseList.map(item => item.unit).join(',');
console.log(encodes, 'encodes'); console.log(unit, 'unit');
const printListParam = encodeURIComponent(JSON.stringify(this.printList)); const printListParam = encodeURIComponent(JSON.stringify(this.printList));
dd.biz.util.openLink({ dd.biz.util.openLink({
url: `${baseUrl}?ids=${ids}`, url: `${baseUrl}?ids=${ids}`,
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
<template> <template>
<div> <div>
<!-- 打印二维码 弹框部分 --> <!-- 打印二维码 弹框部分 -->
<el-dialog title="打印条码预览" :visible.sync="printDialog" width="30%"> <el-dialog title="打印条码预览" :visible.sync="printDialog" width="45%">
<div class="qrCodeList"> <div class="qrCodeList">
<div v-for="(item, index) in chooseList" :key="index"> <div v-for="(item, index) in chooseList" :key="index">
<div class="titlShow">东营市二中</div> <div class="titlShow">东营市二中</div>
<div class="flexBlock qrCode"> <div class="flexBlock qrCode">
<div class="qrCodeLeft"> <div class="qrCodeLeft">
<div :id="'qrcode' + index"></div> <div :id="'qrcode' + index"></div>
<div>{{ item.encode }}</div> <!-- <div>{{ item.encode }}</div> -->
<!-- <div>{{ item.unit }}</div> -->
</div> </div>
<div class="qrCodeRight"> <div class="qrCodeRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div> <div>{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div> <div>地点：{{ item.place }}</div>
<div>设备编码：{{ item.unit }}</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -30,12 +33,14 @@ ...@@ -30,12 +33,14 @@
<div class="flexBlock printQrCode"> <div class="flexBlock printQrCode">
<div class="printLeft"> <div class="printLeft">
<div :id="'print' + index" class="printImg"></div> <div :id="'print' + index" class="printImg"></div>
<div>{{ item.encode }}</div> <!-- <div>{{ item.unit }}</div> -->
</div> </div>
<div class="printRight"> <div class="printRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div> <div>{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div> <div>地点：{{ item.place }}</div>
<div>设备编码：{{ item.unit }}</div>
</div> </div>
</div> </div>
<div style="page-break-after:always"></div> <div style="page-break-after:always"></div>
</div> </div>
...@@ -107,22 +112,24 @@ export default { ...@@ -107,22 +112,24 @@ export default {
this.printDialog = true; this.printDialog = true;
this.$nextTick(() => { this.$nextTick(() => {
this.printList.map((item, index) => { this.printList.map((item, index) => {
console.log(item, 'item');
const domPrint = document.getElementById(`print${index}`).lastElementChild; const domPrint = document.getElementById(`print${index}`).lastElementChild;
if (domPrint == null) { if (domPrint == null) {
new QRCode(`print${index}`, { new QRCode(`print${index}`, {
width: 60, width: 60,
height: 60, height: 60,
text: item.encode, // text: item.unit,
}); });
} }
}); });
this.chooseList.map((item, index) => { this.chooseList.map((item, index) => {
console.log(item, 'item');
const dom = document.getElementById(`qrcode${index}`).lastElementChild; const dom = document.getElementById(`qrcode${index}`).lastElementChild;
if (dom == null) { if (dom == null) {
new QRCode(`qrcode${index}`, { new QRCode(`qrcode${index}`, {
width: 150, width: 250,
height: 150, height: 250,
text: item.encode, // text: item.unit,
}); });
} }
}); });
...@@ -181,7 +188,7 @@ export default { ...@@ -181,7 +188,7 @@ export default {
} }
.qrCode { .qrCode {
width: 300px; width: 500px;
font-size: 14px; font-size: 14px;
line-height: 30px; line-height: 30px;
align-items: flex-start; align-items: flex-start;
...@@ -190,6 +197,7 @@ export default { ...@@ -190,6 +197,7 @@ export default {
.qrCodeLeft { .qrCodeLeft {
text-align: center; text-align: center;
/* color: 1px solid red; */
} }
.qrCodeRight { .qrCodeRight {
......
ruoyi-ui/vue.config.js
...@@ -48,8 +48,8 @@ module.exports = { ...@@ -48,8 +48,8 @@ module.exports = {
//学校内网 //学校内网
// target: `http://10.20.100.201:57321`, // target: `http://10.20.100.201:57321`,
// target: `http://47.105.176.202:5115`, // target: `http://47.105.176.202:5115`,
target: `http://172.16.100.114:5131`, // target: `http://172.16.100.96:5131`,
// target: 'http://192.168.31.14:5131', target: 'http://192.168.31.12:5131',
// target: `http://172.18.6.157:8848`, // target: `http://172.18.6.157:8848`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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