package.json

@@ -165,6 +165,7 @@
     "@vue/runtime-core": "^3.4.21",
     "@vue/tsconfig": "^0.1.3",
     "autoprefixer": "^10.4.20",
+    "baseline-browser-mapping": "^2.9.19",
     "cross-env": "^10.0.0",
     "eslint": "^9.31.0",
     "eslint-config-prettier": "^10.1.8",

pnpm-lock.yaml

@@ -211,6 +211,9 @@ importers:
       autoprefixer:
         specifier: ^10.4.20
         version: 10.4.21(postcss@8.5.6)
+      baseline-browser-mapping:
+        specifier: ^2.9.19
+        version: 2.9.19
       cross-env:
         specifier: ^10.0.0
         version: 10.0.0
@@ -2889,8 +2892,8 @@ packages:
     resolution: {integrity: sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==}
     engines: {node: '>=6.0.0'}
 
-  baseline-browser-mapping@2.8.15:
-    resolution: {integrity: sha512-qsJ8/X+UypqxHXN75M7dF88jNK37dLBRW7LeUzCPz+TNs37G8cfWy9nWzS+LS//g600zrt2le9KuXt0rWfDz5Q==}
+  baseline-browser-mapping@2.9.19:
+    resolution: {integrity: sha512-ipDqC8FrAl/76p2SSWKSI+H9tFwm7vYqXQrItCuiVPt26Km0jS+NzSsBWAaBusvSbQcfJG+JitdMm+wZAgTYqg==}
     hasBin: true
 
   binary-extensions@2.3.0:
@@ -10402,7 +10405,7 @@ snapshots:
 
   base64url@3.0.1: {}
 
-  baseline-browser-mapping@2.8.15: {}
+  baseline-browser-mapping@2.9.19: {}
 
   binary-extensions@2.3.0: {}
 
@@ -10460,7 +10463,7 @@ snapshots:
 
   browserslist@4.26.3:
     dependencies:
-      baseline-browser-mapping: 2.8.15
+      baseline-browser-mapping: 2.9.19
       caniuse-lite: 1.0.30001749
       electron-to-chromium: 1.5.234
       node-releases: 2.0.23

src/pages/schedule/details/deal/inspection.vue

@@ -130,7 +130,7 @@ function toggleScore(taskIndex: number, score: number | null) {
 
 const lastIndex = ref(0)
 
-async function saveCheckLog({ index }: { index: number }) {
+async function saveCheckLog({ index, isSubmit = false }: { index: number, isSubmit: boolean }) {
   try {
     // 获取当前数据
     const logs = []
@@ -153,11 +153,13 @@ async function saveCheckLog({ index }: { index: number }) {
 
       // 做一些判断，比如必填项
       if (item.hasPhoto === 2 && !item.photoUrl?.length) {
-        throw new Error('请上传照片')
+        // throw new Error('请上传照片')
+        // return
       }
 
       if (item.hasInput === 1 && !item.inputItem) {
-        throw new Error('请输入内容')
+        // throw new Error('请输入内容')
+        // return
       }
 
       if (logInfo.result === 2) {
@@ -169,6 +171,7 @@ async function saveCheckLog({ index }: { index: number }) {
       //   })
       //   return
       // }
+        // return
       }
 
       logs.push(logInfo)
@@ -181,6 +184,13 @@ async function saveCheckLog({ index }: { index: number }) {
       //   title: '提交成功',
       //   icon: 'success',
       // })
+      if (isSubmit) {
+        // 回到详情页
+        uni.navigateBack({
+          delta: 1,
+        })
+      }
+
       lastIndex.value = index
       currentCheckList.value = checkSubItems.value[index]?.items || []
     }
@@ -205,13 +215,29 @@ async function saveCheckLog({ index }: { index: number }) {
 
 // 提交任务
 function submitTasks() {
-  saveCheckLog({ index: activeArea.value }).then(() => {
+  saveCheckLog({ index: activeArea.value, isSubmit: false }).then(() => {
     // 提交任务
-    handleCheckTask(checkId.value).then(() => {
-      uni.showToast({
-        title: '提交成功',
-        icon: 'success',
-      })
+    handleCheckTask(checkId.value).then((res: any) => {
+      // uni.showToast({
+      //   title: '提交成功',
+      //   icon: 'success',
+      // })
+      if (res.code === 200) {
+        uni.showToast({
+          title: '提交成功',
+          icon: 'success',
+        })
+
+        uni.navigateBack({
+          delta: 1,
+        })
+      }
+      else {
+        uni.showToast({
+          title: res.msg || '提交失败',
+          icon: 'none',
+        })
+      }
     }).catch(() => {
       uni.showToast({
         title: '提交失败',
@@ -260,6 +286,20 @@ function init() {
   })
 }
 
+const toastHtml = ref('')
+const popupShow = ref({
+  centerShow: false,
+  bottomShow: false,
+})
+function helpClick(task: any) {
+  toastHtml.value = task.checkDescription
+  popupShow.value.centerShow = true
+}
+function helpClose() {
+  toastHtml.value = ''
+  popupShow.value.centerShow = false
+}
+
 onMounted(async () => {
   await init()
 })
@@ -295,10 +335,10 @@ onMounted(async () => {
             <text class="task-text">
               {{ task.itemName }}
               <wd-icon
-                v-if="task?.icon"
-                :name="task?.icon"
+                v-if="task?.checkDescription"
+                name="help-circle"
                 size="32rpx"
-                @click="() => (popShow.centerShow = true)"
+                @click="helpClick(task)"
               />
             </text>
           </view>
@@ -333,8 +373,7 @@ onMounted(async () => {
           <view v-if="task.hasPhoto > 0 || (task?.images?.length > 0)" class="image-upload-container">
             <!-- 上传按钮 -->
             <view
-              v-if="task.hasPhoto > 0"
-              class="upload-btn"
+              v-if="task.hasPhoto > 0" :class="[task.hasPhoto === 2 ? 'upload-btn-req' : 'upload-btn']"
               @tap="chooseImage(+index)"
             >
               <view class="btn-content">
@@ -389,6 +428,9 @@ onMounted(async () => {
               <text class="link-text" @tap="toggleTaskStatus(task)">{{ task.formOperationIssue ? '点击查看异常' : '点击填写异常（未满分必填）' }}</text>
             </view>
           </view>
+          <wd-divider color="#EEEEEE" />
+          <!-- 分割线 -->
+          <!-- <view class="my-4 border-b border-gray-300" /> -->
         </view>
       </view>
     </scroll-view>
@@ -406,10 +448,27 @@ onMounted(async () => {
       <button class="btn" @click="submitTasks">
         提交
       </button>
-      <button class="btn" @click="saveCheckLog({ index: activeArea.value })">
+      <button class="btn" @click="saveCheckLog({ index: activeArea.value, isSubmit: true })">
         保存
       </button>
     </view>
+    <wd-popup
+      v-model="popupShow.centerShow"
+      custom-style="border-radius:32rpx;"
+      @close="helpClose"
+    >
+      <view class="popup-content">
+        <view style="font-size: 36rpx; font-weight: 500; color: #020917">
+          说明
+        </view>
+        <view style="font-size: 32rpx; font-weight: 400; color: #343a45" v-html="toastHtml" />
+        <view style="width: 100%">
+          <button class="btn" @click="helpClose">
+            我 知 道 了
+          </button>
+        </view>
+      </view>
+    </wd-popup>
   </view>
 </template>
 
@@ -468,6 +527,7 @@ onMounted(async () => {
   // 任务项
   .task-item {
     margin-bottom: 40rpx;
+    padding-right: 20px;
 
     // 任务描述
     .task-description {
@@ -608,6 +668,35 @@ onMounted(async () => {
       }
     }
 
+    .upload-btn-req {
+      width: 140rpx;
+      height: 100rpx;
+      border: 2rpx dashed red;
+      border-radius: 8rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-shrink: 0;
+
+      .btn-content {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        .btn-icon {
+          font-size: 40rpx;
+          color: red;
+          line-height: 40rpx;
+        }
+
+        .btn-text {
+          font-size: 24rpx;
+          color: red;
+          margin-top: 4rpx;
+        }
+      }
+    }
+
     // 已上传图片
     .uploaded-images {
       display: flex;
@@ -815,4 +904,26 @@ onMounted(async () => {
     }
   }
 }
+
+.popup-content {
+  width: 600rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  padding: 40rpx;
+  box-sizing: border-box;
+  gap: 40rpx;
+  .btn {
+    width: 100%;
+    height: 80rpx;
+    background-color: #215acd;
+    color: white;
+    font-size: 32rpx;
+    border-radius: 12rpx;
+    font-weight: 400;
+    border: none;
+    outline: none;
+  }
+}
 </style>

src/pages/schedule/details/index.vue

@@ -454,11 +454,12 @@ onMounted(async () => {
           <view class="guide-value flex items-center justify-between">
             {{ taskInfo.executorName || '-' }}
             <wd-select-picker
+              v-if="buttons.transfer"
               v-model="value"
               title="选择转交人"
               filterable :max="1" use-default-slot :columns="users" style="z-index:101" @confirm="handleTransferTask"
             >
-              <wd-button v-if="buttons.transfer" type="text">
+              <wd-button type="text">
                 转交
               </wd-button>
             </wd-select-picker>
@@ -474,6 +475,7 @@ onMounted(async () => {
               v-model="planTimeValue"
               type="datetime"
               title="选择计划时间"
+              style="z-index:101"
               :min-date="new Date().getTime()"
               :max-date="new Date(taskInfo.endTime).getTime()"
               @confirm="handlePlanTimeChange"