Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
yangwl
zhaoxiaolin 7 months ago
parent dbe05f525f 9e209f5e04
commit cd07c84d62
5 changed files with 150 additions and 104 deletions
Show Stats Download Patch File Download Diff File

35
src/views/device/faultReport/index.vue
Unescape Escape View File

@ -196,6 +196,16 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="处理状态"
align="center"
prop="orderStatus" />
<el-table-column
label="报修去向"
align="center"
prop="repairDestination"
width="120"
/>
<el-table-column <el-table-column
label="设备编码" label="设备编码"
align="center" align="center"
@ -252,16 +262,6 @@
prop="orderConnection" prop="orderConnection"
width="120" width="120"
/> />
<el-table-column
label="处理状态"
align="center"
prop="orderStatus" />
<el-table-column
label="报修去向"
align="center"
prop="repairDestination"
width="120"
/>
<el-table-column <el-table-column
label="创建人" label="创建人"
align="center" align="center"
@ -283,6 +283,7 @@
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
width="180" width="180"
fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -366,12 +367,14 @@
:contentStyle="CS" :contentStyle="CS"
:label-style="LSP" :label-style="LSP"
> >
<div class="view_picture_body">
<el-image <el-image
v-for="(item, index) in urlLists" v-for="(item, index) in urlLists"
:key="index" :key="index"
:src="item" :src="item"
></el-image ></el-image>
></el-descriptions-item> </div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息" v-if="checkList != null"> <el-tab-pane label="检查项信息" v-if="checkList != null">
@ -714,12 +717,14 @@
:label-style="LSP" :label-style="LSP"
> >
<el-descriptions-item label="故障图片"> <el-descriptions-item label="故障图片">
<div class="view_picture_body">
<el-image <el-image
v-for="(item, index) in urlLists" v-for="(item, index) in urlLists"
:key="index" :key="index"
:src="item" :src="item"
></el-image ></el-image>
></el-descriptions-item> </div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="检查项信息" v-if="checkList != null"> <el-tab-pane label="检查项信息" v-if="checkList != null">
@ -865,6 +870,8 @@
<el-descriptions <el-descriptions
:column="2" :column="2"
border border
:contentStyle="CS"
:label-style="LS"
v-if="form.repairDestination == '委外维修'" v-if="form.repairDestination == '委外维修'"
> >
<el-descriptions-item label="委外原因">{{ <el-descriptions-item label="委外原因">{{

19
src/views/device/outsourceWorkOrder/index.vue
Unescape Escape View File

@ -168,6 +168,12 @@
width="180" width="180"
fixed fixed
/> />
<el-table-column label="委外状态" align="center" prop="workStatus" width="100">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.workStatus == 1">完成</el-tag>
<el-tag type="danger" v-else-if="scope.row.workStatus == 0">未完成</el-tag>
</template>
</el-table-column>
<el-table-column <el-table-column
label="报修单号" label="报修单号"
align="center" align="center"
@ -185,12 +191,6 @@
{{ scope.row.workType == 1 ? "保养委外" : "维修委外" }} {{ scope.row.workType == 1 ? "保养委外" : "维修委外" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="委外状态" align="center" prop="workStatus" width="100">
<template slot-scope="scope">
<el-tag type="success" v-if="scope.row.workStatus == 1">完成</el-tag>
<el-tag type="danger" v-else-if="scope.row.workStatus == 0">未完成</el-tag>
</template>
</el-table-column>
<el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/> <el-table-column label="设备编码" align="center" prop="equipmentCode" width="100"/>
<el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/> <el-table-column label="设备名称" align="center" prop="equipmentName" width="100"/>
<el-table-column <el-table-column
@ -208,7 +208,8 @@
label="委外单位" label="委外单位"
align="center" align="center"
prop="workOutsourcingUnit" prop="workOutsourcingUnit"
width="200" width="250"
:show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="联系方式" label="联系方式"
@ -220,7 +221,8 @@
label="委外原因" label="委外原因"
align="center" align="center"
prop="workReason" prop="workReason"
width="150" width="250"
:show-overflow-tooltip="true"
/> />
<el-table-column label="委外费用" align="center" prop="workCost" /> <el-table-column label="委外费用" align="center" prop="workCost" />
<el-table-column label="委外用时" align="center" prop="workCostTime" /> <el-table-column label="委外用时" align="center" prop="workCostTime" />
@ -262,6 +264,7 @@
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
width="150" width="150"
fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

76
src/views/device/repairOrder/index.vue
Unescape Escape View File

@ -264,6 +264,19 @@
width="200" width="200"
fixed fixed
/> />
<el-table-column
label="维修状态"
align="center"
prop="workStatus"
width="150"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_repair_status"
:value="scope.row.workStatus"
/>
</template>
</el-table-column>
<el-table-column <el-table-column
label="报修单号" label="报修单号"
align="center" align="center"
@ -377,25 +390,13 @@
> >
</el-table-column> </el-table-column>
<el-table-column label="维修费用" align="center" prop="workCost" /> <el-table-column label="维修费用" align="center" prop="workCost" />
<el-table-column
label="维修状态"
align="center"
prop="workStatus"
width="150"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_repair_status"
:value="scope.row.workStatus"
/>
</template>
</el-table-column>
<el-table-column label="工厂编码" align="center" prop="factoryCode" /> <el-table-column label="工厂编码" align="center" prop="factoryCode" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
width="180" width="180"
fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -890,28 +891,32 @@
<el-descriptions :column="1" border> <el-descriptions :column="1" border>
<el-descriptions-item <el-descriptions-item
label="维修前故障图片" label="维修前故障图片"
:contentStyle="CS1" :contentStyle="CS"
:label-style="LSP1" :label-style="LS_WRITE_IMG"
> >
<div class="view_picture_body">
<el-image <el-image
v-for="(item, index) in urlBeforeLists" v-for="(item, index) in urlBeforeLists"
:key="index" :key="index"
:src="item" :src="item"
></el-image ></el-image>
></el-descriptions-item> </div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="1" border> <el-descriptions :column="1" border>
<el-descriptions-item <el-descriptions-item
label="维修后故障图片" label="维修后故障图片"
:contentStyle="CS1" :contentStyle="CS"
:label-style="LSP1" :label-style="LS_WRITE_IMG"
> >
<div class="view_picture_body">
<el-image <el-image
v-for="(item, index) in urlAfterLists" v-for="(item, index) in urlAfterLists"
:key="index" :key="index"
:src="item" :src="item"
></el-image ></el-image>
></el-descriptions-item> </div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
@ -1251,7 +1256,7 @@
<el-descriptions-item <el-descriptions-item
label="维修前故障图片" label="维修前故障图片"
:contentStyle="CS" :contentStyle="CS"
:label-style="LSP" :label-style="LS_VIEW_IMG"
> >
<el-image <el-image
v-for="(item, index) in urlBeforeLists" v-for="(item, index) in urlBeforeLists"
@ -1264,7 +1269,7 @@
<el-descriptions-item <el-descriptions-item
label="维修后故障图片" label="维修后故障图片"
:contentStyle="CS" :contentStyle="CS"
:label-style="LSP" :label-style="LS_VIEW_IMG"
> >
<el-image <el-image
v-for="(item, index) in urlAfterLists" v-for="(item, index) in urlAfterLists"
@ -1571,15 +1576,15 @@ export default {
"text-align": "center", "text-align": "center",
width: "250px", width: "250px",
}, },
//图片表格样式 //图片表格样式 查看功能
LSP: { LS_VIEW_IMG: {
"text-align": "center", "text-align": "center",
width: "225px", width: "225px",
}, },
//图片表格样式 //图片格式样式 填写功能
LSP1: { LS_WRITE_IMG: {
"text-align": "center", "text-align": "center",
width: "250px", width: "235px",
}, },
//故障描述 //故障描述
workFaultDescOption : [], workFaultDescOption : [],
@ -1875,6 +1880,8 @@ export default {
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
beforeRepairFiles: null,
afterRepairFiles: null,
workId: null, workId: null,
orderId: null, orderId: null,
orderCode: null, orderCode: null,
@ -1944,10 +1951,12 @@ export default {
const workId = row.workId || this.ids; const workId = row.workId || this.ids;
getRepairOrder(workId).then((response) => { getRepairOrder(workId).then((response) => {
this.form = response.data; this.form = response.data;
//转成list //转成list
if (response.data.faultType != null) { if (response.data.faultType != null) {
this.form.faultType = response.data.faultType.split(","); this.form.faultType = response.data.faultType.split(",");
} }
//遍历response.data.beforeRepairFiles //遍历response.data.beforeRepairFiles
if (response.data.beforeRepairFiles != null) { if (response.data.beforeRepairFiles != null) {
var beforeNewFiles = []; var beforeNewFiles = [];
@ -1965,8 +1974,11 @@ export default {
urlBeforeLists.push(item.url); urlBeforeLists.push(item.url);
}); });
this.urlBeforeLists = urlBeforeLists; this.urlBeforeLists = urlBeforeLists;
}else{
this.urlBeforeLists = null;
} }
//遍历response.data.afterRepairFiles //遍历response.data.afterRepairFiles
if (response.data.afterRepairFiles != null) { if (response.data.afterRepairFiles != null) {
var afterNewFiles = []; var afterNewFiles = [];
@ -1983,6 +1995,8 @@ export default {
urlAfterLists.push(item.url); urlAfterLists.push(item.url);
}); });
this.urlAfterLists = urlAfterLists; this.urlAfterLists = urlAfterLists;
}else{
this.urlAfterLists = null;
} }
//重置 //重置
@ -2040,7 +2054,6 @@ export default {
}); });
this.detailList = standards; this.detailList = standards;
console.log("111111111111", this.detailList);
} }
if (this.form.workStatus == "1") { if (this.form.workStatus == "1") {
this.queryWrite = true; this.queryWrite = true;
@ -2279,6 +2292,11 @@ export default {
height: 400px; height: 400px;
overflow-y: auto; overflow-y: auto;
} }
.view_picture_body {
height: 300px;
overflow-y: auto;
}
</style> </style>

2
src/views/device/repairOrder/selectSparePartsLedger.vue
Unescape Escape View File

@ -331,8 +331,6 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
console.log("data:", this.sparePartsLedgerList);
console.log("选择的数据", this.$refs.multipleTable.selection);
this.$refs.multipleTable.selection.forEach((item) => { this.$refs.multipleTable.selection.forEach((item) => {
if (item.spareQuantity > item.amount - item.storageAmount) { if (item.spareQuantity > item.amount - item.storageAmount) {
Message.warning( Message.warning(

74
src/views/device/repairOrderReport/index.vue
Unescape Escape View File

@ -204,6 +204,19 @@
}}</el-button> }}</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
label="维修状态"
align="center"
prop="workStatus"
width="150"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_repair_status"
:value="scope.row.workStatus"
/>
</template>
</el-table-column>
<el-table-column <el-table-column
label="报修单号" label="报修单号"
align="center" align="center"
@ -308,25 +321,8 @@
align="center" align="center"
prop="workCostTime" prop="workCostTime"
width="180" width="180"
> ></el-table-column>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.workCostTime) }}</span>
</template>
</el-table-column>
<el-table-column label="维修费用" align="center" prop="workCost" /> <el-table-column label="维修费用" align="center" prop="workCost" />
<el-table-column
label="维修状态"
align="center"
prop="workStatus"
width="150"
>
<template slot-scope="scope">
<dict-tag
:options="dict.type.device_repair_status"
:value="scope.row.workStatus"
/>
</template>
</el-table-column>
<el-table-column label="工厂编码" align="center" prop="factoryCode" /> <el-table-column label="工厂编码" align="center" prop="factoryCode" />
</el-table> </el-table>
@ -397,15 +393,17 @@
<el-descriptions :column="1" border> <el-descriptions :column="1" border>
<el-descriptions-item <el-descriptions-item
label="维修前故障图片" label="维修前故障图片"
:contentStyle="CS" :contentStyle="CS_IMG"
:label-style="LS" :label-style="LS_BEFORE_IMG"
> >
<div class="view_picture_body">
<el-image <el-image
v-for="(item, index) in urlBeforeLists" v-for="(item, index) in urlBeforeLists"
:key="index" :key="index"
:src="item" :src="item"
></el-image ></el-image>
></el-descriptions-item> </div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
@ -482,16 +480,18 @@
<el-descriptions <el-descriptions
:column="1" :column="1"
border border
:contentStyle="CS" :contentStyle="CS_IMG"
:label-style="LS" :label-style="LS_AFTER_IMG"
> >
<el-descriptions-item label="维修后图片"> <el-descriptions-item label="维修后图片">
<div class="view_picture_body">
<el-image <el-image
v-for="(item, index) in urlAfterLists" v-for="(item, index) in urlAfterLists"
:key="index" :key="index"
:src="item" :src="item"
></el-image ></el-image>
></el-descriptions-item> </div>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-tab-pane> </el-tab-pane>
@ -613,6 +613,18 @@ export default {
"text-align": "center", "text-align": "center",
width: "200px", width: "200px",
}, },
//表格样式
CS_IMG: {
"text-align": "center",
},
LS_BEFORE_IMG: {
"text-align": "center",
width: "190px",
},
LS_AFTER_IMG: {
"text-align": "center",
width: "280px",
},
//检查项表格数据 //检查项表格数据
detailList: [], detailList: [],
//维修前照片 //维修前照片
@ -828,6 +840,8 @@ export default {
urlBeforeLists.push(item.url); urlBeforeLists.push(item.url);
}); });
this.urlBeforeLists = urlBeforeLists; this.urlBeforeLists = urlBeforeLists;
}else{
this.urlBeforeLists = null;
} }
//遍历response.data.afterRepairFiles //遍历response.data.afterRepairFiles
@ -846,6 +860,8 @@ export default {
urlAfterLists.push(item.url); urlAfterLists.push(item.url);
}); });
this.urlAfterLists = urlAfterLists; this.urlAfterLists = urlAfterLists;
}else{
this.urlAfterList = null;
} }
//重置 //重置
@ -891,7 +907,6 @@ export default {
}); });
this.detailList = standards; this.detailList = standards;
console.log("111111111111", this.detailList);
} }
//展示 //展示
@ -972,5 +987,10 @@ export default {
height: 400px; height: 400px;
overflow-y: auto; overflow-y: auto;
} }
.view_picture_body {
height: 300px;
overflow-y: auto;
}
</style> </style>

Write Preview
Loading…
Cancel
Save