Merge remote-tracking branch 'origin/develop' into develop

src/components/AttachmentS3Required.vue

@@ -344,3 +344,8 @@
 	}
 </style>
 
+
+
+
+
+

src/view/Home1.vue

@@ -464,7 +464,7 @@ const getQuerySumByType = async () => {
 const functionList = ref([]);
 const coincideNotList = ref([]);
 const queryMenuRecently = () => {
-  const url = '/sgsafe/MenuRecentlyUsedMobile/queryRecentlyUsed';
+  const url = '/sgsafe/MenuRecentlyUsed/queryRecentlyUsed';
   const param = {
     userCode: localStorage.getItem('userCode')
   };

src/view/Home2.vue

@@ -362,7 +362,7 @@ onBeforeRouteLeave((to, from) => {
 const functionList = ref([]);
 const coincideNotList = ref([]);
 const queryMenuRecently = () => {
-  const url = '/sgsafe/MenuRecentlyUsedMobile/queryRecentlyUsed';
+  const url = '/sgsafe/MenuRecentlyUsed/queryRecentlyUsed';
   const param = {
     userCode: localStorage.getItem('userCode')
   };

src/view/projectManage/projectConstructionOperation/projectConstructionOperation_detail/indexLook.vue

@@ -227,6 +227,7 @@
           readonly
           label="风险告知人签字"
           label-width="200"
+          required
         ></van-field>
       </span>
       <!--      <van-button v-if="nextStepFlag===3" type="primary" @click="onClickSignatureFxgzr">点击签名</van-button>-->
@@ -242,6 +243,7 @@
            readonly
            label="其他作业人员签字"
            label-width="200"
+           required
          ></van-field>
       </span>
       <!--      <van-button v-if="nextStepFlag===4" type="primary" @click="onClickSignatureQtzyr">点击签名</van-button>-->
@@ -338,6 +340,7 @@
         readonly
         label="是否穿戴好劳保护品（拍照）"
         label-width="200"
+        required
       ></van-field>
       <AttachmentS3Image :f-id="form.protectClothing+'protectClothin'" />
 </span>
@@ -376,6 +379,7 @@
         readonly
         label="作业开始照片（拍照）"
         label-width="200"
+        required
       ></van-field>
       <AttachmentS3Image :f-id="form.startPhoto+'startPhoto'" />
 </span>
@@ -386,6 +390,7 @@
           readonly
           label="作业人员签退"
           label-width="200"
+          required
         ></van-field>
         <!--        <van-button v-if="nextStepFlag===7" type="primary" @click="onClickSignatureZyryqt">点击签名</van-button>-->
         <!--      <HandwrittenSignature v-if="onClickSignatureZyryqtFlag==='true'" :f-id="form.otherSignatureEnd+'ldseend'" @resetQMFlag="resetFlagFlase"></HandwrittenSignature>-->
@@ -397,6 +402,7 @@
   readonly
   label="作业结束照片（拍照）"
   label-width="200"
+  required
 ></van-field>
       <AttachmentS3Image :f-id="form.endPhoto" />
       </span>
@@ -438,6 +444,7 @@
           readonly
           label="作业负责人签名"
           label-width="200"
+          required
         ></van-field>
         <!--        <van-button v-if="nextStepFlag===10" type="primary" @click="onClickSignatureZyfzrqt">点击签名</van-button>-->
         <!--      <HandwrittenSignature v-if="onClickSignatureZyfzrqtFlag==='true'" :f-id="form.leaderSignatureEnd+'zyfzrqme'" @resetQMFlag="resetFlagFlase"></HandwrittenSignature>-->
@@ -610,26 +617,79 @@ const baocun = async () => {
     form.value.workStatus = '作业结束';
     form.value.realEnd = new Date();
   }
+  /**添加必填项验证**/
+  // 验证风险告知人签字
+  if (form.value.stepNumber === 3) {
+    const fxgzrCount = await getSizeByFid(form.value.leaderSignatureStart + 'fxgzrqzs');
+    if (fxgzrCount === 0) {
+      showToast({
+        type: 'fail',
+        message: '请完成风险告知人签字！'
+      });
+      return;
+    }
+  }
+  // 验证其他作业人员签字
+  if (form.value.stepNumber === 4) {
+    const qtzyrCount = await getSizeByFid(form.value.otherSignatureStart + 'qtzyrqms');
+    if (qtzyrCount === 0) {
+      showToast({
+        type: 'fail',
+        message: '请完成其他作业人员签字！'
+      });
+      return;
+    }
+  }
+  // 验证劳保护品拍照
+  if (form.value.stepNumber === 5) {
+    const protectCount = await getSizeByFid(form.value.protectClothing + 'protectClothin');
+    if (protectCount === 0) {
+      showToast({
+        type: 'fail',
+        message: '请拍摄劳保护品照片！'
+      });
+      return;
+    }
+  }
+  // 验证作业开始拍照
+  if (form.value.stepNumber === 6) {
+    const startPhotoCount = await getSizeByFid(form.value.startPhoto + 'startPhoto');
+    if (startPhotoCount === 0) {
+      showToast({
+        type: 'fail',
+        message: '请拍摄作业开始照片！'
+      });
+      return;
+    }
+  }
   /**添加人员确认判断**/
   if (form.value.stepNumber===7) {
-    let start = await getSizeByFid(form.value.otherSignatureStart+'qtzyrqms')
+    // 验证作业人员签退
     let end = await getSizeByFid(form.value.otherSignature+'ldseend')
+    if(end===0){
+      showToast({
+        type: 'fail',
+        message: '请完成作业人员签退！'
+      });
+      return
+    }
+    // 验证作业结束照片
     let flag = await getSizeByFid(form.value.endPhoto)
     if(flag===0){
       showToast({
         type: 'fail',
-        message: '请拍摄相关照片！'
+        message: '请拍摄作业结束照片！'
       });
-      console.log('无所畏惧');
       return
     }
+    // 验证签退人数是否匹配
+    let start = await getSizeByFid(form.value.otherSignatureStart+'qtzyrqms')
     console.log('start',start,'end',end);
     if(start>end){
       showToast({
         type: 'fail',
         message: '请确认签退人员是否全部签退！'
       });
-      console.log('无所畏惧1');
       return
     }
   }
@@ -644,6 +704,23 @@ const baocun = async () => {
     }
   }
   if (form.value.stepNumber===10) {
+    // 验证作业负责人签退（只能一个人）
+    const leaderSignOutCount = await getSizeByFid(form.value.leaderSignatureEnd + 'zyfzrqme');
+    if (leaderSignOutCount === 0) {
+      showToast({
+        type: 'fail',
+        message: '请完成作业负责人签退！'
+      });
+      return;
+    }
+    if (leaderSignOutCount > 1) {
+      showToast({
+        type: 'fail',
+        message: '作业负责人只能填写一个人！'
+      });
+      return;
+    }
+    // 验证签退人数是否匹配
     if(await getSizeByFid(form.value.leaderSignatureStart+'fxgzrqzs')>await getSizeByFid(form.value.leaderSignatureEnd+'zyfzrqme')){
       showToast({
         type: 'fail',