Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/components/scOpl/scFire.vue

@@ -102,14 +102,6 @@
 						<span>进行中</span>
 					</el-descriptions-item>
 					<el-descriptions-item label="现场照片:" span=2 v-if="form.create_imgs&&form.create_imgs.length>0">
-						<!-- <el-upload
-							v-model:file-list="create_imgs_list"
-							list-type="picture-card"
-							:auto-upload="false"
-							action="#"
-							:disabled="true"
-						>
-						</el-upload>-->
 							<el-image 
 								v-for = "item in form.create_imgs_"
 								:key = "item.id"
@@ -119,6 +111,26 @@
 								fit="cover"
 							/>
 					</el-descriptions-item>
+					<el-descriptions-item label="审批照片:" span=2 v-if="form.audit_imgs&&form.audit_imgs.length>0">
+						<el-image 
+								v-for = "item in form.audit_imgs_"
+								:key = "item.id"
+								style="margin-right: 8px;height: 146px;height:146px;"
+								:src="item.path"
+								:preview-src-list="[item.path]"
+								fit="cover"
+							/>
+					</el-descriptions-item>
+					<el-descriptions-item label="作业照片:" span=2 v-if="form.work_imgs&&form.work_imgs.length>0">
+						<el-image 
+								v-for = "item in form.work_imgs_"
+								:key = "item.id"
+								style="margin-right: 8px;height: 146px;height:146px;"
+								:src="item.path"
+								:preview-src-list="[item.path]"
+								fit="cover"
+							/>
+					</el-descriptions-item>
 					<el-descriptions-item label="关闭照片:" span=2 v-if="form.close_imgs&&form.close_imgs.length>0">
 						<el-image 
 								v-for = "item in form.close_imgs_"

src/views/pm/utask_form.vue

@@ -34,7 +34,7 @@
 							<el-option
 								v-for="item in routeOptions"
 								:key="item.id"
-								:label="item.name"
+								:label="item.label"
 								:value="item"
 							>
 							</el-option>
@@ -165,7 +165,7 @@ export default {
 	methods: {
 		getRouteOptions() {
 			this.$API.mtm.route.list
-				.req({ page: 0, mgroup__belong_dept: this.activeDept })
+				.req({ page: 0, mgroup__belong_dept: this.activeDept, routepack__isnull: true })
 				.then((res) => {
 					for (var i = 0; i < res.length; i++) {
 						if (res[i].material_in_name == undefined) {