Merge branch 'master' into kdwc-xcx

pages_manage/aptitudeAudit/aptitudeAuditCheck.vue

@@ -52,19 +52,20 @@
 				<view>用气申请表：</view>
 				<img class="issue_img" :src="baseUrl+form.applyCertificate">
 			</view>
-			<view  class="check_li" style="border-bottom:0;">
+			<view  class="check_li" style="border-bottom:0;"
+				v-if="(form.leadAuditStatus==0 && form.isAdmin && form.audit)||(form.leadAuditStatus==1 && form.centerAuditStatus!=2 && form.audit)">
 				<view></view>
 				<view>审核意见：</view>
 				<textarea v-model="params.leadAuditCause" class="check_li_b"  placeholder="请输入审核意见"></textarea>
 			</view>
 		</view>
 		<!-- 用气实验室 -->
-		<view  class="sub_btn" v-if="status=='yq' && form.leadAuditStaus==0  && form.isAdmin && form.audit">
+		<view  class="sub_btn" v-if="status=='yq' && form.leadAuditStatus==0  && form.isAdmin && form.audit">
 			<view class="sub_btn_l" @click="submitForm(2)">审核驳回</view>
 			<view class="sub_btn_r" @click="submitForm(1)">审核通过</view>
 		</view>
 		<!-- 用气实验中心 -->
-		<view  class="sub_btn" v-if="status=='yq' && form.leadAuditStaus==1 && form.centerAuditStatus!=2  && form.audit">
+		<view  class="sub_btn" v-if="status=='yq' && form.leadAuditStatus==1 && form.centerAuditStatus!=2  && form.audit">
 			<view class="sub_btn_l" @click="submitForm2(2)">审核驳回</view>
 			<view class="sub_btn_r" @click="submitForm2(1)">审核通过</view>
 		</view>
@@ -177,9 +178,9 @@
 				obj.id=_this.params.id;
 				if(this.status=='yq'){
 					if(auditStatus==1){//通过
-						obj.leadAuditStaus=1
+						obj.leadAuditStatus=1
 					}else if(auditStatus==2){//驳回
-					    obj.leadAuditStaus=2
+					    obj.leadAuditStatus=2
 					}
 					const {data} = await auditUseAgsCheck(obj);
 					if(data.code == 200){

pages_manage/workbench/laboratory/monitor.vue

@@ -316,6 +316,7 @@ export default {
               tid:"",
               vol:self.trumpetList[i].deviceVol,
               urls:[]
+
             }
           };
           newList.push(obj);