Merge remote-tracking branch 'origin/master'

yangwl
mengjiao 3 months ago
commit be12b1bf7c

@ -199,37 +199,37 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column080090.split(',')"> <div v-for="(item,index) in scope.row.column080090.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column080090.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column080090.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="column090100" label="9:00-10:00" width="95" align="center"> <el-table-column prop="column090100" label="9:00-10:00" width="95" align="center">
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column090100.split(',')"> <div v-for="(item,index) in scope.row.column090100.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column090100.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column090100.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="column100110" label="10:00-11:00" width="95" align="center"> <el-table-column prop="column100110" label="10:00-11:00" width="95" align="center">
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column100110.split(',')"> <div v-for="(item,index) in scope.row.column100110.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column100110.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column100110.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -240,9 +240,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column110120.split(',')"> <div v-for="(item,index) in scope.row.column110120.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column110120.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column110120.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -255,9 +255,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column133143.split(',')"> <div v-for="(item,index) in scope.row.column133143.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column133143.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column133143.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -268,9 +268,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column143153.split(',')"> <div v-for="(item,index) in scope.row.column143153.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column143153.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column143153.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -281,9 +281,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column153163.split(',')"> <div v-for="(item,index) in scope.row.column153163.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column153163.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column153163.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -294,9 +294,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column163173.split(',')"> <div v-for="(item,index) in scope.row.column163173.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column163173.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column163173.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -309,9 +309,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column123133.split(',')"> <div v-for="(item,index) in scope.row.column123133.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column123133.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column123133.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -322,9 +322,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column180190.split(',')"> <div v-for="(item,index) in scope.row.column180190.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column180190.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column180190.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -335,9 +335,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column190200.split(',')"> <div v-for="(item,index) in scope.row.column190200.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column190200.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column190200.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -348,9 +348,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column200210.split(',')"> <div v-for="(item,index) in scope.row.column200210.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column200210.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column200210.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -375,37 +375,37 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column080090.split(',')"> <div v-for="(item,index) in scope.row.column080090.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column080090.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column080090.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="column090100" label="21:30-22:30" width="95" align="center"> <el-table-column prop="column090100" label="21:30-22:30" width="95" align="center">
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column090100.split(',')"> <div v-for="(item,index) in scope.row.column090100.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column090100.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column090100.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="column100110" label="22:30-23:30" width="95" align="center"> <el-table-column prop="column100110" label="22:30-23:30" width="95" align="center">
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column100110.split(',')"> <div v-for="(item,index) in scope.row.column100110.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column100110.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column100110.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -416,9 +416,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column110120.split(',')"> <div v-for="(item,index) in scope.row.column110120.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column110120.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column110120.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -429,9 +429,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column133143.split(',')"> <div v-for="(item,index) in scope.row.column133143.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column133143.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column133143.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -442,9 +442,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column143153.split(',')"> <div v-for="(item,index) in scope.row.column143153.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column143153.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column143153.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -455,9 +455,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column153163.split(',')"> <div v-for="(item,index) in scope.row.column153163.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column153163.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column153163.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -468,9 +468,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column163173.split(',')"> <div v-for="(item,index) in scope.row.column163173.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column163173.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column163173.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -481,9 +481,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column123133.split(',')"> <div v-for="(item,index) in scope.row.column123133.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column123133.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column123133.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -494,9 +494,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column180190.split(',')"> <div v-for="(item,index) in scope.row.column180190.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column180190.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column180190.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -507,9 +507,9 @@
<template slot-scope="scope" > <template slot-scope="scope" >
<div v-for="(item,index) in scope.row.column190200.split(',')"> <div v-for="(item,index) in scope.row.column190200.split(',')">
<el-image <el-image
:src="item" :src="item"
style="width: 60px; height: 60px" style="width: 60px; height: 60px"
:fit="fit" :fit="fit"
:preview-src-list="Array.from(scope.row.column190200.split(',')).slice(1)" :preview-src-list="Array.from(scope.row.column190200.split(',')).slice(1)"
v-if="index>0"/> v-if="index>0"/>
<span v-else>{{item}}</span> <span v-else>{{item}}</span>
@ -638,8 +638,8 @@
<el-table-column label="附件" align="center" prop="files" width="200"> <el-table-column label="附件" align="center" prop="files" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image v-for="(item,index) in scope.row.files" :key="index" <el-image v-for="(item,index) in scope.row.files" :key="index"
:src="item.fileAddress" :src="item.fileAddress"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:fit="fit" /> :fit="fit" />
</template> </template>
</el-table-column> </el-table-column>
@ -662,15 +662,27 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="车间组长/机管员签名" label-width="160px"> <el-form-item label="车间组长/机管员签名" label-width="160px">
<el-input disabled/> <template >
<el-image
:src="form.jgy"
style="width: 260px; height: 100px"
:preview-src-list="form.jgy"
fit="fill" />
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="质量管理部品管员签名" prop="checkManName" label-width="160px"> <el-form-item label="质量管理部品管员签名" label-width="160px">
<el-input disabled/> <template >
<el-image
:src="form.pgy"
style="width: 260px; height: 100px"
:preview-src-list="form.jgy"
fit="fill" />
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -898,6 +910,8 @@ export default {
updateTime: null, updateTime: null,
factoryCode: null, factoryCode: null,
delFlag: null, delFlag: null,
jgy: null,
pgy: null,
}; };
this.spanArr = []; this.spanArr = [];
@ -1049,7 +1063,7 @@ export default {
this.$refs.itemCheckProjectsXJ.showFlag = true; this.$refs.itemCheckProjectsXJ.showFlag = true;
this.$refs.itemCheckProjectsXJ.init(this.selectRow[0]); this.$refs.itemCheckProjectsXJ.init(this.selectRow[0]);
} }
}, },
/** /**
* 1. 若是objectSpanMethod不返回任何东西表格不会变化 * 1. 若是objectSpanMethod不返回任何东西表格不会变化

Loading…
Cancel
Save