heyang 2 anos atrás
pai
commit
e5e91a7895

+ 2 - 2
api/request/config.js

@@ -8,8 +8,8 @@ const config = {
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
-    base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
+	 base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
+    //base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	//base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址
     // base_url: 'https://lab.sxitdlc.com/jndxlabSystem/', //暨大地址

+ 1 - 5
pages_manage/workbench/problemRectification/rectifyDetails.vue

@@ -314,10 +314,6 @@
         <view @click="goUpData(3)">暂无法整改</view>
         <view @click="goUpData(1)">再次提交</view>
       </view>
-      <view class="info-bottom-button-box-three" v-if="details.spStatus == 1" >
-        <view @click="goUpData(2)">复核驳回</view>
-        <view @click="goUpData(4)">复核通过</view>
-      </view>
       <!-- <view class="info-bottom-button-box-three" v-if="userId==newData.createUserId && (details.spStatus == 1 || details.spStatus == 3)">
           <view @click="pageClick(2)">驳回</view>
           <view @click="pageClick(3)">审核通过</view>
@@ -524,7 +520,7 @@ export default {
     async goUpData(type){
       let self = this;
 
-      if(!self.form.zgMs && type!=4 && type!=2){
+      if(!self.form.zgMs){
         uni.showToast({
           title: '请填写整改描述!',
           icon:"none",

+ 0 - 61
pages_manage/workbench/securityCheck/recordDetails.vue

@@ -42,18 +42,6 @@
 					<view>整改截止时间: </view>
 					<view>{{newData.zgjzTime}}</view>
 				</view>
-				<!-- <view class="top-min-info-box" v-if="newData.zgStatus != 0">
-					<view>整改确认时间: </view>
-					<view>{{newData.zgqrTime==null?'':newData.zgqrTime}}</view>
-				</view>
-				<view class="top-min-info-box" v-if="newData.zgStatus == 2">
-					<view>整改驳回时间: </view>
-					<view>{{newData.zgbhTime}}</view>
-				</view>
-				<view class="top-min-info-box" v-if="newData.zgStatus == 4">
-					<view>整改完成时间: </view>
-					<view>{{newData.zgWcsj}}</view>
-				</view> -->
 				<view class="top-info-button" @click="infoClickButton">
 					<view>{{showType?"收起详情":"查看详情"}}</view>
 					<img v-if="showType" src="@/images/Version2.2/icon_aqjc_sq.png">
@@ -69,14 +57,6 @@
 					<img src="@/images/Version2.2/icon_aqjc_zgxx.png">
 					<view>整改信息</view>
 				</view>
-				<!-- <view class="bottom-info-text-box" v-if="newData.zgStatus==4">
-					<view>整改结果:</view>
-					<view>{{newData.zgJg}}</view>
-				</view>
-				<view class="bottom-info-text-box" v-if="newData.zgStatus==2">
-					<view>驳回原因:</view>
-					<view>{{newData.fbYy}}</view>
-				</view> -->
 				<view class="rectified-max-box">
 					<view class="rectified-for-box" v-if="item.isZg != 1" v-for="(item,index) in newData.detailsList" :key="index">
 						<view class="rectified-for-position-index">{{index+1}}</view>
@@ -93,29 +73,8 @@
 								<view>整改描述:</view>
 								<view>{{item.zgMs}}</view>
 							</view>
-							<!-- <view class="rectified-for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">
-								<view>原因分析:</view>
-								<view>{{item.zgYyfx}}</view>
-							</view> -->
-							<!-- <view class="rectified-for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">
-								<view>整改措施:</view>
-								<view>{{item.zgCs}}</view>
-							</view> -->
-						<!-- 	<view class="rectified-for-text-box" v-if="item.isZg == 1">
-								<view>证明信息:</view>
-								<view>{{item.zmClMs==null?'':item.zmClMs}}</view>
-							</view> -->
 						</view>
 						<view class="rectified-for-img-max-box">
-							<!-- <view class="rectified-for-img-box" @click="lockImg(item.yhImg)">
-								<img :src="baseUrl+itemUrl" v-if="indexTwo<4" v-for="(itemUrl,indexTwo) in item.yhImg" :key="indexTwo">
-								<view class="rectified-for-img-min-text" style="color:#999;" v-if="!item.yhImg[0]">未上传隐患照片</view>
-								<view class="rectified-for-img-min-text" v-if="item.yhImg[0]">{{newData.zgStatus==0?'隐患照片':'整改前照片'}} >></view>
-							</view>
-							<view class="rectified-for-img-box" @click="lockImg(item.yhZghImg)" v-if="item.yhZghImg">
-								<img :src="baseUrl+itemUrl" v-if="indexTwo<4" v-for="(itemUrl,indexTwo) in item.yhZghImg" :key="indexTwo">
-								<view class="rectified-for-img-min-text">整改后照片 >></view>
-							</view> -->
 							<view class="rectify_front">
 								<view class="rectify_front_t">整改前照片:</view>
 								<view class="rectify_front_b" @click="lockImg(item.yhImg)">
@@ -178,22 +137,6 @@
 								<view>隐患描述:</view>
 								<view>{{item.yhMs}}</view>
 							</view>
-							<!-- <view class="rectified-for-text-box" v-if="item.isZg == 0 && newData.zgType == 0">
-								<view>整改描述:</view>
-								<view>{{item.zgMs}}</view>
-							</view> -->
-							<!-- <view class="rectified-for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">
-								<view>原因分析:</view>
-								<view>{{item.zgYyfx}}</view>
-							</view> -->
-							<!-- <view class="rectified-for-text-box" v-if="item.isZg == 0 && newData.zgType == 1">
-								<view>整改措施:</view>
-								<view>{{item.zgCs}}</view>
-							</view> -->
-							<!-- <view class="rectified-for-text-box" v-if="item.isZg == 1">
-								<view>证明信息:</view>
-								<view>{{item.zmClMs==null?'':item.zmClMs}}</view>
-							</view> -->
 						</view>
 						<view class="rectified-for-img-max-box">
 							<view class="rectified-for-img-box" @click="lockImg(item.yhImg)">
@@ -209,10 +152,6 @@
 					</view>
 				</view>
 			</view>
-			<!-- <view class="info-bottom-button-box" v-if="newData.zgStatus == 1">
-				<view @click="pageClick(2)">驳回</view>
-				<view @click="pageClick(3)">审核通过</view>
-			</view> -->
 		</view>
 		<view class="input-max-box" v-if="pageType == 2">
 			<view class="input-box">