Skip to content

D
dd_school
Commit 0068a7a3 by zhaopanyu
Options

zpy 11.24

parent 65d46f7a
Showing with 158 additions and 93 deletions
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/secondaryDivision/index.vue
......@@ -256,7 +256,7 @@ export default {
course: course.course,
classesNumber: course.classesNumber,
peopleNumber: course.peopleNumber,
coursePeopleNumber: course.peopleNumber,
coursePeopleNumber: course.coursePeopleNumber,
divisionClassesRule: this.form.divisionClassesRule,
divisionClassesFrequency: course.divisionClassesFrequency
};
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/summerViewing/index.vue
......@@ -250,13 +250,12 @@ export default {
type: 'warning'
}).then(() => {
const formData = this.selectedCourse.map((course) => {
return {
curriculaId: this.queryForm.curriculaId,
course: course.course,
classesNumber: course.classesNumber,
peopleNumber: course.peopleNumber,
coursePeopleNumber: course.peopleNumber,
coursePeopleNumber: course.coursePeopleNumber,
divisionClassesRule: this.form.divisionClassesRule,
divisionClassesFrequency: course.divisionClassesFrequency
};
......
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetApproval/index.vue
......@@ -81,11 +81,9 @@
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
>编辑
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑
</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
>删除
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除
</el-button>
</template>
</el-table-column>
......@@ -152,9 +150,16 @@
<el-table :data="postForm.schoolBudgetDetailsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" align="center"></el-table-column>
<!-- budgetDetailed -->
<el-table-column label="项目支出明细" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.budgetDetailed"></el-input>
<el-autocomplete v-model="scope.row.budgetDetailed" placeholder="请选择或手动输入"
:fetch-suggestions="handleFetchSuggestions" @select="handleProjectExpenditureSelect">
<template slot-scope="{ item }">
<span>{{ item.label }}</span>
</template>
<el-input v-model="scope.row.budgetDetailed" clearable></el-input>
</el-autocomplete>
</template>
</el-table-column>
<!-- <el-table-column label="批复金额（万元）" align="center">
......@@ -315,6 +320,21 @@ export default {
this.getDeptTree();
},
methods: {
handleFetchSuggestions(queryString, callback) {
// 根据用户输入的查询字符串查询选项列表
// 在这里可以根据需要进行异步请求获取选项列表数据
const suggestions = [
{ value: 'option1', label: '选项1' },
{ value: 'option2', label: '选项2' },
// 其他选项
];
callback(suggestions);
},
handleProjectExpenditureSelect(value) {
// 处理用户选择下拉框选项的逻辑
console.log(value);
},
// 处理精度
handlePrecision(value, precision = 2) {
if (precision < 1) {
......
ruoyi-ui/src/views/smartSchool/logisticsManage/detailsofFundusage/index.vue
......@@ -141,7 +141,6 @@ export default {
// 获取列表
getList() {
this.budgetName = this.$route.query.budgetName;
this.purchaseName = this.$route.query.purchaseName == undefined ? '' : this.$route.query.purchaseName;
console.log('this.budgetName', this.budgetName);
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue
......@@ -51,7 +51,7 @@
@pagination="getList" />
<!-- 添加/编辑对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1350px">
<el-dialog :title="title" :visible.sync="open" width="90%">
<div class="dialog-footer btn">
<el-button class="btnup" type="primary" @click="submitForm">确 定</el-button>
<el-button class="btnup" @click="cancel">取 消</el-button>
......@@ -63,7 +63,7 @@
<input v-model="postForm.deptName" type="text" class="kstitle-inputks
" />科室预算
</div>
<div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">单位:万元</div>
</div>
<!-- 表格数据 -->
......@@ -86,15 +86,21 @@
</el-form-item>
</template>
</el-table-column>
<el-table-column label="*项目支出明细" prop="projectExpenditures">
<template slot-scope="scope">
<el-form-item :prop="'xzTable.' + scope.$index + '.projectExpenditures'"
:rules="rules.projectExpenditures" class="all">
<el-autocomplete v-model="scope.row.projectExpenditures" placeholder="请选择或手动输入"
:fetch-suggestions="handleFetchSuggestions" @select="handleProjectExpenditureSelect">
<template slot-scope="{ item }">
<span>{{ item.label }}</span>
</template>
<el-input v-model="scope.row.projectExpenditures" clearable></el-input>
</el-autocomplete>
</el-form-item>
</template>
</el-table-column>
<el-table-column label="*是否政府采购" prop="isGovernmentPurchase">
<template slot-scope="scope">
<el-form-item :prop="'xzTable.' + scope.$index + '.isGovernmentPurchase'"
......@@ -108,15 +114,21 @@
</template>
</el-table-column>
<el-table-column label="*申请金额" prop="applyMoney" width="120px">
<el-table-column label="*申请金额" prop="applyMoney" width="240px">
<template slot-scope="scope">
<el-form-item :prop="'xzTable.' + scope.$index + '.applyMoney'" :rules="rules.applyMoney"
class="all">
<el-input-number v-model="scope.row.applyMoney" clearable :controls="false" :min="0"
:precision="4"></el-input-number>
<el-input v-model="scope.row.applyMoney" clearable :controls="false"></el-input>
<el-select v-model="scope.row.unit" placeholder="请选择" @change="handleUnitChange(scope.row)">
<el-option label="元" value="元"></el-option>
<el-option label="万元" value="万元"></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="scope">
<el-form-item prop="remark">
......@@ -170,8 +182,8 @@
<!-- <el-table-column label="申请金额" prop="applyMoney" align="center" width="200" /> -->
<el-table-column label="申请金额" prop="applyMoney" align="center" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.applyMoney" :controls="false" :min="0" :precision="4"
:disabled="true" class="readonly-input"></el-input-number>
<el-input v-model="scope.row.applyMoney" :controls="false" :disabled="true"
class="readonly-input"></el-input>
</template>
</el-table-column>
......@@ -346,17 +358,43 @@ export default {
},
methods: {
handleApplyMoneyInput(row, event) {
let value = event.trim();
// 如果输入的值非空且符合数字格式，则保留四位小数
if (value !== '' && /^\d+(\.\d{1,4})?$/.test(value)) {
row.applyMoney = parseFloat(value).toFixed(4);
handleFetchSuggestions(queryString, callback) {
// 根据用户输入的查询字符串查询选项列表
// 在这里可以根据需要进行异步请求获取选项列表数据
const suggestions = [
{ value: 'option1', label: '选项1' },
{ value: 'option2', label: '选项2' },
{ value: 'option3', label: '选项3' }
];
callback(suggestions);
},
handleProjectExpenditureSelect(value) {
console.log(value);
},
// 元 万元 转换
handleUnitChange(row) {
const inputValue = parseFloat(row.applyMoney);
if (row.unit === '万元') {
// 如果用户选择的是万元，则将申请金额从元转换成万元
if (isNaN(inputValue)) {
row.applyMoney = 0;
} else if (inputValue !== 0) {
row.applyMoney = inputValue / 10000;
}
} else {
row.applyMoney = value;
// 如果用户选择的是元，则将申请金额从万元转换成元
if (isNaN(inputValue)) {
row.applyMoney = 0;
} else if (inputValue !== 0) {
row.applyMoney = inputValue * 10000;
}
}
},
rowIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
......
ruoyi-ui/src/views/smartSchool/officialWork/purchaseApply/index.vue
......@@ -27,19 +27,24 @@
</el-row>
<el-table v-loading="loading" :data="purchaseList" @selection-change="handleSelectionChange">
<el-table-column type="index" align="center" label="序号" min-width="30px"></el-table-column>
<el-table-column label="标题" align="center" min-width="150px" prop="purchaseName" />
<el-table-column label="标题" align="center" min-width="130px" prop="purchaseName" />
<el-table-column label="预算项目" prop="budgetName" align="center"></el-table-column>
<el-table-column label="采购费用" sortable align="center" prop="purchaseMoney">
<template slot-scope="scope">
{{ scope.row.purchaseMoney }}元
</template>
</el-table-column>
<el-table-column label="实际使用金额" sortable align="center" prop="sjPurchaseMoney">
<template slot-scope="scope">
{{ scope.row.sjPurchaseMoney }}元
</template>
</el-table-column>
<el-table-column label="期望日期" sortable align="center" prop="expectedDate"></el-table-column>
<el-table-column label="申请部门" align="center" prop="deptName"></el-table-column>
<el-table-column label="申请人" key="applyUser" align="center" prop="applyUser" v-if="isShow">
</el-table-column>
<el-table-column label="申请时间" sortable align="center" prop="applyTime" v-if="isShow"></el-table-column>
<el-table-column label="当前任务名称" key="taskName" prop="state" min-width="100" align="center">
<el-table-column label="当前任务名称" key="taskName" prop="state" min-width="80" align="center">
<template slot-scope="scope">
<el-tag :type="resolveState(scope.row.taskName)">{{ scope.row.taskName }}</el-tag>
</template>
......@@ -64,13 +69,13 @@
<ExPagination v-show="total > 0" :total="total" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getList"></ExPagination>
<!-- 新增或修改采购对话框 -->
<el-dialog :title="title" :visible.sync="openForPur" width="1000px" @close="refreshValidate">
<el-dialog :title="title" :visible.sync="openForPur" width="1100px" @close="refreshValidate">
<!-- <div> -->
<el-form ref="formPur" :model="formPur" :disabled="formPurDisable" :rules="rules" label-width="110px" >
<el-form ref="formPur" :model="formPur" :disabled="formPurDisable" :rules="rules" label-width="130px">
<el-row>
<el-col :span="22">
<el-col :span="24">
<el-form-item label="标题" prop="purchaseName">
<el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width: 608px"></el-input>
<el-input v-model="formPur.purchaseName" placeholder="请输入采购申请标题" clearable style="width: 650px"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -99,10 +104,22 @@
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="可用余额（元）" prop="kyye">
<el-input placeholder="请输入" v-model="formPur.kyye" readonly clearable style="width: 208px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<el-form-item label="采购金额(元)" prop="purchaseMoney">
<el-input :value="purchaseMoney" readonly clearable style="width: 208px"></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="实际使用金额(元)" prop="sjPurchaseMoney">
<el-input v-model="formPur.sjPurchaseMoney" clearable style="width: 208px"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
......@@ -127,7 +144,6 @@
</el-col>
</el-row>
</el-form>
<el-row :gutter="10">
<el-col :span="1.5">
<el-button v-if="isEdit" type="primary" size="mini" :disabled="add" @click="addRow">增加</el-button>
......@@ -144,8 +160,7 @@
<el-table-column prop="assetsTypeName" label="资产分类" align="center" width="120">
<template slot-scope="scope">
<span v-show="!isEdit">{{ scope.row.assetsTypeName }}</span>
<el-input v-show="isEdit" v-model="scope.row.assetsTypeName"
@click.native="selectAssetsType(scope.$index)"></el-input>
<el-input v-show="isEdit" v-model="scope.row.assetsTypeName"></el-input>
</template>
</el-table-column>
<el-table-column prop="assetsName" label="资产名称" align="center" width="180px">
......@@ -630,6 +645,8 @@ export default {
// 获取批复项目
getBudgetName(id) {
this.formPur.budgetName = this.budgetList.find(item => item.id === id)?.budgetName;
this.formPur.kyye = this.budgetList.find(item => item.id === id)?.kyye;
console.log(this.formPur.kyye, 'this.formPur.kyye');
// const {budgetName, budgetId} = data;
// this.formPur.budgetName = budgetName;
// this.formPur.budgetId = budgetId;
......@@ -642,6 +659,9 @@ export default {
getBudgetList1({ deptId: this.formPur.deptId }).then(((res) => {
if (res.code == 200) {
this.budgetList = res.rows
this.formPur.kyye = this.formPur.kyye
console.log(this.formPur.kyye, 'this.formPur.kyye');
console.log(this.budgetList, ' this.budgetList');
}
}))
},
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
......@@ -59,7 +59,7 @@
<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="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="unit" label="单位"></el-table-column>
<el-table-column align="center" prop="affiliationType" label="归属类型">
......@@ -82,7 +82,7 @@
<div>{{ selectDictLabel(dict.type.is_lend, row.isLend) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="投产日期" width="120"></el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="120"></el-table-column>
<el-table-column align="center" prop="price" label="价格（元）" width="100"></el-table-column>
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="120"></el-table-column>
<el-table-column align="center" prop="place" label="地点"></el-table-column>
......@@ -130,20 +130,21 @@
clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <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-row>
<el-row :gutter="20">
</el-col> -->
<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-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="归属类型:" prop="affiliationType">
<el-select v-model="form.affiliationType" clearable placeholder="请选择归属类型"
......@@ -153,8 +154,6 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="设备状态:" prop="equipmentState">
<el-select v-model="form.equipmentState" clearable placeholder="请选择设备状态"
......@@ -164,71 +163,72 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否允许借出:" prop="isAllowLend">
<el-select v-if="form.affiliationType === '3'" v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出"
:disabled="true" class="selectWidth">
:disabled="true" class="selectWidth" style="width: 100%;">
<el-option :key="'0'" :label="'否'" :value="'0'" />
</el-select>
<el-select v-else v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出"
: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-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否借出:" prop="isLend">
<el-select v-model="form.isLend" clearable placeholder="请选择是否借出"
:disabled="nowOptionType == 2 ? true : false" class="selectWidth">
: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-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="投产日期:" prop="dateOfProduction">
<el-form-item label="安装时间:" prop="dateOfProduction">
<el-date-picker v-model="form.dateOfProduction" type="date" placeholder="选择日期" class="selectWidth"
value-format="yyyy-MM-dd" :disabled="nowOptionType == 2 ? true : false" clearable>
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="价格:" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="效用年限:" prop="lifeOfUtility">
<el-input v-model="form.lifeOfUtility" placeholder="请输入效用年限（年）"
:disabled="nowOptionType == 2 ? true : false" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="地点:" prop="place">
<el-input v-model="form.place" placeholder="请输入地点" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="使用人:" prop="useName">
<el-select v-model="form.useId" filterable placeholder="请选择使用人"
:disabled="nowOptionType == 2 ? true : false" clearable >
:disabled="nowOptionType == 2 ? true : false" clearable>
<el-option v-for="(item, index) in userList" :key="index" :label="item.userName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="备注:" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注"
:disabled="nowOptionType == 2 ? true : false" clearable></el-input>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes copy.vue
......@@ -83,7 +83,7 @@
<div>{{ selectDictLabel(dict.type.is_lend, row.isLend) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="投产日期" width="120"></el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="120"></el-table-column>
<el-table-column align="center" prop="price" label="价格（元）" width="100"></el-table-column>
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="120"></el-table-column>
<el-table-column align="center" prop="place" label="地点"></el-table-column>
......@@ -190,7 +190,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投产日期:" prop="dateOfProduction">
<el-form-item label="安装时间:" prop="dateOfProduction">
<el-date-picker v-model="form.dateOfProduction" type="date" placeholder="选择日期"
class="selectWidth" value-format="yyyy-MM-dd" :disabled="nowOptionType == 2 ? true : false"
clearable>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/outboundLedger/index.vue
......@@ -31,7 +31,7 @@
<el-table-column label="出库类型" align="center" prop="outStockType" fixed="left" width="200" />
<el-table-column label="设备名称" align="center" prop="equipmentName" fixed="left" />
<el-table-column label="型号" align="center" prop="model" fixed="left" />
<el-table-column label="规格" align="center" prop="specification" fixed="left" />
<!-- <el-table-column label="规格" align="center" prop="specification" fixed="left" /> -->
<el-table-column label="分类编码" align="center" prop="classificationCode" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column align="center" prop="affiliationType" label="归属类型">
......@@ -44,7 +44,7 @@
<div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
</template>
</el-table-column>
<el-table-column label="投产日期" align="center" prop="dateOfProduction" width="200" />
<el-table-column label="安装时间" align="center" prop="dateOfProduction" width="200" />
<el-table-column label="价格（元）" align="center" prop="price" width="180" />
<el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" width="120px" />
<el-table-column label="地点" align="center" prop="place" />
......@@ -93,48 +93,48 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投产日期" prop="dateOfProduction">
<el-input v-model="outBoundForm.dateOfProduction" placeholder="请输入投产日期" disabled></el-input>
<el-form-item label="安装时间" prop="dateOfProduction">
<el-input v-model="outBoundForm.dateOfProduction" placeholder="请输入安装时间" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="规格" prop="specification">
<el-input v-model="outBoundForm.specification" placeholder="请输入规格" disabled></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="12">
<el-form-item label="价格（元）" prop="price">
<el-input v-model="outBoundForm.price" placeholder="请输入价格" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="分类编码" prop="classificationCode">
<el-input v-model="outBoundForm.classificationCode" placeholder="请输入分类编码" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="效用年限（年）" prop="lifeOfUtility">
<el-input v-model="outBoundForm.lifeOfUtility" placeholder="请输入效用年限" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="单位" prop="affiliationType">
<el-input v-model="outBoundForm.affiliationType" placeholder="请输入单位" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="使用人" prop="useName">
<el-input v-model="outBoundForm.useName" placeholder="请输入使用人" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="地点" prop="place">
<el-input v-model="outBoundForm.place" placeholder="请输入地点" disabled></el-input>
......@@ -148,6 +148,7 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
......@@ -36,7 +36,7 @@
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left" />
<el-table-column align="center" prop="model" label="型号" fixed="left" />
<el-table-column align="center" prop="classificationCode" label="分类编码" fixed="left" />
<el-table-column align="center" prop="dateOfProduction" label="投产日期" />
<el-table-column align="center" prop="dateOfProduction" label="安装时间" />
<el-table-column align="center" prop="place" label="地点" />
<el-table-column align="center" prop="problem" label="问题" />
<el-table-column align="center" prop="repairName" label="修理人" />
......@@ -121,7 +121,7 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="投产日期:" prop="dateOfProduction">
<el-form-item label="安装时间:" prop="dateOfProduction">
<el-date-picker v-model="postForm.dateOfProduction" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable :readonly="isReadOnly"
:disabled="nowType == 2 ? true : false"></el-date-picker>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/warehousingLedger/index.vue
......@@ -34,8 +34,8 @@
</el-table-column>
<el-table-column align="center" prop="model" label="型号" fixed="left">
</el-table-column>
<el-table-column align="center" prop="specification" label="规格">
</el-table-column>
<el-table-column align="center" prop="classificationCode" label="分类编码">
</el-table-column>
<el-table-column align="center" prop="unit" label="单位">
......@@ -50,7 +50,7 @@
<div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="投产日期" width="130">
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="130">
</el-table-column>
<el-table-column align="center" prop="price" label="价格（元）" width="100">
</el-table-column>
......@@ -124,59 +124,47 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="投产日期:" prop="dateOfProduction" style="width: 100%;">
<el-form-item label="安装时间:" prop="dateOfProduction" style="width: 100%;">
<el-date-picker v-model="form.dateOfProduction" type="date" placeholder="选择日期"
style="width: 100%;" value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="规格:" prop="specification">
<el-input v-model="form.specification" placeholder="请输入规格" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="价格（元）:" prop="price">
<el-input v-model="form.price" placeholder="请输入价格（元）" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="分类编码:" prop="classificationCode">
<el-input v-model="form.classificationCode" placeholder="请输入分类编码" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="效用年限（年）:" prop="lifeOfUtility">
<el-input v-model="form.lifeOfUtility" placeholder="请输入效用年限（年)" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="单位:" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="使用人:" prop="useName">
<el-input v-model="form.useName" placeholder="请输入使用人" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="备注:" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
......
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