This commit is contained in:
parent
692eb73f9b
commit
f50d405fbf
|
|
@ -35,7 +35,7 @@ export default {
|
|||
const first = matched[0]
|
||||
|
||||
if (!this.isDashboard(first)) {
|
||||
matched = [{ path: '/home/equipment-supply', meta: { title: '首页' }}].concat(matched)
|
||||
matched = [{ path: '/', meta: { title: '首页' }}].concat(matched)
|
||||
}
|
||||
|
||||
this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ export const constantRoutes = [
|
|||
{
|
||||
path: '',
|
||||
component: Layout,
|
||||
redirect: 'home/equipment-supply',
|
||||
redirect: 'index',
|
||||
children: [
|
||||
{
|
||||
path: 'home/equipment-supply',
|
||||
component: () => import('@/views/home/equipment-supply/index.vue'),
|
||||
path: '',
|
||||
component: () => import('@/views/index.vue'),
|
||||
name: 'Index',
|
||||
meta: { title: '首页', icon: 'dashboard', affix: true },
|
||||
hidden: true
|
||||
|
|
|
|||
|
|
@ -2,88 +2,7 @@
|
|||
<div class="app-container home">
|
||||
<el-row :gutter="20">
|
||||
<el-col :sm="24" :lg="12" style="padding-left: 20px">
|
||||
<h2>博诺思后台管理框架</h2>
|
||||
<p>
|
||||
<b>当前版本:</b> <span>v{{ version }}</span>
|
||||
</p>
|
||||
</el-col>
|
||||
<el-col :sm="24" :lg="12" style="padding-left: 50px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<h2>技术选型</h2>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<h4>后端技术</h4>
|
||||
<ul>
|
||||
<li>SpringBoot</li>
|
||||
<li>SpringCloud</li>
|
||||
<li>Nacos</li>
|
||||
<li>Sentinel</li>
|
||||
<li>Seata</li>
|
||||
<li>Minio</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<h4>前端技术</h4>
|
||||
<ul>
|
||||
<li>Vue</li>
|
||||
<li>Vuex</li>
|
||||
<li>Element-ui</li>
|
||||
<li>Axios</li>
|
||||
<li>Echarts</li>
|
||||
<li>Quill</li>
|
||||
<li>...</li>
|
||||
</ul>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-divider />
|
||||
<el-row :gutter="20">
|
||||
<el-col :xs="24" :sm="24" :md="12" :lg="8">
|
||||
<el-card class="update-log">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>联系信息</span>
|
||||
</div>
|
||||
<div class="body">
|
||||
<p>
|
||||
<i class="el-icon-s-promotion"></i> 官网:<el-link
|
||||
href="http://www.ahbonus.cn"
|
||||
target="_blank"
|
||||
>http://www.ahbonus.cn</el-link
|
||||
>
|
||||
</p>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="24" :md="12" :lg="8">
|
||||
<el-card class="update-log">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>更新日志</span>
|
||||
</div>
|
||||
<el-collapse accordion>
|
||||
<el-collapse-item title="v24.7.0">
|
||||
<ol>
|
||||
<li>支持多权限字符匹配角色数据权限</li>
|
||||
<li>新增密码最大错误次数/锁定时间</li>
|
||||
<li>登录日志新增解锁账户功能</li>
|
||||
</ol>
|
||||
</el-collapse-item>
|
||||
|
||||
<el-collapse-item title="v27.7.1">
|
||||
<ol>
|
||||
<li>菜单新增终端管理配置</li>
|
||||
<li>记录登录退出日志信息</li>
|
||||
<li>数据范围过滤属性调整</li>
|
||||
<li>权限部分代码调整</li>
|
||||
<li>其他细节优化</li>
|
||||
</ol>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</el-card>
|
||||
<h2>欢迎使用智能机具管理系统</h2>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
|
|
@ -91,19 +10,12 @@
|
|||
|
||||
<script>
|
||||
export default {
|
||||
name: "Index",
|
||||
name: 'Index',
|
||||
data() {
|
||||
return {
|
||||
// 版本号
|
||||
version: "24.7.1",
|
||||
};
|
||||
return {}
|
||||
},
|
||||
methods: {
|
||||
goTarget(href) {
|
||||
window.open(href, "_blank");
|
||||
},
|
||||
},
|
||||
};
|
||||
methods: {}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
|
|
@ -129,9 +41,9 @@ export default {
|
|||
margin: 0;
|
||||
}
|
||||
|
||||
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
color: #676a6c;
|
||||
color: #333;
|
||||
overflow-x: hidden;
|
||||
|
||||
ul {
|
||||
|
|
@ -169,4 +81,3 @@ export default {
|
|||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ export default {
|
|||
loading.close()
|
||||
// 跳转首页
|
||||
setTimeout(() => {
|
||||
this.$router.push({ path: '/home/equipment-supply' })
|
||||
this.$router.push({ path: '/' })
|
||||
}, 300)
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ created ~ error:', error)
|
||||
|
|
@ -342,7 +342,7 @@ export default {
|
|||
.confirm('账号已在其他地方登录是否继续登录!!!!')
|
||||
.then(function () {
|
||||
// return this.$router.push({ path: this.redirect || '/' })
|
||||
return this.$router.push({ path: '/home/equipment-supply' })
|
||||
return this.$router.push({ path: '/' })
|
||||
})
|
||||
.then(() => {
|
||||
this.loading = false
|
||||
|
|
@ -352,7 +352,7 @@ export default {
|
|||
})
|
||||
} else {
|
||||
// this.$router.push({ path: this.redirect || '/' })
|
||||
this.$router.push({ path: '/home/equipment-supply' })
|
||||
this.$router.push({ path: '/' })
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -225,7 +225,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<el-table :data="leaseApplyDetails" class="table" border style="width: 100%">
|
||||
<!-- <el-table :data="leaseApplyDetails" class="table" border style="width: 100%">
|
||||
<el-table-column label="序号" align="center" type="index" width="60px" />
|
||||
<el-table-column label="物资名称" align="center" prop="maTypeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeName" />
|
||||
|
|
@ -244,7 +244,36 @@
|
|||
<span v-if="scope.row.manageType == 1">数量出库</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-table> -->
|
||||
<table class="print-table" style="margin-top: 20px; width: 100%; border-collapse: collapse" border>
|
||||
<thead>
|
||||
<tr>
|
||||
<th align="center">序号</th>
|
||||
<th align="center">物资名称</th>
|
||||
<th align="center">规格型号</th>
|
||||
<th align="center">计量单位</th>
|
||||
<th align="center">领用数量</th>
|
||||
<th align="center">备注</th>
|
||||
<th align="center">出库方式</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item, index) in leaseApplyDetails" :key="index">
|
||||
<td align="center">{{ index + 1 }}</td>
|
||||
<td align="center">{{ item.maTypeName }}</td>
|
||||
<td align="center">{{ item.typeName }}</td>
|
||||
<td align="center">{{ item.unitName }}</td>
|
||||
<td align="center">{{ item.preNum }}</td>
|
||||
<td align="center">{{ item.remark }}</td>
|
||||
<td align="center">
|
||||
<span v-if="item.manageType == 0" style="color: blue; cursor: pointer" @click="codeInfo(item)">
|
||||
编码出库
|
||||
</span>
|
||||
<span v-if="item.manageType == 1">数量出库</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
|
||||
<div class="item" style="width: 23%; display: flex; align-items: center; flex-wrap: wrap">
|
||||
|
|
@ -324,12 +353,30 @@
|
|||
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px; margin-bottom: 20px">
|
||||
领料单编号明细
|
||||
</div>
|
||||
<el-table :data="getListViewInfo" style="padding: 1px">
|
||||
<!-- <el-table :data="getListViewInfo" style="padding: 1px">
|
||||
<el-table-column align="center" label="序号" type="index" width="55" />
|
||||
<el-table-column label="类型名称" align="center" prop="materialName" show-overflow-tooltip />
|
||||
<el-table-column label="规格型号" align="center" prop="typeName" show-overflow-tooltip />
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</el-table> -->
|
||||
<table class="print-table" style="margin-top: 20px; width: 100%; border-collapse: collapse" border>
|
||||
<thead>
|
||||
<tr>
|
||||
<th align="center" width="55">序号</th>
|
||||
<th align="center">类型名称</th>
|
||||
<th align="center">规格型号</th>
|
||||
<th align="center">设备编码</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item, index) in getListViewInfo" :key="index">
|
||||
<td align="center">{{ index + 1 }}</td>
|
||||
<td align="center">{{ item.materialName }}</td>
|
||||
<td align="center">{{ item.typeName }}</td>
|
||||
<td align="center">{{ item.maCode }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</vue-easy-print>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
|
|
@ -661,4 +708,12 @@ export default {
|
|||
width: 70px !important;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.print-table {
|
||||
table,
|
||||
th,
|
||||
td {
|
||||
border: 1.5px solid black;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@
|
|||
style="margin-bottom: 10px"
|
||||
type="primary"
|
||||
@click="handleOut(scope.row)"
|
||||
v-if="scope.row.taskStatus != 4 && scope.row.leaseSignUrl"
|
||||
v-if="scope.row.taskStatus != 4"
|
||||
>
|
||||
出库
|
||||
</el-button>
|
||||
|
|
@ -316,9 +316,9 @@
|
|||
</el-dialog>
|
||||
|
||||
<!-- 验收单弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="openPrint" width="1100px" append-to-body>
|
||||
<el-dialog :title="title" :visible.sync="openPrint" width="70%" append-to-body>
|
||||
<div style="height: 600px; overflow-y: scroll; padding: 0 20px">
|
||||
<!-- <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId'"> -->
|
||||
<vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId'">
|
||||
<div id="checkId">
|
||||
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px">
|
||||
施工机具设备出库检验记录表
|
||||
|
|
@ -334,7 +334,7 @@
|
|||
{{ checkDataInfo.leaseUnit }}
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
<!-- <el-table
|
||||
:data="printTableData"
|
||||
class="table"
|
||||
style="margin-top: 20px; width: 1000px; padding-bottom: 1px"
|
||||
|
|
@ -352,7 +352,41 @@
|
|||
<el-table-column label="下次试验日期" align="center" prop="nextTestTime" width="120px" />
|
||||
<el-table-column label="检验结论" align="center" prop="checkResult" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
</el-table>
|
||||
</el-table> -->
|
||||
<table class="print-table" style="margin-top: 20px; width: 100%;border-collapse: collapse" border="1">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="text-align: center;">机具名称</th>
|
||||
<th style="text-align: center;">规格型号</th>
|
||||
<th style="text-align: center;">单位</th>
|
||||
<th style="text-align: center;">数量</th>
|
||||
<th style="text-align: center;">设备编码</th>
|
||||
<th style="text-align: center;">额定载荷KN</th>
|
||||
<th style="text-align: center;">试验载荷KN</th>
|
||||
<th style="text-align: center;">持荷时间min</th>
|
||||
<th style="text-align: center;width: 100px">试验日期</th>
|
||||
<th style="text-align: center;width: 100px">下次试验日期</th>
|
||||
<th style="text-align: center;">检验结论</th>
|
||||
<th style="text-align: center;">备注</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item, index) in printTableData" :key="index">
|
||||
<td style="text-align: center;">{{ item.typeName }}</td>
|
||||
<td style="text-align: center;">{{ item.typeModelName }}</td>
|
||||
<td style="text-align: center;">{{ item.unit }}</td>
|
||||
<td style="text-align: center;">{{ item.num }}</td>
|
||||
<td style="text-align: center;">{{ item.maCode }}</td>
|
||||
<td style="text-align: center;">{{ item.ratedLoad }}</td>
|
||||
<td style="text-align: center;">{{ item.testLoad }}</td>
|
||||
<td style="text-align: center;">{{ item.holdingTime }}</td>
|
||||
<td style="text-align: center;">{{ item.testTime }}</td>
|
||||
<td style="text-align: center;">{{ item.nextTestTime }}</td>
|
||||
<td style="text-align: center;">{{ item.checkResult }}</td>
|
||||
<td style="text-align: center;">{{ item.remark }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div
|
||||
class="fillIn"
|
||||
|
|
@ -379,7 +413,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- </vue-easy-print> -->
|
||||
</vue-easy-print>
|
||||
</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
|
|
@ -416,7 +450,7 @@
|
|||
{{ leaseApplyData.code }}
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px; padding: 1px">
|
||||
<!-- <el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px; padding: 1px">
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column label="物资名称" align="center" prop="maTypeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeName" />
|
||||
|
|
@ -431,7 +465,36 @@
|
|||
<span v-if="scope.row.manageType == 1">数量出库</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-table> -->
|
||||
<table class="print-table" style="margin-top: 20px; width: 100%;border-collapse: collapse" border>
|
||||
<thead>
|
||||
<tr>
|
||||
<th align="center">序号</th>
|
||||
<th align="center">物资名称</th>
|
||||
<th align="center">规格型号</th>
|
||||
<th align="center">计量单位</th>
|
||||
<th align="center">领用数量</th>
|
||||
<th align="center">备注</th>
|
||||
<th align="center">出库方式</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item, index) in leaseApplyDetails" :key="index">
|
||||
<td align="center">{{ index + 1 }}</td>
|
||||
<td align="center">{{ item.maTypeName }}</td>
|
||||
<td align="center">{{ item.typeName }}</td>
|
||||
<td align="center">{{ item.unitName }}</td>
|
||||
<td align="center">{{ item.preNum }}</td>
|
||||
<td align="center">{{ item.remark }}</td>
|
||||
<td align="center">
|
||||
<span v-if="item.manageType == 0" style="color: blue;cursor: pointer" @click="codeInfo(item)">
|
||||
编码出库
|
||||
</span>
|
||||
<span v-if="item.manageType == 1">数量出库</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="fillIn" style="margin-top: 30px; display: flex; justify-content: space-between">
|
||||
<div class="item" style="width: 24%; display: flex; align-items: center; flex-wrap: wrap">
|
||||
<div style="width: 30%">审核:</div>
|
||||
|
|
@ -528,7 +591,7 @@
|
|||
>
|
||||
领料单编号明细
|
||||
</div>
|
||||
<el-table :data="getListViewInfo" width="600px" height="450">
|
||||
<!-- <el-table :data="getListViewInfo" width="600px" height="450">
|
||||
<el-table-column align="center" label="序号" type="index" width="55" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
|
|
@ -543,7 +606,25 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
|
||||
</el-table>
|
||||
</el-table> -->
|
||||
<table class="print-table" style="margin-top: 20px; width: 100%; border-collapse: collapse" border>
|
||||
<thead>
|
||||
<tr>
|
||||
<th align="center" width="55">序号</th>
|
||||
<th align="center">类型名称</th>
|
||||
<th align="center">规格型号</th>
|
||||
<th align="center">设备编码</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(item, index) in getListViewInfo" :key="index">
|
||||
<td align="center">{{ index + 1 }}</td>
|
||||
<td align="center">{{ item.materialName }}</td>
|
||||
<td align="center">{{ item.typeName }}</td>
|
||||
<td align="center">{{ item.maCode }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</vue-easy-print>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
|
|
@ -949,12 +1030,13 @@ export default {
|
|||
|
||||
//出库检验单打印
|
||||
printCheck() {
|
||||
printJS({
|
||||
printable: 'checkId',
|
||||
type: 'html',
|
||||
targetStyles: ['*']
|
||||
// 其他配置选项
|
||||
})
|
||||
this.$refs.remarksPrintRefCheck.print()
|
||||
// printJS({
|
||||
// printable: 'checkId',
|
||||
// type: 'html',
|
||||
// targetStyles: ['*']
|
||||
// // 其他配置选项
|
||||
// })
|
||||
},
|
||||
|
||||
//领料单打印
|
||||
|
|
@ -1116,4 +1198,12 @@ export default {
|
|||
.is-rotate {
|
||||
transform: rotate(-90deg);
|
||||
}
|
||||
.print-table {
|
||||
table,
|
||||
th,
|
||||
td {
|
||||
border: 1.5px solid black;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@
|
|||
<el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" min-width="55" align="center" :selectable="selectable" />
|
||||
<el-table-column label="序号" type="index" align="center" min-width="80" />
|
||||
<el-table-column label="类型名称" align="center" prop="maTypeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="类型名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="计量单位" align="center" prop="unitName" />
|
||||
<el-table-column label="当前在用量" align="center" prop="num"></el-table-column>
|
||||
|
|
@ -627,10 +627,10 @@ export default {
|
|||
this.queryParams = data.backApplyInfo
|
||||
this.equipmentList = data.backApplyDetailsList
|
||||
this.equipmentList.forEach(item => {
|
||||
item.tempMaCodeList = item.maCodeList
|
||||
const temp = item.typeName
|
||||
item.typeName = item.materialName
|
||||
item.typeModel = temp
|
||||
item.tempMaCodeList = item.maCodeList || item.maCodeVoList || []
|
||||
// const temp = item.typeName
|
||||
// item.typeName = item.materialName
|
||||
// item.typeModel = temp
|
||||
})
|
||||
this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
|
||||
},
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@
|
|||
<tr v-for="(row, index) in tableData" :key="index" align="center">
|
||||
<td>{{ index + 1 }}</td>
|
||||
<td :title="row.materialType">{{ row.materialType }}</td>
|
||||
<td :title="row.materialType">{{ row.materialType }}</td>
|
||||
<td :title="row.materialName">{{ row.materialName }}</td>
|
||||
<td :title="row.typeName">{{ row.typeName }}</td>
|
||||
<td :title="row.unitName">{{ row.unitName }}</td>
|
||||
<td>{{ row.preNum }}</td>
|
||||
|
|
|
|||
|
|
@ -119,100 +119,6 @@
|
|||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 出库检验单弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="openPrint" width="1090px" append-to-body>
|
||||
<div style="height: 600px; overflow-y: scroll; padding: 0 20px">
|
||||
<!-- <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId'"> -->
|
||||
<div id="checkId">
|
||||
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px">
|
||||
施工机具设备出库检验记录表
|
||||
</div>
|
||||
<div class="info" style="margin-top: 10px; display: flex; align-items: center">
|
||||
<div class="item" style="width: 60%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
|
||||
<span>领用工程:</span>
|
||||
{{ checkDataInfo.leaseProject }}
|
||||
</div>
|
||||
<div class="item" style="width: 40%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
|
||||
<span>使用单位:</span>
|
||||
{{ checkDataInfo.leaseUnit }}
|
||||
</div>
|
||||
</div>
|
||||
<!-- <el-table :data="printTableData" class="table" style="margin-top: 20px; width: 100%" border>
|
||||
<el-table-column label="机具名称" align="center" prop="typeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" />
|
||||
<el-table-column label="单位" align="center" prop="unit" width="40px" />
|
||||
<el-table-column label="数量" align="center" prop="num" width="40px" />
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" />
|
||||
<el-table-column label="额定载荷KN" align="center" prop="ratedLoad" width="80px" />
|
||||
<el-table-column label="试验载荷KN" align="center" prop="testLoad" width="80px" />
|
||||
<el-table-column label="持荷时间min" align="center" prop="holdingTime" width="80px" />
|
||||
<el-table-column label="试验日期" align="center" prop="testTime" width="120px" />
|
||||
<el-table-column label="下次试验日期" align="center" prop="nextTestTime" width="120px" />
|
||||
<el-table-column label="检验结论" align="center" prop="checkResult" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
</el-table> -->
|
||||
|
||||
<table border="1" style="width: 100%; margin-top: 20px">
|
||||
<thead>
|
||||
<tr align="center">
|
||||
<th>机具名称</th>
|
||||
<th>规格型号</th>
|
||||
<th width="40px">单位</th>
|
||||
<th width="40px">数量</th>
|
||||
<th>设备编码</th>
|
||||
<th width="80px">额定载荷KN</th>
|
||||
<th width="80px">试验载荷KN</th>
|
||||
<th width="80px">持荷时间min</th>
|
||||
<th width="120px">试验日期</th>
|
||||
<th width="120px">下次试验日期</th>
|
||||
<th>检验结论</th>
|
||||
<th>备注</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="(row, index) in printTableData" :key="index" align="center">
|
||||
<td :title="row.typeName">{{ row.typeName }}</td>
|
||||
<td :title="row.typeModelName">{{ row.typeModelName }}</td>
|
||||
<td>{{ row.unit }}</td>
|
||||
<td>{{ row.num }}</td>
|
||||
<td :title="row.maCode">{{ row.maCode }}</td>
|
||||
<td>{{ row.ratedLoad }}</td>
|
||||
<td>{{ row.testLoad }}</td>
|
||||
<td>{{ row.holdingTime }}</td>
|
||||
<td>{{ row.testTime }}</td>
|
||||
<td>{{ row.nextTestTime }}</td>
|
||||
<td>{{ row.checkResult }}</td>
|
||||
<td :title="row.remark">{{ row.remark }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="fillIn" style="margin-top: 20px; display: flex; align-items: center; justify-content: right">
|
||||
<div class="item" style="width: 30%; align-items: center; position: relative">
|
||||
<div>
|
||||
<span>检验单位:</span>
|
||||
</div>
|
||||
<div>
|
||||
<canvas
|
||||
id="canvas"
|
||||
width="165"
|
||||
height="165"
|
||||
style="position: absolute; top: 50%; left: 90%; transform: translate(-100%, -50%); z-index: 9999"
|
||||
></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- </vue-easy-print> -->
|
||||
</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="handleExportCheck">导出</el-button>
|
||||
<el-button type="primary" @click="printCheck">打 印</el-button>
|
||||
<el-button @click="closeDialogAndRefresh">关 闭</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 领料单弹窗 -->
|
||||
<el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
|
||||
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
|
||||
|
|
@ -260,7 +166,7 @@
|
|||
<th>类型名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>预领数量</th>
|
||||
<th>领料数量</th>
|
||||
<th>备注</th>
|
||||
<th>出库方式</th>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -603,7 +603,7 @@ export default {
|
|||
this.equipmentList.forEach(item => {
|
||||
// item.preNum = item.preNum || 0
|
||||
item.outNum = item.preNum || 0
|
||||
item.maCodeList = item.maCodeList || []
|
||||
item.maCodeList = item.maCodeList || item.maCodeVoList || []
|
||||
})
|
||||
this.parentId = this.equipmentList[0].parentId
|
||||
console.log('🚀 ~ awaitgetApplyInfo ~ this.parentId:', this.parentId)
|
||||
|
|
|
|||
|
|
@ -111,65 +111,6 @@
|
|||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 出库检验单弹窗 -->
|
||||
<el-dialog :title="title" :visible.sync="openPrint" width="1090px" append-to-body>
|
||||
<div style="height: 600px; overflow-y: scroll; padding: 0 20px">
|
||||
<!-- <vue-easy-print tableShow ref="remarksPrintRefCheck" class="print" :printable="'checkId'"> -->
|
||||
<div id="checkId">
|
||||
<div class="title" style="text-align: center; font-weight: 600; font-size: 16px">
|
||||
施工机具设备出库检验记录表
|
||||
</div>
|
||||
<div class="info" style="margin-top: 10px; display: flex; align-items: center">
|
||||
<div class="item" style="width: 60%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
|
||||
<span>领用工程:</span>
|
||||
{{ checkDataInfo.leaseProject }}
|
||||
</div>
|
||||
<div class="item" style="width: 40%; flex-shrink: 0; margin-bottom: 5px; font-size: 14px">
|
||||
<span>使用单位:</span>
|
||||
{{ checkDataInfo.leaseUnit }}
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="printTableData" class="table" style="margin-top: 20px; width: 100%" border>
|
||||
<el-table-column label="机具名称" align="center" prop="typeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" />
|
||||
<el-table-column label="单位" align="center" prop="unit" width="40px" />
|
||||
<el-table-column label="数量" align="center" prop="num" width="40px" />
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" />
|
||||
<el-table-column label="额定载荷KN" align="center" prop="ratedLoad" width="80px" />
|
||||
<el-table-column label="试验载荷KN" align="center" prop="testLoad" width="80px" />
|
||||
<el-table-column label="持荷时间min" align="center" prop="holdingTime" width="80px" />
|
||||
<el-table-column label="试验日期" align="center" prop="testTime" width="120px" />
|
||||
<el-table-column label="下次试验日期" align="center" prop="nextTestTime" width="120px" />
|
||||
<el-table-column label="检验结论" align="center" prop="checkResult" />
|
||||
<el-table-column label="备注" align="center" prop="remark" />
|
||||
</el-table>
|
||||
|
||||
<div class="fillIn" style="margin-top: 20px; display: flex; align-items: center; justify-content: right">
|
||||
<div class="item" style="width: 30%; align-items: center; position: relative">
|
||||
<div>
|
||||
<span>检验单位:</span>
|
||||
</div>
|
||||
<div>
|
||||
<canvas
|
||||
id="canvas"
|
||||
width="165"
|
||||
height="165"
|
||||
style="position: absolute; top: 50%; left: 90%; transform: translate(-100%, -50%); z-index: 9999"
|
||||
></canvas>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- </vue-easy-print> -->
|
||||
</div>
|
||||
|
||||
<div slot="footer" class="dialog-footer" style="text-align: center">
|
||||
<el-button type="primary" @click="handleExportCheck">导出</el-button>
|
||||
<el-button type="primary" @click="printCheck">打 印</el-button>
|
||||
<el-button @click="closeDialogAndRefresh">关 闭</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 领料单弹窗 -->
|
||||
<el-dialog :visible.sync="open" width="800px" :title="title" append-to-body>
|
||||
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
|
||||
|
|
@ -216,7 +157,7 @@
|
|||
<th>类型名称</th>
|
||||
<th>规格型号</th>
|
||||
<th>计量单位</th>
|
||||
<th>预领数量</th>
|
||||
<th>领料数量</th>
|
||||
<th>备注</th>
|
||||
<th>出库方式</th>
|
||||
</tr>
|
||||
|
|
|
|||
|
|
@ -77,8 +77,8 @@ export default {
|
|||
};
|
||||
},
|
||||
created() {
|
||||
this.confirmPassword();
|
||||
//this.getUser();
|
||||
// this.confirmPassword();
|
||||
this.getUser()
|
||||
},
|
||||
methods: {
|
||||
getUser() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue