机具类型字段修改
This commit is contained in:
BianLzhaoMin
parent
78d6b4b2ad
commit
407faaa979
|
|
@ -1,50 +1,57 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
v-dialogDrag
|
||||
v-loading.fullscreen.lock="fullscreenLoading"
|
||||
:before-close="cancel"
|
||||
:title="dialogTitle"
|
||||
:visible.sync="dialogShowFlag"
|
||||
append-to-body
|
||||
width="800px"
|
||||
>
|
||||
<div id="printcontent" style="height: 500px;overflow-y: scroll;padding: 0 20px;">
|
||||
<vue-easy-print tableShow ref="printRef">
|
||||
<div class="order_box">
|
||||
<div class="order_box_one">
|
||||
<div>
|
||||
<span>工程名称：</span>
|
||||
<span>{{ rowObj.lotName }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>退料时间：</span>
|
||||
<span>{{ rowObj.backTime }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="order_box_one">
|
||||
<div>
|
||||
<span>退料单位：</span>
|
||||
<span>{{ rowObj.unitName }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>编号：</span>
|
||||
<span>{{ rowObj.code }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
|
||||
<el-table-column label="编号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column type="expand">
|
||||
<el-dialog
|
||||
v-dialogDrag
|
||||
v-loading.fullscreen.lock="fullscreenLoading"
|
||||
:before-close="cancel"
|
||||
:title="dialogTitle"
|
||||
:visible.sync="dialogShowFlag"
|
||||
append-to-body
|
||||
width="800px"
|
||||
>
|
||||
<div
|
||||
id="printcontent"
|
||||
style="height: 500px; overflow-y: scroll; padding: 0 20px"
|
||||
>
|
||||
<vue-easy-print tableShow ref="printRef">
|
||||
<div class="order_box">
|
||||
<div class="order_box_one">
|
||||
<div>
|
||||
<span>工程名称：</span>
|
||||
<span>{{ rowObj.lotName }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>退料时间：</span>
|
||||
<span>{{ rowObj.backTime }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="order_box_one">
|
||||
<div>
|
||||
<span>退料单位：</span>
|
||||
<span>{{ rowObj.unitName }}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>编号：</span>
|
||||
<span>{{ rowObj.code }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
style="width: 100%; margin-bottom: 10px; padding: 2px"
|
||||
>
|
||||
<el-table-column label="编号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<div class="nested-table-container">
|
||||
<el-table :data="scope.row.maTypeDetails" style="width: 100%">
|
||||
<!-- 子表格的列 -->
|
||||
|
||||
<el-table-column label="序号" align="center" width="60" type="index"/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
|
|
@ -73,21 +80,21 @@
|
|||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeCode"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="退料数量"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
width="200"
|
||||
prop="num"
|
||||
></el-table-column>
|
||||
<!-- <el-table-column prop="remarks" label="备注" align="center">
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeCode"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="退料数量"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
width="200"
|
||||
prop="num"
|
||||
></el-table-column>
|
||||
<!-- <el-table-column prop="remarks" label="备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span
|
||||
@click="remarksClick"
|
||||
|
|
@ -96,158 +103,192 @@
|
|||
>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
</el-table>
|
||||
<div class="order_footer">
|
||||
<div>审核：</div>
|
||||
<div>退料：</div>
|
||||
<div>操作人：</div>
|
||||
</el-table>
|
||||
<div class="order_footer">
|
||||
<div>审核：</div>
|
||||
<div>退料：</div>
|
||||
<div>操作人：</div>
|
||||
</div>
|
||||
</vue-easy-print>
|
||||
<div>
|
||||
<el-button type="primary" @click="print">打印</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</vue-easy-print>
|
||||
<div>
|
||||
<el-button type="primary" @click="print">打印</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
||||
<div style="height: 500px;overflow-y: scroll;padding: 0 20px;">
|
||||
<vue-easy-print tableShow ref="remarksPrintRef">
|
||||
<div class="remarks_box">
|
||||
<div class="remarks_box_title">退料编码明细</div>
|
||||
</div>
|
||||
<el-table :data="tableData" border style="width: 100%;margin-bottom: 10px;padding: 2px;">
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column prop="name" label="名称" align="center"></el-table-column>
|
||||
<el-table-column prop="type" label="规格型号" align="center"></el-table-column>
|
||||
<el-table-column prop="unit" label="单位" align="center"></el-table-column>
|
||||
<el-table-column prop="number" label="数量" align="center"></el-table-column>
|
||||
</el-table>
|
||||
</vue-easy-print>
|
||||
</div>
|
||||
<div style="margin-top: 10px">
|
||||
<el-button type="primary" @click="remarksPrint">打印1</el-button>
|
||||
</div>
|
||||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
width="800px"
|
||||
append-to-body
|
||||
>
|
||||
<div style="height: 500px; overflow-y: scroll; padding: 0 20px">
|
||||
<vue-easy-print tableShow ref="remarksPrintRef">
|
||||
<div class="remarks_box">
|
||||
<div class="remarks_box_title">退料编码明细</div>
|
||||
</div>
|
||||
<el-table
|
||||
:data="tableData"
|
||||
border
|
||||
style="width: 100%; margin-bottom: 10px; padding: 2px"
|
||||
>
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="名称"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="type"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="unit"
|
||||
label="单位"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="number"
|
||||
label="数量"
|
||||
align="center"
|
||||
></el-table-column>
|
||||
</el-table>
|
||||
</vue-easy-print>
|
||||
</div>
|
||||
<div style="margin-top: 10px">
|
||||
<el-button type="primary" @click="remarksPrint"
|
||||
>打印1</el-button
|
||||
>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</el-dialog>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import vueEasyPrint from 'vue-easy-print'
|
||||
import { getViewByApply, materialReturnNoteByExamine } from '@/api/claimAndRefund/return.js'
|
||||
import {
|
||||
getViewByApply,
|
||||
materialReturnNoteByExamine,
|
||||
} from '@/api/claimAndRefund/return.js'
|
||||
export default {
|
||||
components: { vueEasyPrint },
|
||||
props: {
|
||||
// 弹窗是否显示
|
||||
isShowFlag: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
components: { vueEasyPrint },
|
||||
props: {
|
||||
// 弹窗是否显示
|
||||
isShowFlag: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
// 对应操作数据键值
|
||||
priKey: {
|
||||
type: [String, Number],
|
||||
default: '',
|
||||
},
|
||||
//弹窗标题
|
||||
dialogTitle: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
rowObj: {
|
||||
type: Object,
|
||||
default: {},
|
||||
},
|
||||
},
|
||||
// 对应操作数据键值
|
||||
priKey: {
|
||||
type: [String, Number],
|
||||
default: '',
|
||||
watch: {
|
||||
isShowFlag(val) {
|
||||
if (val) {
|
||||
this.init()
|
||||
}
|
||||
},
|
||||
},
|
||||
//弹窗标题
|
||||
dialogTitle: {
|
||||
type: String,
|
||||
default: '',
|
||||
computed: {
|
||||
dialogShowFlag: {
|
||||
get() {
|
||||
return this.isShowFlag
|
||||
},
|
||||
set(v) {
|
||||
this.$emit('update:isShowFlag', v)
|
||||
},
|
||||
},
|
||||
},
|
||||
rowObj: {
|
||||
type: Object,
|
||||
default: {},
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
isShowFlag(val) {
|
||||
if (val) {
|
||||
this.init()
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
dialogShowFlag: {
|
||||
get() {
|
||||
return this.isShowFlag
|
||||
},
|
||||
set(v) {
|
||||
this.$emit('update:isShowFlag', v)
|
||||
},
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
fullscreenLoading: false,
|
||||
tableData: [],
|
||||
open: false,
|
||||
title: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
let params = {
|
||||
taskId: this.rowObj.taskId,
|
||||
agreementId: this.rowObj.agreementId,
|
||||
badId: this.rowObj.badId,
|
||||
}
|
||||
materialReturnNoteByExamine(params).then(res => {
|
||||
this.tableData = res.data
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.dialogShowFlag = false
|
||||
},
|
||||
print() {
|
||||
this.$refs.printRef.print()
|
||||
},
|
||||
remarksClick() {
|
||||
this.title = '查看'
|
||||
this.open = true
|
||||
},
|
||||
remarksPrint() {
|
||||
this.$refs.remarksPrintRef.print()
|
||||
data() {
|
||||
return {
|
||||
fullscreenLoading: false,
|
||||
tableData: [],
|
||||
open: false,
|
||||
title: '',
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
let params = {
|
||||
taskId: this.rowObj.taskId,
|
||||
agreementId: this.rowObj.agreementId,
|
||||
badId: this.rowObj.badId,
|
||||
}
|
||||
materialReturnNoteByExamine(params).then((res) => {
|
||||
this.tableData = res.data
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.dialogShowFlag = false
|
||||
},
|
||||
print() {
|
||||
this.$refs.printRef.print()
|
||||
},
|
||||
remarksClick() {
|
||||
this.title = '查看'
|
||||
this.open = true
|
||||
},
|
||||
remarksPrint() {
|
||||
this.$refs.remarksPrintRef.print()
|
||||
},
|
||||
|
||||
// submit() {
|
||||
// this.$refs["dynamicValidateForm"].validate(valid => {
|
||||
// console.log("valid", valid);
|
||||
// if (valid) {
|
||||
// console.log("11111");
|
||||
// this.cancel();
|
||||
// } else {
|
||||
// return false;
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
},
|
||||
// submit() {
|
||||
// this.$refs["dynamicValidateForm"].validate(valid => {
|
||||
// console.log("valid", valid);
|
||||
// if (valid) {
|
||||
// console.log("11111");
|
||||
// this.cancel();
|
||||
// } else {
|
||||
// return false;
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.order_box {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.order_box_one {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-content: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
:last-child {
|
||||
margin-right: 20px;
|
||||
flex-direction: column;
|
||||
.order_box_one {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-content: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 10px;
|
||||
:last-child {
|
||||
margin-right: 20px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.order_footer {
|
||||
margin-top: 10px;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
margin-top: 10px;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
align-items: center;
|
||||
}
|
||||
.remarks_box {
|
||||
display: flex;
|
||||
// align-items: center;
|
||||
justify-content: center;
|
||||
.remarks_box_title {
|
||||
margin-bottom: 10px;
|
||||
display: flex;
|
||||
// align-items: center;
|
||||
justify-content: center;
|
||||
.remarks_box_title {
|
||||
margin-bottom: 10px;
|
||||
|
||||
font-size: 18px;
|
||||
}
|
||||
font-size: 18px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择类型名称"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -48,10 +48,10 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择类型名称"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@
|
|||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择类型名称"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -162,7 +162,7 @@
|
|||
v-if="leaseType == 0"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
key="4"
|
||||
prop="typeName"
|
||||
|
|
@ -275,10 +275,10 @@
|
|||
:rules="rules"
|
||||
label-width="120px"
|
||||
>
|
||||
<el-form-item label="类型名称:" prop="typeName">
|
||||
<el-form-item label="机具名称:" prop="typeName">
|
||||
<el-input
|
||||
v-model="form.typeName"
|
||||
placeholder="请输入类型名称"
|
||||
placeholder="请输入机具名称"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -349,10 +349,10 @@
|
|||
:rules="nrules"
|
||||
label-width="120px"
|
||||
>
|
||||
<el-form-item label="类型名称:" prop="typeName">
|
||||
<el-form-item label="机具名称:" prop="typeName">
|
||||
<el-input
|
||||
v-model="nform.typeName"
|
||||
placeholder="请输入类型名称"
|
||||
placeholder="请输入机具名称"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -474,7 +474,7 @@
|
|||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -72,9 +72,9 @@
|
|||
style="width: 240px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="物品类型" prop="status">
|
||||
<el-form-item label="规格型号" prop="status">
|
||||
<el-cascader
|
||||
placeholder="请输入物品类型"
|
||||
placeholder="请输入规格型号"
|
||||
:options="deviceTypeTree"
|
||||
:props="deviceTypeTreeProps"
|
||||
v-model="deviceType"
|
||||
|
|
@ -180,7 +180,7 @@
|
|||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column label="序号" type="index" width="80" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
prop="typeCn"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 240px"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -88,19 +88,18 @@
|
|||
<!-- <el-table-column type="selection" width="55" align="center" />-->
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column type="expand">
|
||||
<!-- <el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<div class="nested-table-container">
|
||||
<el-table
|
||||
:data="scope.row.maTypeDetails"
|
||||
style="width: 100%"
|
||||
>
|
||||
<!-- 子表格的列 -->
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
|
|
@ -133,7 +132,7 @@
|
|||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@
|
|||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@
|
|||
style="width: 240px"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="物品类型" prop="status">
|
||||
<el-form-item label="规格型号" prop="status">
|
||||
<el-cascader
|
||||
placeholder="请输入物品类型"
|
||||
placeholder="规格型号"
|
||||
:options="deviceTypeTree"
|
||||
:props="deviceTypeTreeProps"
|
||||
v-model="deviceType"
|
||||
|
|
@ -156,7 +156,7 @@
|
|||
/>
|
||||
<el-table-column label="序号" type="index" min-width="120" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
prop="typeName"
|
||||
min-width="200"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -440,26 +440,25 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column type="expand">
|
||||
<!-- <el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<div class="nested-table-container">
|
||||
<el-table
|
||||
:data="scope.row.maTypeDetails"
|
||||
style="width: 100%"
|
||||
>
|
||||
<!-- 子表格的列 -->
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
type="index"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -485,7 +484,7 @@
|
|||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
/>
|
||||
</el-form-item>-->
|
||||
|
||||
<el-form-item label="类型名称" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择类型名称"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -99,19 +99,19 @@
|
|||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column type="expand" v-if="isPlural">
|
||||
<!-- <el-table-column type="expand" v-if="isPlural">
|
||||
<template slot-scope="scope">
|
||||
<div class="nested-table-container">
|
||||
<el-table
|
||||
:data="scope.row.maTypeDetails"
|
||||
style="width: 100%"
|
||||
>
|
||||
<!-- 子表格的列 -->
|
||||
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
|
|
@ -536,7 +536,7 @@
|
|||
<el-table v-loading="loading" :data="numList" height="500">
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@
|
|||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="退料机具"
|
||||
label="退料规格型号"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
show-overflow-tooltip
|
||||
|
|
@ -258,7 +258,7 @@
|
|||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
<script>
|
||||
import {
|
||||
getBackAuditList,
|
||||
getViewByExamine,
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ export default {
|
|||
return {
|
||||
// 结算清单配置项
|
||||
settleTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'typeName', t_label: '机具名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'num', t_label: '数量' },
|
||||
|
|
@ -146,7 +146,7 @@ export default {
|
|||
],
|
||||
// 维修清单配置项
|
||||
repairTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'typeName', t_label: '机具名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'partName', t_label: '维修配件名称' },
|
||||
|
|
@ -159,7 +159,7 @@ export default {
|
|||
],
|
||||
// 未还赔偿清单配置项
|
||||
noReturnTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'typeName', t_label: '机具名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'maCode', t_label: '设备编码' },
|
||||
|
|
@ -169,7 +169,7 @@ export default {
|
|||
],
|
||||
// 报废清单单配置项
|
||||
scrapTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'typeName', t_label: '机具名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'maCode', t_label: '设备编码' },
|
||||
|
|
@ -179,7 +179,7 @@ export default {
|
|||
],
|
||||
// 待报废清单配置项
|
||||
stayScrapTableColumns: [
|
||||
{ t_prop: 'typeName', t_label: '设备名称' },
|
||||
{ t_prop: 'typeName', t_label: '机具名称' },
|
||||
{ t_prop: 'modelName', t_label: '规格型号' },
|
||||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'maCode', t_label: '设备编码' },
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@
|
|||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="typeName">
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
<!-- <treeselect
|
||||
style="width: 250px"
|
||||
v-model="dialogQueryParams.typeName"
|
||||
|
|
@ -377,7 +377,7 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="machineTypeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -500,7 +500,8 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(scrapRecordParams.pageNum - 1) * scrapRecordParams.pageSize +
|
||||
(scrapRecordParams.pageNum - 1) *
|
||||
scrapRecordParams.pageSize +
|
||||
scope.$index +
|
||||
1
|
||||
}}</span>
|
||||
|
|
|
|||
|
|
@ -160,7 +160,12 @@
|
|||
@selection-change="handleSelectionChange"
|
||||
border
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="disabledSelection"/>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="disabledSelection"
|
||||
/>
|
||||
<!-- <el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
|
|
@ -288,7 +293,7 @@
|
|||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="typeName">
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
<selectTree
|
||||
ref="mychildDialog"
|
||||
style="width: 240px"
|
||||
|
|
@ -301,7 +306,7 @@
|
|||
:defaultSelect="true"
|
||||
:defaultData="defaultData"
|
||||
:clearable="true"
|
||||
:placeholder="'请选择类型名称'"
|
||||
:placeholder="'请选择机具名称'"
|
||||
@handleNodeClick="selectDropDialog"
|
||||
></selectTree>
|
||||
</el-form-item>
|
||||
|
|
@ -378,14 +383,15 @@
|
|||
>
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(dialogQueryParams.pageNum - 1) * dialogQueryParams.pageSize +
|
||||
(dialogQueryParams.pageNum - 1) *
|
||||
dialogQueryParams.pageSize +
|
||||
scope.$index +
|
||||
1
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -451,7 +457,10 @@
|
|||
width="300px"
|
||||
v-if="type == 'update'"
|
||||
>
|
||||
<template slot-scope="scope" v-if="scope.row.status !== '1'">
|
||||
<template
|
||||
slot-scope="scope"
|
||||
v-if="scope.row.status !== '1'"
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
|
|
|
|||
|
|
@ -172,7 +172,9 @@
|
|||
align="center"
|
||||
width="80"
|
||||
type="index"
|
||||
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
|
||||
:index="
|
||||
indexContinuation(queryParams.pageNum, queryParams.pageSize)
|
||||
"
|
||||
>
|
||||
<!-- <template slot-scope="scope">
|
||||
<span>{{
|
||||
|
|
@ -291,7 +293,7 @@
|
|||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="typeName">
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
<!-- <treeselect
|
||||
style="width: 250px"
|
||||
v-model="dialogQueryParams.typeName"
|
||||
|
|
@ -388,7 +390,7 @@
|
|||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="machineTypeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -154,7 +154,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="机具规格"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeModelName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 240px"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
@ -106,7 +107,7 @@
|
|||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="机具类型"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 240px"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="机具规格"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeModelName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
style="width: 240px"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
|
|
@ -170,7 +171,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格名称"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeModelName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物品种类" prop="itemId">
|
||||
<el-form-item label="类型名称" prop="itemId">
|
||||
<el-select
|
||||
v-model="queryParams.itemId"
|
||||
placeholder="请选择物品种类"
|
||||
placeholder="请选择类型名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -37,10 +37,10 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="设备类型" prop="deviceId">
|
||||
<el-form-item label="机具名称" prop="deviceId">
|
||||
<el-select
|
||||
v-model="queryParams.deviceId"
|
||||
placeholder="请选择设备类型"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -144,9 +144,9 @@
|
|||
indexContinuation(queryParams.pageNum, queryParams.pageSize)
|
||||
"
|
||||
/>
|
||||
<el-table-column label="物品种类" align="center" prop="itemType" />
|
||||
<el-table-column label="类型名称" align="center" prop="itemType" />
|
||||
<el-table-column
|
||||
label="设备类型"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="deviceType"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -265,19 +265,19 @@
|
|||
>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="物品种类" prop="itemType">
|
||||
<el-form-item label="类型名称" prop="itemType">
|
||||
<el-input
|
||||
v-model="form.itemType"
|
||||
placeholder="请输入物品种类"
|
||||
placeholder="请输入类型名称"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="设备类型" prop="deviceType">
|
||||
<el-form-item label="机具名称" prop="deviceType">
|
||||
<el-input
|
||||
v-model="form.deviceType"
|
||||
placeholder="请输入设备类型"
|
||||
placeholder="请输入机具名称"
|
||||
disabled
|
||||
/>
|
||||
</el-form-item>
|
||||
|
|
@ -736,7 +736,8 @@ export default {
|
|||
const maId = row.maId || this.ids
|
||||
getMachine(maId).then((response) => {
|
||||
this.form = response.data
|
||||
if (this.form.maVender) this.form.maVender = parseInt(this.form.maVender)
|
||||
if (this.form.maVender)
|
||||
this.form.maVender = parseInt(this.form.maVender)
|
||||
if (this.form.propId == 0) this.form.propId = ''
|
||||
this.open = true
|
||||
this.title = '编辑'
|
||||
|
|
@ -778,10 +779,14 @@ export default {
|
|||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('material/base/machine/export', {
|
||||
...this.queryParams,
|
||||
dataCondition: this.ids
|
||||
}, `编码设备管理_${new Date().getTime()}.xlsx`)
|
||||
this.download(
|
||||
'material/base/machine/export',
|
||||
{
|
||||
...this.queryParams,
|
||||
dataCondition: this.ids,
|
||||
},
|
||||
`编码设备管理_${new Date().getTime()}.xlsx`,
|
||||
)
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,10 +44,10 @@
|
|||
v-show="showSearch"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="类型名称" prop="typeName">
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
placeholder="请输入类型名称"
|
||||
placeholder="请输入机具名称"
|
||||
clearable
|
||||
maxlength="50"
|
||||
style="width: 240px"
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="种类名称"
|
||||
label="机具种类"
|
||||
align="center"
|
||||
key="kindName"
|
||||
prop="kindName"
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
key="typeName"
|
||||
prop="typeName"
|
||||
|
|
|
|||
|
|
@ -44,10 +44,10 @@
|
|||
v-show="showSearch"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item label="类型名称" prop="typeName">
|
||||
<el-form-item label="机具名称" prop="typeName">
|
||||
<el-input
|
||||
v-model="queryParams.typeName"
|
||||
placeholder="请输入类型名称"
|
||||
placeholder="请输入机具名称"
|
||||
clearable
|
||||
maxlength="50"
|
||||
style="width: 240px"
|
||||
|
|
@ -169,7 +169,7 @@
|
|||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="种类名称"
|
||||
label="机具种类"
|
||||
align="center"
|
||||
key="kindName"
|
||||
prop="kindName"
|
||||
|
|
@ -177,7 +177,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
key="typeName"
|
||||
prop="typeName"
|
||||
|
|
|
|||
|
|
@ -275,7 +275,7 @@
|
|||
>
|
||||
<span>供应商：</span>
|
||||
<span v-if="printTableData.length > 0">{{
|
||||
printTableData[0].supplier
|
||||
supplierStr
|
||||
}}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -471,6 +471,7 @@ export default {
|
|||
},
|
||||
],
|
||||
},
|
||||
supplierStr: '',
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -580,6 +581,16 @@ export default {
|
|||
getAccessoryAcceptanceForm({ taskId: taskId }).then((response) => {
|
||||
this.printData = response.data
|
||||
this.printTableData = response.data.partDetailsList
|
||||
|
||||
let supplierList = []
|
||||
this.printTableData.forEach((e) => {
|
||||
if (e.supplier) {
|
||||
supplierList.push(e.supplier)
|
||||
}
|
||||
})
|
||||
supplierList = [...new Set(supplierList)]
|
||||
|
||||
this.supplierStr = supplierList.join(',')
|
||||
})
|
||||
},
|
||||
//查看验收单
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
:inline="true"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="机具类型" prop="equipmentId">
|
||||
<el-form-item label="规格型号" prop="equipmentId">
|
||||
<treeselect
|
||||
v-model="queryParams.equipmentId"
|
||||
default-expand-all
|
||||
:options="equipmentTypeList"
|
||||
placeholder="请选择机具类型"
|
||||
placeholder="请选择规格型号"
|
||||
@select="select"
|
||||
:disable-branch-nodes="true"
|
||||
style="width: 240px"
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" type="index" width="55" />
|
||||
<el-table-column
|
||||
label="机具类型"
|
||||
label="机具名称"
|
||||
prop="machineTypeName"
|
||||
:show-overflow-tooltip="true"
|
||||
width="200"
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="机具类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -238,7 +238,7 @@
|
|||
<!-- <el-table-column type="selection" width="50" align="center" /> -->
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="机具种类"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -344,7 +344,7 @@
|
|||
type="index"
|
||||
/>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="machineTypeName"
|
||||
/>
|
||||
|
|
@ -608,15 +608,14 @@ export default {
|
|||
this.printTableData = response.data.checkDetailsList
|
||||
|
||||
let supplierList = []
|
||||
supplierList = this.printTableData.map((e) => {
|
||||
if (e.supplier) return e.supplier
|
||||
this.printTableData.forEach((e) => {
|
||||
if (e.supplier) {
|
||||
supplierList.push(e.supplier)
|
||||
}
|
||||
})
|
||||
supplierList = [...new Set(supplierList)]
|
||||
|
||||
supplierList = new Set(supplierList)
|
||||
|
||||
this.supplierStr = supplierList
|
||||
.join(',')
|
||||
.substring(0, supplierList.length - 1)
|
||||
this.supplierStr = supplierList.join(',')
|
||||
})
|
||||
},
|
||||
//查看验收单
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@
|
|||
/>
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="机具类型名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="machineTypeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择设备类型"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -182,7 +182,12 @@
|
|||
:data="labelList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="(row, index) => row.status != '1'" />
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="(row, index) => row.status != '1'"
|
||||
/>
|
||||
<el-table-column
|
||||
align="center"
|
||||
label="序号"
|
||||
|
|
@ -215,13 +220,13 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="物品种类"
|
||||
label="类型名称"
|
||||
align="center"
|
||||
prop="kindName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="物品名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="modelName"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择设备类型"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -109,12 +109,12 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="物品种类"
|
||||
label="机具种类"
|
||||
align="center"
|
||||
prop="kindName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="物品名称" align="center" prop="modelName" />
|
||||
<el-table-column label="机具名称" align="center" prop="modelName" />
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ export const dialogConfig = {
|
|||
|
||||
columnsList: [
|
||||
{ t_width: '', t_props: 'putInType', t_label: '入库来源' },
|
||||
{ t_width: '', t_props: 'typeName', t_label: '设备类型' },
|
||||
{ t_width: '', t_props: 'typeName', t_label: '机具名称' },
|
||||
{ t_width: '', t_props: 'typeModelName', t_label: '规格型号' },
|
||||
{ t_width: '', t_props: 'maCode', t_label: '设备编码' },
|
||||
{ t_width: '', t_props: 'num', t_label: '入库数量' },
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
:show-overflow-tooltip="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="设备/物资名称"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
</el-col>
|
||||
<el-col :span="10">
|
||||
<el-form-item
|
||||
label="设备/物资类型"
|
||||
label="规格型号"
|
||||
label-width="130px"
|
||||
prop="typeId"
|
||||
>
|
||||
|
|
@ -995,7 +995,7 @@ export default {
|
|||
typeId: [
|
||||
{
|
||||
required: true,
|
||||
message: '设备/物资类型不能为空',
|
||||
message: '规格型号不能为空',
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@
|
|||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择设备类型"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
label="采购机具设备"
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="purchasingTypeName"
|
||||
show-overflow-tooltip
|
||||
|
|
@ -302,7 +302,7 @@
|
|||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="机具类型"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
show-overflow-tooltip
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
placeholder="维修时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="deviceTypeId">
|
||||
<el-form-item label="机具名称" prop="deviceTypeId">
|
||||
<el-select
|
||||
v-model="queryParams.deviceTypeId"
|
||||
placeholder="请选择设备类型"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
prop="repairCode"
|
||||
/>
|
||||
<el-table-column
|
||||
label="工机具类型"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="maTypeName"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -245,12 +245,12 @@
|
|||
<!-- </el-select> -->
|
||||
<!-- </el-form-item> -->
|
||||
|
||||
<el-form-item label="机具类型" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<treeselect
|
||||
v-model="query.typeId"
|
||||
default-expand-all
|
||||
:options="equipmentTypeList"
|
||||
placeholder="请选择规格型号"
|
||||
placeholder="请选择规机具名称"
|
||||
:disable-branch-nodes="true"
|
||||
style="width: 240px"
|
||||
noChildrenText="没有数据了"
|
||||
|
|
@ -342,14 +342,27 @@
|
|||
@selection-change="handleSelectionChange"
|
||||
height="400"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" :selectable="
|
||||
(row, index) => row.status == '进行中' && row.userIds.includes(userId)" />
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center"
|
||||
:selectable="
|
||||
(row, index) =>
|
||||
row.status == '进行中' &&
|
||||
row.userIds.includes(userId)
|
||||
"
|
||||
/>
|
||||
<el-table-column
|
||||
label="序号"
|
||||
align="center"
|
||||
width="80"
|
||||
type="index"
|
||||
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
|
||||
:index="
|
||||
indexContinuation(
|
||||
queryParams.pageNum,
|
||||
queryParams.pageSize,
|
||||
)
|
||||
"
|
||||
>
|
||||
<!-- <template slot-scope="scope">
|
||||
<span>{{
|
||||
|
|
@ -358,7 +371,7 @@
|
|||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="设备类型"
|
||||
label="机具名称"
|
||||
align="center"
|
||||
prop="typeName2"
|
||||
:show-overflow-tooltip="true"
|
||||
|
|
@ -414,13 +427,19 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
@click="pass(scope.row)"
|
||||
v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
|
||||
v-if="
|
||||
scope.row.status == '进行中' &&
|
||||
scope.row.userIds.includes(userId)
|
||||
"
|
||||
>通过</el-button
|
||||
>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
|
||||
v-if="
|
||||
scope.row.status == '进行中' &&
|
||||
scope.row.userIds.includes(userId)
|
||||
"
|
||||
@click="refused(scope.row)"
|
||||
>不通过</el-button
|
||||
>
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
placeholder="提交入库时间"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="typeId">
|
||||
<el-form-item label="机具名称" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择设备类型"
|
||||
placeholder="请选择机具名称"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 240px"
|
||||
|
|
@ -150,15 +150,15 @@
|
|||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="退料机具类型"
|
||||
label="退料类型名称"
|
||||
align="center"
|
||||
prop="kindName"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="退料设备类型"
|
||||
label="退料机具名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
prop="kindName"
|
||||
:show-overflow-tooltip="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
|
|
@ -338,7 +338,12 @@
|
|||
align="center"
|
||||
width="80"
|
||||
type="index"
|
||||
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
|
||||
:index="
|
||||
indexContinuation(
|
||||
queryParams.pageNum,
|
||||
queryParams.pageSize,
|
||||
)
|
||||
"
|
||||
>
|
||||
<!-- <template slot-scope="scope">
|
||||
<span>{{
|
||||
|
|
|
|||
Loading…
Reference in New Issue