lvxinghai 4 жил өмнө
parent
commit
e1f5a8e3db

+ 11 - 3
pages/checkMainPoints/checkMainPoints.vue

@@ -38,7 +38,7 @@
 			</view>
 		</tm-modal>
 		<view class="list" v-for="(item, index) in detailList" :key="index">
-			<view class="title">查核要点:{{item.checkPointName}}</view>
+			<view class="title" v-if="item.responseList.length > 0">查核要点:{{item.checkPointName}}</view>
 			<view class="item" 
 				v-for="(child, n) in item.responseList" 
 				@click="childClick(child)"
@@ -124,8 +124,16 @@
 						// 跳转到查核项详情
 						str = 'auditItemDetails/auditItemDetails';
 					} else {
-						// 跳转到查核结果提交
-						str = 'mainPointsDetail/mainPointsDetail';
+						if(this.nowPermission == 1) {
+							uni.showModal({
+							  title: '提示',
+							  content: '请切换至查核者角色再进行查核操作!',
+							  showCancel: false
+							});
+						} else {
+							// 跳转到查核结果提交
+							str = 'mainPointsDetail/mainPointsDetail';
+						}
 					}
 					uni.navigateTo({
 						url: `/pages/${str}?id=${child.id}`

+ 1 - 0
pages/creatingSituations/components/checkPlan.vue

@@ -7,6 +7,7 @@
 					<view class="text-wrap">
 						<input v-if="item.id === 'custom'" 
 							v-model="item.model" 
+							@focus="checkModel(item)"
 							type="number" 
 							@input="createList"
 							placeholder="自定义" />

+ 2 - 0
pages/improve-mission-list/improve-mission-list.vue

@@ -12,6 +12,8 @@
         :task="item"
         :isComplete="true"
 			/>
+			<tm-no-data v-if="completeTaskList.length === 0 && improvingTaskList.length === 0"
+				:textArr="['暂时没有内容可以展示哦', '请返回上一页面或尝试刷新页面']" />
 		</scroll-view>
 	</view>
 </template>

+ 2 - 0
pages/messages/messages.vue

@@ -36,6 +36,8 @@
           </view>
         </view>
       </view>
+			<tm-no-data v-if="MessList.length === 0"
+				:textArr="['暂时没有内容可以展示哦', '请返回上一页面或尝试刷新页面']" />
       <view class="bottomPanDuan"></view>
     </view>
 

+ 1 - 1
pages/mission-details/mission-details.vue

@@ -46,7 +46,7 @@
               <template v-for="(btn, i1) in taskBtn">
                 <tm-button
                   :key="i1"
-                  :type="taskBtn.length === 1 ? 'default' : ( i1 === 0 ? 'default' : 'pramary')"
+                  :type="taskBtn.length === 1 ? 'default' : ( i1 === 0 ? 'pramary' : 'default')"
                   :btnText="btn.name"
                   @btnClick="clickBtn(item, btn)"
                 />

+ 2 - 0
pages/todayCheck/todayCheck.vue

@@ -47,6 +47,8 @@
         </view>
       </view>
     </view>
+		<tm-no-data v-if="list.length === 0"
+			:textArr="['暂时没有内容可以展示哦', '请返回上一页面或尝试刷新页面']" />
   </view>
 </template>
 

+ 2 - 2
utils/requestUrl.js

@@ -1,8 +1,8 @@
 // export const URL = 'http://192.168.38.140:8088'; // 李磊
 // export const URL = 'http://192.168.38.174:8088';
-export const URL = 'http://192.168.1.45:8088'; //内网
+// export const URL = 'http://192.168.1.45:8088'; //内网
 // export const URL = 'http://s1.nsloop.com:5137';  // 外网
-// export const URL = 'http://121.43.139.179:8801';  // 云端服务1
+export const URL = 'http://121.43.139.179:8801';  // 云端服务1
 // export const URL = 'http://172.18.116.20:8801';  // 云端服务2
 
 

+ 2 - 2
utils/wsUrl.js

@@ -1,3 +1,3 @@
-export const wsURL = `ws://192.168.1.45:8088/websocket/${hiId}/${user}/${permission}`; // 内网
-// export const wsURL = `ws://121.43.139.179:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务1
+// export const wsURL = `ws://192.168.1.45:8088/websocket/${hiId}/${user}/${permission}`; // 内网
+export const wsURL = `ws://121.43.139.179:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务1
 // export const wsURL = `ws://172.18.116.20:8801/websocket/${hiId}/${user}/${permission}`; // 云端服务2