Merge remote-tracking branch 'origin/master'

src/views/quality/produceReport/index.vue

@@ -662,15 +662,27 @@
 					</el-row>
 					<el-row>
 						<el-col :span="20">
-							<el-form-item label="车间组长/机管员签名"  label-width="160px">
-								<el-input disabled/>
+							<el-form-item label="车间组长/机管员签名" label-width="160px">
+								<template >
+                    <el-image
+                  :src="form.jgy"
+                  style="width: 260px; height: 100px"
+                  :preview-src-list="form.jgy"
+                  fit="fill" />
+                </template>
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
 						<el-col :span="20">
-							<el-form-item label="质量管理部品管员签名" prop="checkManName" label-width="160px">
-								<el-input disabled/>
+							<el-form-item label="质量管理部品管员签名" label-width="160px">
+								<template >
+                    <el-image
+                  :src="form.pgy"
+                  style="width: 260px; height: 100px"
+                  :preview-src-list="form.jgy"
+                  fit="fill" />
+                </template>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -898,6 +910,8 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
+        jgy: null,
+        pgy: null,
 
 			};
 			this.spanArr = [];