Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
A0010407 11 months ago
parent a5a692b0e2 2de12aabc7
commit 33dd3782b0
1 changed files with 77 additions and 39 deletions
Show Stats Download Patch File Download Diff File

116
src/views/wms/equipment/index.vue
Unescape Escape View File

@ -169,7 +169,12 @@
:index="indexMethod" :index="indexMethod"
label="序号" label="序号"
/> />
<el-table-column label="设备编码" align="center" prop="equipmentCode" width="150"> <el-table-column
label="设备编码"
align="center"
prop="equipmentCode"
width="150"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -200,7 +205,12 @@
></el-switch> ></el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="equipmentStatus" label="设备状态" width="100" align="center"> <el-table-column
prop="equipmentStatus"
label="设备状态"
width="100"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.equipment_status" :options="dict.type.equipment_status"
@ -221,12 +231,7 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="备注" align="center" prop="remark" width="100">
label="备注"
align="center"
prop="remark"
width="100"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="设备类型编码" label="设备类型编码"
@ -394,7 +399,10 @@
<el-step title="设备使用状况"></el-step> <el-step title="设备使用状况"></el-step>
<el-step title="设备资产信息"></el-step> <el-step title="设备资产信息"></el-step>
<el-step title="设备绑定备件"></el-step> <el-step title="设备绑定备件"></el-step>
<el-step title="设备绑定辅助设备" v-if="this.form.equipmentCategory == '1' "></el-step> <el-step
title="设备绑定辅助设备"
v-if="this.form.equipmentCategory == '1'"
></el-step>
</el-steps> </el-steps>
</div> </div>
<!-- 维修基本信息 --> <!-- 维修基本信息 -->
@ -742,7 +750,7 @@
</el-row> </el-row>
</div> </div>
<!-- 设备绑定备件 --> <!-- 设备绑定备件 -->
<div v-if="this.repairRecordSteps == 3 " class="step-body"> <div v-if="this.repairRecordSteps == 3" class="step-body">
<template> <template>
<el-transfer <el-transfer
filterable filterable
@ -757,7 +765,12 @@
</div> </div>
<!-- 设备绑定辅助设备 --> <!-- 设备绑定辅助设备 -->
<div v-if="this.repairRecordSteps == 4 && this.form.equipmentCategory == '1' " class="step-body"> <div
v-if="
this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'
"
class="step-body"
>
<template> <template>
<el-transfer <el-transfer
filterable filterable
@ -775,21 +788,39 @@
<el-button v-if="this.repairRecordSteps > 0" @click="stepLast" <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
>上一步</el-button >上一步</el-button
> >
<el-button v-if="this.repairRecordSteps < 4 && this.form.equipmentCategory == '1' " @click="stepNext" <el-button
v-if="
this.repairRecordSteps < 4 && this.form.equipmentCategory == '1'
"
@click="stepNext"
>下一步</el-button >下一步</el-button
> >
<el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == '0' " @click="stepNext" <el-button
v-if="
this.repairRecordSteps < 3 && this.form.equipmentCategory == '0'
"
@click="stepNext"
>下一步</el-button
>
<el-button
v-if="
this.repairRecordSteps < 3 && this.form.equipmentCategory == null
"
disabled
>下一步</el-button >下一步</el-button
> >
<el-button v-if="this.repairRecordSteps < 3 && this.form.equipmentCategory == null " disabled>下一步</el-button>
<el-button <el-button
v-if=" this.repairRecordSteps == 4 && this.form.equipmentCategory == '1' " v-if="
this.repairRecordSteps == 4 && this.form.equipmentCategory == '1'
"
type="primary" type="primary"
@click="submitForm" @click="submitForm"
>提 交</el-button >提 交</el-button
> >
<el-button <el-button
v-if=" this.repairRecordSteps == 3 && this.form.equipmentCategory == '0' " v-if="
this.repairRecordSteps == 3 && this.form.equipmentCategory == '0'
"
type="primary" type="primary"
@click="submitForm" @click="submitForm"
>提 交</el-button >提 交</el-button
@ -909,19 +940,19 @@
}}</el-descriptions-item> }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="辅助设备" > <el-tab-pane label="辅助设备">
<ItemEquipment <ItemEquipment
:optType="optType" :optType="optType"
:equipmentCode="form.equipmentCode" :equipmentCode="form.equipmentCode"
></ItemEquipment> ></ItemEquipment>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="维修记录" > <el-tab-pane label="维修记录">
<ItemWXRecords <ItemWXRecords
:optType="optType" :optType="optType"
:equipmentCode="form.equipmentCode" :equipmentCode="form.equipmentCode"
></ItemWXRecords> ></ItemWXRecords>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="保养记录" > <el-tab-pane label="保养记录">
<ItemBYRecords <ItemBYRecords
:optType="optType" :optType="optType"
:equipmentCode="form.equipmentCode" :equipmentCode="form.equipmentCode"
@ -1068,7 +1099,7 @@ export default {
"equipment_status", "equipment_status",
"equipment_category", "equipment_category",
], ],
components: { ItemSelectPerson, ItemEquipment , ItemWXRecords , ItemBYRecords}, components: { ItemSelectPerson, ItemEquipment, ItemWXRecords, ItemBYRecords },
data() { data() {
return { return {
CS: { CS: {
@ -1198,7 +1229,7 @@ export default {
workshopSection: null, workshopSection: null,
equipmentLocation: null, equipmentLocation: null,
hourlyUnitPrice: null, hourlyUnitPrice: null,
equipmentCategory : null, equipmentCategory: null,
}, },
queryEquipmentHeadParams: { queryEquipmentHeadParams: {
pageNum: 1, pageNum: 1,
@ -1207,7 +1238,7 @@ export default {
queryAuxiliaryEquipmentParams: { queryAuxiliaryEquipmentParams: {
pageNum: 1, pageNum: 1,
pageSize: 1000, pageSize: 1000,
equipmentCategory : null, equipmentCategory: null,
}, },
options: [ options: [
{ {
@ -1310,10 +1341,11 @@ export default {
// 将返回的列表赋值于穿梭框左边列表 // 将返回的列表赋值于穿梭框左边列表
this.leftList.push({ this.leftList.push({
key: response.rows[i].materialCode, key: response.rows[i].materialCode,
label: response.rows[i].materialCode + response.rows[i].materialDesc, label:
response.rows[i].materialCode + response.rows[i].materialDesc,
}); });
} }
console.log(this.auxiliaryEquipmentRightList) console.log(this.auxiliaryEquipmentRightList);
for (let i in response.selected) { for (let i in response.selected) {
this.rightList.push(response.selected[i].key); this.rightList.push(response.selected[i].key);
this.form.rightData = this.rightList; this.form.rightData = this.rightList;
@ -1380,12 +1412,12 @@ export default {
equipmentLocation: null, equipmentLocation: null,
hourlyUnitPrice: null, hourlyUnitPrice: null,
equipmentHead: null, equipmentHead: null,
equipmentCategory : null, equipmentCategory: null,
assetClassificationName : null, assetClassificationName: null,
assetDescription : null, assetDescription: null,
equipmentNumber : null, equipmentNumber: null,
inventoryNumber : null , inventoryNumber: null,
unitMeasurement : null unitMeasurement: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -1443,13 +1475,16 @@ export default {
this.rightList = []; this.rightList = [];
this.auxiliaryEquipmentLeftList = []; this.auxiliaryEquipmentLeftList = [];
this.auxiliaryEquipmentRightList = []; this.auxiliaryEquipmentRightList = [];
this.queryAuxiliaryEquipmentParams.equipmentCategory = '0'; this.queryAuxiliaryEquipmentParams.equipmentCategory = "0";
listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => { listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
for (let i in response.rows) { for (let i in response.rows) {
// 将返回的列表赋值于穿梭框左边列表 // 将返回的列表赋值于穿梭框左边列表
this.auxiliaryEquipmentLeftList.push({ this.auxiliaryEquipmentLeftList.push({
key: response.rows[i].equipmentCode, key: response.rows[i].equipmentCode,
label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark, label:
response.rows[i].equipmentCode +
response.rows[i].equipmentName +
response.rows[i].remark,
}); });
} }
}); });
@ -1466,22 +1501,25 @@ export default {
this.options1 = response.rows; this.options1 = response.rows;
}); });
this.queryAuxiliaryEquipmentParams.equipmentCategory = '0'; this.queryAuxiliaryEquipmentParams.equipmentCategory = "0";
listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => { listEquipment(this.queryAuxiliaryEquipmentParams).then((response) => {
console.log("listEquipment") console.log("listEquipment");
this.auxiliaryEquipmentLeftList = []; this.auxiliaryEquipmentLeftList = [];
for (let i in response.rows) { for (let i in response.rows) {
// 将返回的列表赋值于穿梭框左边列表 // 将返回的列表赋值于穿梭框左边列表
this.auxiliaryEquipmentLeftList.push({ this.auxiliaryEquipmentLeftList.push({
key: response.rows[i].equipmentCode, key: response.rows[i].equipmentCode,
label: response.rows[i].equipmentCode + response.rows[i].equipmentName + response.rows[i].remark, label:
response.rows[i].equipmentCode +
response.rows[i].equipmentName +
response.rows[i].remark,
}); });
} }
console.log(this.auxiliaryEquipmentRightList) console.log(this.auxiliaryEquipmentRightList);
}); });
getEquipment(equipmentId).then((response) => { getEquipment(equipmentId).then((response) => {
console.log("getEquipment") console.log("getEquipment");
this.form = response.data; this.form = response.data;
this.rightList = []; this.rightList = [];
for (let i in response.data.selectedData) { for (let i in response.data.selectedData) {
@ -1489,14 +1527,14 @@ export default {
this.rightList.push(response.data.selectedData[i].spareCode); this.rightList.push(response.data.selectedData[i].spareCode);
} }
this.auxiliaryEquipmentRightList = []; this.auxiliaryEquipmentRightList = [];
console.log(this.auxiliaryEquipmentRightList) console.log(this.auxiliaryEquipmentRightList);
for (let i in response.data.selectedEquipmentData) { for (let i in response.data.selectedEquipmentData) {
// 将返回的辅助设备列表赋值于穿梭框右边列表 // 将返回的辅助设备列表赋值于穿梭框右边列表
this.auxiliaryEquipmentRightList.push( this.auxiliaryEquipmentRightList.push(
response.data.selectedEquipmentData[i].auxiliaryEquipmentCode response.data.selectedEquipmentData[i].auxiliaryEquipmentCode
); );
} }
console.log(this.auxiliaryEquipmentRightList) console.log(this.auxiliaryEquipmentRightList);
if (response.data.imageFiles != null) { if (response.data.imageFiles != null) {
var newFiles = []; var newFiles = [];

Write Preview
Loading…
Cancel
Save