首页安全环保检查模块优化

pages/application/hidden-danger-check-standard/custom/list-item-check-hidden-form.vue

@@ -55,13 +55,13 @@
           </view>
         </view>
       </view>
-      <view class="cu-form-textarea margin-top">
+<!--      <view class="cu-form-textarea margin-top">
         <view class="cu-form-title">
           隐患部位
           <button class="cu-btn bg-green sm reg-btn" @click="openHidden" >隐患字典</button>
         </view>
         <textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.HIDDENPART" placeholder="请对隐患部位进行详细描述(必填项)"></textarea>
-      </view>
+      </view>-->
 			<view class="cu-form-textarea margin-top">
 				<view class="cu-form-title">隐患描述</view>
 				<textarea maxlength="-1" :disabled="modalName!=null" v-model="pd.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea>
@@ -286,7 +286,7 @@
         this.pd.CHECK_CONTENT = JSON.parse(decodeURIComponent(event.CHECK_CONTENT));
         this.pd.CHECK_STANDARD = JSON.parse(decodeURIComponent(event.CHECK_STANDARD));
         this.pd.REFERENCE_BASIS = JSON.parse(decodeURIComponent(event.REFERENCE_BASIS));
-        this.pd.HIDDENDESCR = JSON.parse(decodeURIComponent(event.CHECK_RESULT));
+        this.pd.HIDDENDESCR = JSON.parse(decodeURIComponent(event.CHECK_UNQUALIFIED));
 				this.baoBaoType = JSON.parse(decodeURIComponent(event.baoBaoType))+'';
         console.log(this.baoBaoType)
 				this.index = event.index;
@@ -866,7 +866,6 @@
 						prePage.$vm.initflag = true;    // A 页面 init方法 为true
 						prePage.$vm.list[_this.index].ISNORMAL = 1;
 						prePage.$vm.list[_this.index].HIDDEN_ID = _this.pd.HIDDEN_ID;
-            prePage.$vm.list[_this.index].CHECK_RESULT = _this.pd.HIDDENDESCR;
             prePage.$vm.list[_this.index].CHECK_UNQUALIFIED = _this.pd.HIDDENDESCR;
 					}
 					uni.navigateBack({});
@@ -1060,7 +1059,7 @@
       },
       confirm(info){
         this.pd.HIDDENPART = info.HIDDEN_PART
-        // this.pd.HIDDENDESCR = info.INSPECTION_BASIS
+        this.pd.HIDDENDESCR = info.INSPECTION_BASIS
         this.pd.HIDDENLEVEL = 'hiddenLevel0001'
         this.pd.HIDDENLEVELNAME = '一般隐患'
         if (info.HIDDEN_TYPE_ONE_NAME){this.pd.HIDDENTYPENAME = info.HIDDEN_TYPE_ONE_NAME}

pages/application/hidden-danger-check-standard/custom/list-item-check-list.vue

@@ -15,10 +15,13 @@
 							<view class="select">
 								<view @click="checkTrue({index:index},item.HASHIDDEN,0)" class="flex align-center">
 									<radio class='mr10' :class="item.ISNORMAL==0?'checked':''" :checked="item.ISNORMAL==0" disabled></radio>
-									<text>合格</text>
+									<text>合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_QUALIFIED : '' }}</text>
 								</view>
 								<view v-if="item.ISNORMAL==0" @click="$noMultipleClicks(gotoAddImg,item.RECORDITEM_ID)" class="cuIcon-infofill text-blue unqualified"></view>
 							</view>
+              <view v-if="item.ISNORMAL==0 && item.OPERATION_TYPE === 2" class="input">
+                <textarea maxlength="-1" v-model="item.CHECK_UNQUALIFIED" placeholder="合格信息详细描述(必填项)"></textarea>
+              </view>
 							<view class="select">
 								<view class="flex align-center" @click="$noMultipleClicks(goToAdd,
 								{
@@ -34,12 +37,15 @@
                   CHECK_ITEM_NAME:item.CHECK_ITEM_NAME,
                   CHECK_STANDARD: item.CHECK_STANDARD,
                   REFERENCE_BASIS: item.REFERENCE_BASIS,
-                  CHECK_RESULT: item.CHECK_UNQUALIFIED
+                  CHECK_UNQUALIFIED: item.item.CHECK_UNQUALIFIED
                 })">
 									<radio class='red mr10' :class="item.ISNORMAL==1?'checked':''" :checked="item.ISNORMAL==1" disabled ></radio>
-									<text>不合格</text>
+									<text>不合格.{{ item.OPERATION_TYPE === 1 ? item.CHECK_UNQUALIFIED : '' }}</text>
 								</view>
 								<view v-if="item.ISNORMAL==1" @click="$noMultipleClicks(goToEdit,item.HIDDEN_ID)" class="cuIcon-infofill text-blue unqualified"></view>
+                <view v-if="item.ISNORMAL==1 && item.OPERATION_TYPE === 2" class="input">
+                  <textarea maxlength="-1" disabled v-model="item.CHECK_UNQUALIFIED" placeholder="不合格信息详细描述(必填项)"></textarea>
+                </view>
 							</view>
               <view class="select">
                 <view @click="checkTrue({index:index},item.HASHIDDEN,2)" class="flex align-center">
@@ -48,9 +54,6 @@
                 </view>
               </view>
 						</view>
-            <view v-if="item.ISNORMAL==0 || item.ISNORMAL==1" class="input" >
-              <textarea :disabled="item.OPERATION_TYPE === 1 ? true : false" maxlength="-1" v-model="item.CHECK_RESULT" placeholder="检查详细描述(必填项)"  :class="item.OPERATION_TYPE === 1 ? 'bgh' : ''"   style="border: 1px solid #eeeeee;  z-index: 999; height: 50px; padding: 10px;font-size: 12px; width: 100%"></textarea>
-            </view>
 					</radio-group>
 				</view>
 			</view>
@@ -106,7 +109,7 @@
 					title: '请稍候'
 				})
 				uni.request({
-					url: basePath + '/app/hiddenDangerCheckStandardCustom/goCheck', // /app/listmanager/goCheck
+					url: basePath + '/app/hiddenDangerCheckStandardCustom/goCheck',
 					method: 'POST',
 					dataType: 'json',
 					header: {
@@ -131,11 +134,6 @@
 											_this.list[i].HIDDEN_ID = res.data.records[j].HIDDEN_ID;
                       _this.list[i].CHECKRECORD_ID = res.data.records[j].CHECKRECORD_ID;
 											_this.list[i].RECORDITEM_ID = res.data.records[j].RECORDITEM_ID;
-                      if (res.data.records[j].ISNORMAL === 0) {
-                        _this.list[i].CHECK_QUALIFIED = res.data.records[j].CHECK_RESULT;
-                      } else if (res.data.records[j].ISNORMAL === 1) {
-                        _this.list[i].CHECK_UNQUALIFIED = res.data.records[j].CHECK_RESULT;
-                      }
 											// _this.list[i].is_checked = 1;
 										}
 									}
@@ -160,12 +158,14 @@
 
 			//去保存
 			save: function (){
-        var _this = this;
+
         for(var i=0;i<_this.list.length;i++){
           if(this.list[i].ISNORMAL && this.list[i].OPERATION_TYPE === 2) {
             var CHECK_RESULT = ''
-            if (this.list[i].ISNORMAL === 0 || this.list[i].ISNORMAL === 1) {
+            if (this.list[i].ISNORMAL === 0) {
-              CHECK_RESULT = _this.list[i].CHECK_RESULT
+              CHECK_RESULT = _this.list[i].CHECK_QUALIFIED
+            } else if (this.list[i].ISNORMAL === 1) {
+              CHECK_RESULT = _this.list[i].CHECK_UNQUALIFIED
             } else if (this.list[i].ISNORMAL === 2) {
               CHECK_RESULT = "不涉及"
             }
@@ -179,6 +179,15 @@
             }
           }
         }
+        if (!_this.other[0].USER_ID) {
+          uni.showToast({
+            icon: 'none',
+            title: '请添加检查人',
+            duration: 1500
+          });
+          return;
+        }
+				var _this = this;
 				uni.showLoading({
 					title: '请稍候'
 				})
@@ -190,8 +199,10 @@
 						item.CUSTOM_ITEM_ID = _this.list[i].CUSTOM_ITEM_ID
 
 						item.ISNORMAL = _this.list[i].ISNORMAL
-            if (_this.list[i].ISNORMAL === 0 || _this.list[i].ISNORMAL === 1) {
+            if (_this.list[i].ISNORMAL === 0) {
-              item.CHECK_RESULT = _this.list[i].CHECK_RESULT
+              item.CHECK_RESULT = _this.list[i].CHECK_QUALIFIED
+            } else if (_this.list[i].ISNORMAL === 1) {
+              item.CHECK_RESULT = _this.list[i].CHECK_UNQUALIFIED
             } else {
               item.CHECK_RESULT = ''
             }
@@ -326,13 +337,6 @@
 					_this.list[e.index].HIDDEN_ID='';
 					_this.$forceUpdate();//强制刷新
 				}
-        if (STATUS === 0) {
-          _this.$set(_this.list[e.index], 'CHECK_RESULT', _this.list[e.index].CHECK_QUALIFIED)
-        } else if (STATUS === 1) {
-          _this.$set(_this.list[e.index], 'CHECK_RESULT', _this.list[e.index].CHECK_UNQUALIFIED)
-        } else {
-          _this.$set(_this.list[e.index], 'CHECK_RESULT', '不涉及')
-        }
 			},
 			//跳转事件
 			goToAdd(e) {
@@ -361,7 +365,7 @@
               +'&CHECK_ITEM_NAME='+ encodeURIComponent(JSON.stringify(e.CHECK_ITEM_NAME))
               +'&CHECK_STANDARD='+ encodeURIComponent(JSON.stringify(e.CHECK_STANDARD))
               +'&REFERENCE_BASIS='+ encodeURIComponent(JSON.stringify(e.REFERENCE_BASIS))
-              +'&CHECK_RESULT='+ encodeURIComponent(JSON.stringify(e.CHECK_RESULT))
+              +'&CHECK_UNQUALIFIED='+ encodeURIComponent(JSON.stringify(e.CHECK_UNQUALIFIED))
 							+'&index='+e.index
               +'&baoBaoType='+this.baoBaoType
 				});
@@ -387,9 +391,4 @@
 		transform: scale(0.9);
 	}
 
-.bgh{
-  background: #f8f6f6;
-  color: #d9d7d7;
-}
-
 </style>

pages/basics/home.vue

@@ -140,15 +140,26 @@
 
             <navigator class="home-apps-item" hover-class="none" url="/pages/application/safety-environmental-inspection/home">
 
-              <view class="home-apps-item-img">
+              <view class="home-apps-item-img" style="position: relative;">
                 <image src="../../static/icon-apps/home-base.png" mode=""></image>
+                <view v-if="safetyEnvironmentalInspection>0" class="cu-tag badge">{{ safetyEnvironmentalInspection }}</view>
               </view>
               <view class="text">
                 <text>安全环保检查</text>
               </view>
-              <view v-if="safetyEnvironmentalInspection>0" class="cu-tag badge">{{ safetyEnvironmentalInspection }}</view>
             </navigator>
 
+<!--            <navigator class="home-apps-item" hover-class="none" url="/pages/application/safety-environmental-inspection/home">-->
+
+<!--              <view class="home-apps-item-img">-->
+<!--                <image src="../../static/icon-apps/home-base.png" mode=""></image>-->
+<!--              </view>-->
+<!--              <view class="text">-->
+<!--                <text>安全环保检查</text>-->
+<!--              </view>-->
+<!--              <view v-if="safetyEnvironmentalInspection>0" class="cu-tag badge">{{ safetyEnvironmentalInspection }}</view>-->
+<!--            </navigator>-->
+
             <navigator class="home-apps-item" hover-class="none" url="/pages/application/speEquip/index"
                        v-show="premission.speEquip">
               <view class="home-apps-item-img">
@@ -581,6 +592,7 @@ export default {
   mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)
   data() {
     return {
+      keyProjectManagement: '',
       safetyEnvironmentalInspection:0,//安全环保总数
       permissionID:'',
       premission: {},