Merge branch 'release' into dev

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

@@ -186,10 +186,6 @@ import { showImagePreview } from 'vant';
 import useUserStore from '@/store/modules/user'
 import { v4 as uuidv4 } from 'uuid';
 
-defineOptions({
-  name: 'inspectionTask',
-})
-
 const router = useRouter()
 const route = useRoute()
 

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

@@ -10,15 +10,15 @@
           @click="deleteItem(obj, index)" />
       </p>
       <van-cell-group inset>
-        <van-field v-model="obj.modal"
-          name="modal"
+        <van-field v-model="obj.bcNr"
+          name="bcNr"
           label="提报内容"
           placeholder="请输入提报内容"
           auto-complete="off"
           :rules="[{ required: true, message: '请输入提报内容' }]"
           @change="handleModalityChange(index)" />
-        <van-field v-model="obj.cost"
-          name="cost"
+        <van-field v-model="obj.bcQk"
+          name="bcQk"
           label="执行情况"
           placeholder="执行情况"
           auto-complete="off"
@@ -154,7 +154,7 @@ const deleteItem = async (obj, index) => {
   })
 }
 /*************** 基本信息 ***************/
-// 形式修改
+// 提报内容
 const handleModalityChange = async (index) => {
   await createInspectionTaskDetailAPI({
     taskDetail: {
@@ -163,9 +163,9 @@ const handleModalityChange = async (index) => {
     }
   })
 
-  showNotify({ type: 'success', message: '形式，保存成功' })
+  showNotify({ type: 'success', message: '提报内容，保存成功' })
 }
-// 费用修改
+// 执行情况
 const handleCostChange = async (index) => {
 
   await createInspectionTaskDetailAPI({
@@ -175,7 +175,7 @@ const handleCostChange = async (index) => {
     }
   })
 
-  showNotify({ type: 'success', message: '费用，保存成功' })
+  showNotify({ type: 'success', message: '执行情况，保存成功' })
 }
 // 上传照片
 const displayPhotosRead = async (file, { name, index }) => {

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

@@ -32,7 +32,7 @@
             </template>
             <template #label>
               <div class="item-company">{{ item.storeCode }}</div>
-              <div class="item-address">{{ item.storeAddr }}</div>
+              <div class="item-address">{{ item.address }}</div>
             </template>
           </van-cell>
           <template #right>
@@ -81,11 +81,6 @@
 
 import { getInspectionTaskListAPI} from '@/api'
 import { parseTime } from '@/utils'
-
-defineOptions({
-  name: 'Sales_point_inspection'
-})
-
 const router = useRouter();
 
 // 搜索
@@ -146,13 +141,13 @@ const handleClickStore = (item) => {
 }
 
 // 路由离开守卫：控制是否缓存
-onBeforeRouteLeave((to, from, next) => {
-  if (to.path === '/audit_activity/sales_point_inspection') {
-    // 强制刷新当前组件
-    resetFn()
-  }
-  next()
-})
+// onBeforeRouteLeave((to, from, next) => {
+//   if (to.path === '/audit_activity/sales_point_inspection') {
+//     // 强制刷新当前组件
+//     resetFn()
+//   }
+//   next()
+// })
 
 // 搜索地址
 const search = () => {