yangwl
A0010407 10 months ago
parent 9ae9944d9c
commit 15644f6050

@ -740,34 +740,34 @@
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息">
<el-table :data="checkList" border style="width: 100%">
<el-table-column prop="itemName" label="检查项名称" width="200">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="200">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="180">
</el-table-column>
<el-table-column prop="standardType" label="标准类型" width="100">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="50">
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_reach_standard"
:value="scope.row.detailReach"
/>
</template>
</el-table-column>
<el-table-column prop="actualValue" label="实际值" width="50">
</el-table-column>
<el-table-column prop="detailUpLimit" label="上限" width="50">
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="45">
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="检查项信息" v-if="checkList != null ">
<el-table :data="checkList" border style="width: 100%">
<el-table-column prop="itemName" label="检查项名称" width="200">
</el-table-column>
<el-table-column prop="itemMethod" label="检查项方法" width="200">
</el-table-column>
<el-table-column prop="standardName" label="标准名称" width="180">
</el-table-column>
<el-table-column prop="standardType" label="标准类型" width="85">
</el-table-column>
<el-table-column prop="detailReach" label="是否达标" width="65">
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_reach_standard"
:value="scope.row.detailReach"
/>
</template>
</el-table-column>
<el-table-column prop="actualValue" label="实际值" width="50">
</el-table-column>
<el-table-column prop="detailUpLimit" label="上限" width="50">
</el-table-column>
<el-table-column prop="detailDownLimit" label="下限" width="50">
</el-table-column>
<el-table-column prop="detailUnit" label="单位" width="47">
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
</el-form>
<div slot="footer" class="dialog-footer">
@ -880,6 +880,7 @@
v-model="form.orderConnection"
style="width: 200px"
placeholder="请输入联系方式"
disabled
/>
</el-form-item>
</el-col>
@ -960,7 +961,7 @@
></el-descriptions-item>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="检查项信息">
<el-tab-pane label="检查项信息" v-if="checkList != null ">
<el-table :data="checkList" border style="width: 100%">
<el-table-column prop="itemName" label="检查项名称" width="200">
</el-table-column>
@ -1170,12 +1171,6 @@ export default {
orderTime: [
{ required: true, message: "报修时间不能为空", trigger: "blur" },
],
orderDesc: [
{ required: true, message: "故障描述不能为空", trigger: "blur" },
],
orderConnection: [
{ required: true, message: "联系方式不能为空", trigger: "blur" },
],
},
};
},
@ -1227,6 +1222,7 @@ export default {
onItemSelectedPerson(obj) {
this.form.orderRepairmanCode = obj[0].userName;
this.form.orderRepairmanName = obj[0].nickName;
this.form.orderConnection = obj[0].phonenumber;
},
//
onItemSelectedEquipment(obj) {
@ -1335,8 +1331,10 @@ export default {
this.form = response.data;
if (response.data.files != null) {
var newFiles = [];
console.log("1",response.data.files)
response.data.files.forEach((item) => {
var newFile = {};
console.log("2",response.data.files)
newFile.name = item.fileName;
newFile.url = item.fileAddress;
newFiles.push(newFile);
@ -1349,7 +1347,7 @@ export default {
});
this.urlLists = urlLists;
console.log("2222222222", this.urlLists);
} else if (response.data.files == null) {
} else if(response.data.files == null) {
this.urlLists = null;
}
this.checkList = null;

@ -85,6 +85,13 @@
v-if="columns[1].visible"
:show-overflow-tooltip="true"
/>
<el-table-column
label="人员联系方式"
align="left"
prop="phonenumber"
v-if="columns[2].visible"
:show-overflow-tooltip="true"
/>
</el-table>
<pagination
@ -142,6 +149,7 @@ export default {
columns: [
{ key: 0, label: `人员编码`, visible: true },
{ key: 1, label: `人员名称`, visible: true },
{ key: 1, label: `联系方式`, visible: true },
],
};
},

@ -152,11 +152,21 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column
type="index"
width="90"
align="center"
:index="indexMethod"
label="序号"
fixed
/>
<el-table-column
label="委外工单编码"
align="center"
prop="workCode"
width="180"
fixed
/>
<el-table-column
label="报修单号"
@ -276,8 +286,8 @@
@pagination="getList"
/>
<!-- 添加或修改委外工单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<!-- 添加委外工单对话框 -->
<el-dialog :title="title" :visible.sync="openAdd" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="设备编码" prop="equipmentCode">
<el-input
@ -373,9 +383,111 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
<el-button @click="cancelAdd"> </el-button>
</div>
</el-dialog>
<!-- 修改委外工单对话框 -->
<el-dialog :title="title" :visible.sync="openUpdate" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-form-item label="设备编码" prop="equipmentCode" v-if>
<el-input
v-model="form.equipmentCode"
style="width: 270px"
disabled
>
<el-button
slot="append"
@click="handleSelectEquipment"
icon="el-icon-search"
></el-button>
</el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment">
</ItemSelect>
</el-form-item>
<el-form-item label="委外类型" prop="workType">
<el-select
v-model="form.workType"
@change="$forceUpdate()"
clearable
style="width: 270px"
disabled
>
<el-option
v-for="item in options"
:key="item.workType"
:label="item.label"
:value="item.workType"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="委外维修人员" prop="workPerson">
<el-input
v-model="form.workPerson"
disabled
style="width: 270px"
/>
</el-form-item>
<el-form-item label="委外单位" prop="workOutsourcingUnit">
<el-input
v-model="form.workOutsourcingUnit"
disabled
style="width: 270px"
/>
</el-form-item>
<el-form-item label="委外单位联系方式" prop="workConnection">
<el-input
v-model="form.workConnection"
disabled
style="width: 270px"
/>
</el-form-item>
<el-form-item label="委外原因" prop="workReason">
<el-input
v-model="form.workReason"
disabled
style="width: 270px"
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
/>
</el-form-item>
<el-form-item label="委外费用" prop="workCost">
<el-input
v-model="form.workCost"
placeholder="请输入委外费用"
style="width: 270px"
/>
</el-form-item>
<el-form-item label="委外用时" prop="workCostTime">
<el-input
v-model="form.workCostTime"
placeholder="请输入委外用时"
style="width: 270px"
/>
</el-form-item>
<el-form-item label="是否完成维修" prop="workStatus">
<el-select
v-model="form.workStatus"
placeholder="请选择是否完成维修"
@change="$forceUpdate()"
clearable
style="width: 270px"
>
<el-option
v-for="item in workStatusOption"
:key="item.workStatus"
:label="item.label"
:value="item.workStatus"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancelUpdate"> </el-button>
</div>
</el-dialog>
</div>
</template>
@ -411,7 +523,9 @@ export default {
//
title: "",
//
open: false,
openAdd: false,
//
openUpdate: false,
//
queryParams: {
pageNum: 1,
@ -462,6 +576,10 @@ export default {
this.getList();
},
methods: {
//
indexMethod(index) {
return index + 1;
},
/** 查询委外工单列表 */
getList() {
this.loading = true;
@ -471,9 +589,16 @@ export default {
this.loading = false;
});
},
//
//
cancel() {
this.open = false;
this.openUpdate = false;
this.reset();
},
//
cancelAdd() {
this.openAdd = false;
this.reset();
},
//
@ -530,7 +655,7 @@ export default {
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.openAdd = true;
this.title = "添加委外工单";
},
/** 修改按钮操作 */
@ -539,7 +664,7 @@ export default {
const workId = row.workId || this.ids;
getOutsourceWorkOrder(workId).then((response) => {
this.form = response.data;
this.open = true;
this.openUpdate = true;
this.title = "修改委外工单";
});
},
@ -550,13 +675,13 @@ export default {
if (this.form.workId != null) {
updateOutsourceWorkOrder(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.openUpdate = false;
this.getList();
});
} else {
addOutsourceWorkOrder(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.openAdd = false;
this.getList();
});
}

@ -262,6 +262,7 @@
align="center"
prop="workCode"
width="200"
fixed
/>
<el-table-column
label="报修单号"
@ -777,7 +778,7 @@
form.outSourcePerson
}}</el-descriptions-item>
<el-descriptions-item label="委外联系方式">{{
form.workConnection
form.outSourceConnection
}}</el-descriptions-item>
<el-descriptions-item label="委外原因">{{
form.outSourceReason
@ -1237,6 +1238,10 @@ export default {
this.getTeamList();
},
methods: {
//
indexMethod(index) {
return index + 1;
},
// -
listeningTime() {
if (this.form.workEndTime != null && this.form.workStartTime != null) {
@ -1434,9 +1439,11 @@ export default {
});
this.urlAfterLists = urlAfterLists;
}
//
this.detailList = null;
this.detailList = response.data.detailList;
if (this.checkList != null) {
if (this.detailList != null) {
//
var standards = [];
this.detailList.forEach((item1) => {
@ -1457,6 +1464,7 @@ export default {
});
});
this.detailList = standards;
console.log("111111111111",this.detailList);
}
this.openWrite = true;
this.title = "填写维修记录";

Loading…
Cancel
Save