refactor(inspectiontask/*): 修改：勤策移动端_售点稽查_上传照片添加loading效果

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/index.vue

@@ -219,6 +219,7 @@ const form = reactive({ // 当前页信息总对象
 const getInspectionTaskDetailFn = async () => {
   const res = await getInspectionTaskDetailAPI({
     storeCode: form.storeCode,
+    storeName: form.storeName,
     rstId: form.rstId,
   })
   if (res.data) {
@@ -273,20 +274,7 @@ const getInspectionTaskDetailFn = async () => {
   // 一定在这里获取地理位置（保证稽查任务 id 创建完毕）
   getLocationFn()
 }
-onMounted(async () => {
-  if (route.query.taskStatus) {
-    // 从新建稽查任务页面过来的，直接初始化
-    // 先走一次创建任务，再走查询详情
-    // 没有的话调用新建接口，得到一个总体稽查任务 id
-    const res = await createInspectionTaskAPI({
-      storeName: route.query.storeName,
-      storePicture: route.query.storePicture,
-      selectedType: route.query.selectedType
-    })
-    form.rstId = res.data.rstId
-  }
-  getInspectionTaskDetailFn()
-})
+getInspectionTaskDetailFn()
 
 
 // 门店图片预览
@@ -365,12 +353,17 @@ const handleClickLocation = () => {
 /*************** 门头照上传 ***************/
 // 上传照片
 const commitStorePhotosRead = async (file) => {
+  form.commitStorePicture = [{
+    url: file.content,
+    status: 'uploading',
+    message: '上传中...'
+  }]
   const date = new Date()
   const month = date.getMonth() + 1
-  const theDate = date.getDate()
   const pictureUrl = await uploadFileToOSSAPI(`risk/${date.getFullYear()}-${month}/storeFrontPhoto/${useUserStore().empInfo.empNo}/${uuidv4()}.png`, file.file)
   form.commitStorePicture = [{
-    url: pictureUrl
+    url: pictureUrl,
+    status: 'done'
   }]
   await createInspectionTaskAPI({
     storeCode: form.storeCode,
@@ -448,13 +441,20 @@ const handleRemarkChange = async () => {
 
 // 大日期照片上传
 const longTimePictureArrRead = async (file) => {
+  const index = form.longTimePictureArr.length
+  form.longTimePictureArr[index] = {
+    url: file.content,
+    status: 'uploading',
+    message: '上传中...'
+  }
   const date = new Date()
   const month = date.getMonth() + 1
   const theDate = date.getDate()
   const pictureUrl = await uploadFileToOSSAPI(`risk/${date.getFullYear()}-${month}/longTimePicture/${useUserStore().empInfo.empNo}/${form.storeCode}/${uuidv4()}.png`, file.file)
-  form.longTimePictureArr.push({
-    url: pictureUrl
-  })
+  form.longTimePictureArr[index] = {
+    url: pictureUrl,
+    status: 'done'
+  }
   await createInspectionTaskAPI({
     storeCode: form.storeCode,
     storeName: form.storeName,

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/conventionalDisplay.vue

@@ -151,7 +151,7 @@ const deleteItem = async (obj, index) => {
     nextTick(() => {
       isDeleteNow.value = false
     })
-    showNotify({ type: 'success', message: '删除成功' })
+    showNotify({ type: 'success', message: '删除分组成功' })
   })
 }
 
@@ -183,14 +183,20 @@ const handleCostChange = async (index) => {
 const displayPhotosRead = async (file, { name, index }) => {
   // name：是当前照片组件所在陈列组的索引
   // index: 当前照片组的索引
-   const date = new Date()
+  const date = new Date()
   const month = date.getMonth() + 1
-  const theDate = date.getDate()
   const target = displayGroup.value[name]
+  const photoIndex = target.photoArr.length
+  target.photoArr[photoIndex] = {
+    url: file.content,
+    status: 'uploading',
+    message: '上传中...'
+  }
   const pictureUrl = await uploadFileToOSSAPI(`risk/${date.getFullYear()}-${month}/displayPhoto/${useUserStore().empInfo.empNo}/${props.form.storeCode}/${uuidv4()}.png`, file.file)
-  target.photoArr.push({
-    url: pictureUrl
-  })
+  target.photoArr[photoIndex] = {
+    url: pictureUrl,
+    status: 'done'
+  }
 
   await createInspectionTaskDetailAPI({
     taskDetail: {
@@ -236,7 +242,7 @@ const handleOverallChange = async () => {
     rstId: props.form.rstId,
     cgclRiskRArr: props.form.cgclRiskRArr
   })
-  showNotify({ type: 'success', message: '核查结果，保存成功' })
+  showNotify({ type: 'success', message: '总体核查结果，保存成功' })
 }
 
 defineExpose({

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/scheduleAdjustment.vue

@@ -22,7 +22,7 @@
           label="执行情况"
           placeholder="执行情况"
           auto-complete="off"
-          :rules="[{ required: true, message: '请输入执行情况' }]" 
+          :rules="[{ required: true, message: '请输入执行情况' }]"
           @change="handleCostChange(index)" />
         <van-field label="档期补差照片"
           label-align="top"
@@ -150,7 +150,7 @@ const deleteItem = async (obj, index) => {
     nextTick(() => {
       isDeleteNow.value = false
     })
-    showNotify({ type: 'success', message: '删除成功' })
+    showNotify({ type: 'success', message: '删除分组成功' })
   })
 }
 /*************** 基本信息 ***************/
@@ -181,14 +181,20 @@ const handleCostChange = async (index) => {
 const displayPhotosRead = async (file, { name, index }) => {
   // name：是当前照片组件所在陈列组的索引
   // index: 当前照片组的索引
-   const date = new Date()
+  const date = new Date()
   const month = date.getMonth() + 1
-  const theDate = date.getDate()
   const target = displayGroup.value[name]
+  const targetIndex = target.photoArr.length
+  target.photoArr[targetIndex] = {
+    url: file.content,
+    status: 'uploading',
+    message: '上传中...'
+  }
   const pictureUrl = await uploadFileToOSSAPI(`risk/${date.getFullYear()}-${month}/scheduleAdjustmentPhoto/${useUserStore().empInfo.empNo}/${props.form.storeCode}/${uuidv4()}.png`, file.file)
-  target.photoArr.push({
-    url: pictureUrl
-  })
+  target.photoArr[targetIndex] = {
+    url: pictureUrl,
+    status: 'done'
+  }
 
   await createInspectionTaskDetailAPI({
     taskDetail: {
@@ -198,7 +204,7 @@ const displayPhotosRead = async (file, { name, index }) => {
     }
   })
 
-  showNotify({ type: 'success', message: '档期陈列照片，上传成功' })
+  showNotify({ type: 'success', message: '档期补差照片，上传成功' })
 }
 // 删除照片
 const deletedisplayPhotos = async (file, { name, index }) => {
@@ -211,7 +217,7 @@ const deletedisplayPhotos = async (file, { name, index }) => {
       photoArr: target.photoArr.map(o => o.url)
     }
   })
-  showNotify({ type: 'success', message: '档期陈列照片，删除成功' })
+  showNotify({ type: 'success', message: '档期补差照片，删除成功' })
 }
 // 核查结果
 const handleVerifyChange = async (index) => {

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/inspectionTask/tabs/scheduleDisplay.vue

@@ -150,7 +150,7 @@ const deleteItem = async (obj, index) => {
     nextTick(() => {
       isDeleteNow.value = false
     })
-    showNotify({ type: 'success', message: '删除成功' })
+    showNotify({ type: 'success', message: '删除分组成功' })
   })
 }
 /*************** 基本信息 ***************/
@@ -183,12 +183,18 @@ const displayPhotosRead = async (file, { name, index }) => {
   // index: 当前照片组的索引
   const date = new Date()
   const month = date.getMonth() + 1
-  const theDate = date.getDate()
   const target = displayGroup.value[name]
+  const targetIndex = target.photoArr.length
+  target.photoArr[targetIndex] = {
+    url: file.content,
+    status: 'uploading',
+    message: '上传中...'
+  }
   const pictureUrl = await uploadFileToOSSAPI(`risk/${date.getFullYear()}-${month}/scheduleDisplayPhoto/${useUserStore().empInfo.empNo}/${props.form.storeCode}/${uuidv4()}.png`, file.file)
-  target.photoArr.push({
-    url: pictureUrl
-  })
+  target.photoArr[targetIndex] = {
+    url: pictureUrl,
+    status: 'done'
+  }
 
   await createInspectionTaskDetailAPI({
     taskDetail: {
@@ -234,7 +240,7 @@ const handleOverallChange = async () => {
     rstId: props.form.rstId,
     dqclRiskRArr: props.form.dqclRiskRArr
   })
-  showNotify({ type: 'success', message: '核查结果，保存成功' })
+  showNotify({ type: 'success', message: '总体核查结果，保存成功' })
 }
 
 defineExpose({

src/views/mobile/pages/audit_activity/sales_point_inspection/examine/newTerminal.vue

@@ -79,7 +79,7 @@
 </template>
 
 <script setup>
-import { uploadFileToOSSAPI } from '@/api'
+import { uploadFileToOSSAPI, createInspectionTaskAPI } from '@/api'
 import { v4 as uuidv4 } from 'uuid';
 import { typeOptions as typeOption } from '@/views/mobile/constant'
 import useUserStore from '@/store/modules/user'
@@ -92,49 +92,54 @@ const form = reactive({
   selectedType: ''
 })
 const typeOptions = ref(typeOption); // 渠道类型
-const showTypePopup = ref(false);
 
 // 门头照上传逻辑
 const posPhotosRead = async (file) => {
+  form.storePicture = [
+    {
+      url: file.content,
+      status: 'uploading',
+      message: '上传中...'
+    }
+  ]
   const date = new Date()
   const month = date.getMonth() + 1
-  const theDate = date.getDate()
   const pictureUrl = await uploadFileToOSSAPI(`risk/newTerminal-storePhoto/${date.getFullYear()}-${month}/${useUserStore().empInfo.empNo}/${uuidv4()}.png`, file.file)
   form.storePicture = [{
-    url: pictureUrl
+    url: pictureUrl,
+    status: 'done'
   }]
   showNotify({ type: 'success', message: '照片上传成功' })
 }
+
 // 删除照片
 const deletePosPhotos = async () => {
   form.storePicture = []
   showNotify({ type: 'success', message: '照片删除成功' })
 }
 
-// 确认渠道类型
-// const handleTypeConfirm = ({ selectedValues }) => {
-//   form.selectedType = selectedValues;
-//   showTypePopup.value = false;
-// };
-
 // 创建任务（跳转路由传参即可）
 const myFormRef = ref(null)
 const handleCreateTask = () => {
   // 校验整个表单
-  myFormRef.value.validate().then(() => {
-    // 校验通过，执行创建任务逻辑
+  myFormRef.value.validate().then(async () => {
+    const res = await createInspectionTaskAPI({
+      storeName: form.storeName,
+      storePicture: form.storePicture[0]?.url,
+      selectedType: form.selectedType
+    })
+    // 校验通过，跳到稽查任务详情页
     router.push({
       path: '/inspectionTask',
       query: {
-        taskStatus: true,
+        rstId: res.data.rstId,
         storeName: form.storeName,
         storePicture: form.storePicture[0]?.url,
         selectedType: form.selectedType
       }
     })
   })
-};
-
+}
 </script>
 
 <style lang="scss"