外反APP-必填优化

外反App-补充
2025-10-09 09:58:25 +08:00 · 2025-09-29 15:44:47 +08:00 · 2025-09-29 15:44:09 +08:00 · 2025-09-29 15:41:51 +08:00 · 2025-09-29 15:40:03 +08:00 · 2025-09-24 16:51:33 +08:00
29 changed files with 3876 additions and 657 deletions
--- a/src/api/crm/activity/map.js
+++ b/src/api/crm/activity/map.js
@@ -10,6 +10,14 @@ export function addStartMap(data) {
  });
 }

+//出差打卡接口
+export function businessTripClockIn(data) {
+  return request.post({
+    url: '/crm/app/appVisistMap/businessTripClockIn',
+    data
+  },{isTransformResponse:false});
+}
+
 //新增地图开始打卡接口
 export function addStartMapForClockIn(data) {
  return request.post({
--- a/src/api/eqf/qualityFeedback.js
+++ b/src/api/eqf/qualityFeedback.js
@@ -0,0 +1,151 @@
+import request from '@/utils/request'
+
+// 查询外部质量反馈列表
+export function listFeedback(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/list',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询电阻器类型
+export function listgetResistorTypeList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetResistorTypeList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询产品大类
+export function listgetProductCategoriesList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetProductCategoriesList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询产品分类
+export function listgetClassificationList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetClassificationList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询问题现象
+export function listgetProblemPhenomenonList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetProblemPhenomenonList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询问题发生阶段
+export function listgetProblemStageList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetProblemStageList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 查询用户诉求标签
+export function listgetCustomerAppealLabelList(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/listgetCustomerAppealLabelList',
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 新增外部质量反馈
+export function qualityFeedbackAdd(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackAdd',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+
+// 查询电阻器的批号
+export function getMockBatchData(data) {
+  return request.get({
+    url: '/crm/app/eqf/qualityFeedback/getMockBatchData',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+
+// 新增外部质量反馈明细
+export function qualityFeedbackDetailAdd(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackDetailAdd',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+//根据合同号查询
+export function getCustomerOrderList(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/getCustomerOrderList',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+
+//根据管壳合同号查询
+export function getGkCustomerOrderList(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/getGkCustomerOrderList',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+
+// 新增外部质量反馈管壳明细
+export function qualityFeedbackGkDetailAdd(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/qualityFeedbackGkDetailAdd',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 删除外部质量反馈
+export function removeQualityFeedback(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/removeQualityFeedback',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
+
+// 更新外部质量反馈状态
+export function updateStatus(data) {
+  return request.post({
+    url: '/crm/app/eqf/qualityFeedback/updateStatus',
+    data
+  }, {
+    isTransformResponse: false
+  });
+}
--- a/src/components/closeableModal.vue
+++ b/src/components/closeableModal.vue
@@ -0,0 +1,176 @@
+<!--
+ * @author wangzhuo
+ * @date 2025/9/18 10:30
+ * @description 模态弹窗组件（支持点击蒙层关闭、支持换行显示内容）
+-->
+<template>
+  <view class="model" v-if="modelValue" @click="handleClose" @touchmove.prevent @mousewheel.prevent>
+    <view v-if="closeTip" style="color:rgba(255,255,255,0.15); letter-spacing: 5rpx; margin-top: 50%;text-align: center">{{closeTip}}</view>
+    <view class="model-con" @click.stop>
+      <view class="model-top" v-if="title">{{ title }}</view>
+      <view :class="{'model-middle': true,'m-height': !title, 'align-center': contentAlign==='center'}">
+        <view v-for="text in content.split('\n')">{{text}}</view>
+      </view>
+      <view class="model-bottom">
+        <button v-if="cancelBtn" type="primary" class="btn-cancel" @click="handleCancel">{{ cancelText }}</button>
+        <button v-if="confirmBtn" type="default" class="btn-green" @click="handleConfirm" :loading="loading"
+                :disabled="loading">{{ confirmText }}
+        </button>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import {ref} from 'vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  closeTip: {
+    type: String,
+    default: "点按空白处取消",
+  },
+  title: {
+    type: String,
+  },
+  content: {
+    type: String
+  },
+  contentAlign: {
+    type: String
+  },
+  cancelBtn: {
+    type: Boolean,
+    default: true
+  },
+  confirmBtn: {
+    type: Boolean,
+    default: true
+  },
+  cancelText: {
+    type: String,
+    default: '取消'
+  },
+  confirmText: {
+    type: String,
+    default: '确认'
+  }
+})
+
+let loading = ref(false);
+
+// 调用父组件的方法
+const emit = defineEmits(['update:modelValue', 'cancel', 'confirm', 'success'])
+
+// 点击蒙层关闭模态窗
+const handleClose = () => {
+  emit('update:modelValue', false);
+}
+
+const handleCancel = () => {
+  emit('cancel');
+  emit('success', 'cancel')
+  handleClose();
+}
+
+const handleConfirm = () => {
+  emit('confirm');
+  emit('success', 'confirm')
+  handleClose();
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.model {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 9999;
+
+  .model-con {
+    background: #fff;
+    position: fixed;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    top: 50%;
+    left: 50%;
+    width: 500rpx;
+    min-height: 278rpx;
+    margin-left: -270rpx;
+    margin-top: -139rpx;
+    border-radius: 24rpx;
+    padding: 20rpx 30rpx;
+  }
+
+  .model-top {
+    text-align: center;
+    padding: 20rpx 0;
+    font-size: 36rpx;
+    font-weight: 700;
+  }
+
+  .model-middle {
+    // margin-top:290rpx;
+    text-align: start;
+    font-size: 30rpx;
+    //line-height: 42rpx;
+    color: #333333;
+
+    .font-green {
+      color: #05A3F4;
+      font-size: 42rpx;
+      font-weight: bold;
+      padding: 20rpx 0;
+    }
+  }
+
+  .align-center{
+    text-align: center;
+  }
+
+  .m-height {
+    padding-top: 28rpx;
+  }
+
+  .model-bottom {
+    display: flex;
+    justify-content: center;
+    padding: 30rpx 0 20rpx;
+    // align-items: center;
+    .btn-green, .btn-cancel {
+      background-color: #fff;
+      color: #05A3F4;
+      border-radius: 48rpx;
+      width: 200rpx;
+      height: 65rpx;
+      line-height: 60rpx;
+      text-align: center;
+      font-size: 30rpx;
+      border: 1px solid #05A3F4;
+      margin-left: 0rpx !important;
+      margin-right: 0 !important;
+
+      &::after {
+        border: none;
+        border-radius: 37rpx;
+      }
+    }
+
+    .btn-green {
+      border: 1px solid #05A3F4;
+      background-color: #05A3F4;
+      color: #fff;
+      margin-left: 20rpx !important;
+    }
+  }
+}
+</style>
--- a/src/constants/mapApiConstants.js
+++ b/src/constants/mapApiConstants.js
@@ -0,0 +1,22 @@
+/**
+ * @description 定位API的配置
+ * @type {{URL: string, token: string}}
+ */
+export const MapApiConfig = {
+    /**
+     * @description API接口地址
+     */
+    URL: 'https://tiles.geovisearth.com/geo/v1/geocode/regeo',
+    /**
+     * @description 接口鉴权Token
+     */
+    token: '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf',
+    /**
+     * @description 打卡类型：西安办事处
+     */
+    XI_AN_BAN: {latitude: 34.1360, longitude: 108.9126, typeName: '西安办事处位置打卡'},
+    /**
+     * @description 打卡类型：第三方维护
+     */
+    OTHER: {typeName: '第三方维护打卡'}
+}
--- a/src/pages.json
+++ b/src/pages.json
@@ -331,7 +331,8 @@
 			"path": "pages/business/CRM/plan/planView",
 			//周计划查看
 			"style": {
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -542,11 +543,73 @@
 		{
 			"path": "pages/business/CRM/map/checkinStatistics",
 			//打卡统计
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackIndex",
+			//质量反馈
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path" : "pages/business/EQF/qualityFeedback/qualityFeedbackAdd",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/chooseCus",
+			//选择客户单位
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/qualityFeedbackEnter",
+			//明细录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/qualityFeedbackDetailComponent",
+			
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/customerOrder",
+			//选择合同
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/gkCustomerOrder",
+			//选择合同
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter",
+			//明细录入
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path": "pages/business/EQF/components/gkQualityFeedbackDetailComponent",
+			
 			"style": {
 				"navigationBarTitleText": ""
 			}
 		}
-		//===================================活动报告====================
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
--- a/src/pages/business/CRM/customer/changeCustomerOwner.vue
+++ b/src/pages/business/CRM/customer/changeCustomerOwner.vue
@@ -295,7 +295,7 @@ let handleCopyInfo = (item) => {
 }
 </script>

-<style lang="scss" scoped>
+<style scoped>
 .all-body {
  /* #ifdef APP-PLUS */
  top: 160rpx;
@@ -306,19 +306,9 @@ let handleCopyInfo = (item) => {
  height: calc(100vh - 116rpx);
  /* #endif */
 }
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}

-.search .btn-search::after {
-  display: none;
+.scroll-h {
+  height: 100%;
 }

 .white-bg {
--- a/src/pages/business/CRM/customer/components/customerUserEdit.vue
+++ b/src/pages/business/CRM/customer/components/customerUserEdit.vue
@@ -612,12 +612,11 @@ let submitForm = async () => {
        uni.showToast({
          title: "更新成功"
        })
-        setTimeout(()=>{
-          uni.navigateBack();
        const eventChannel = instance.getOpenerEventChannel();
        eventChannel.emit("refreshCusUserList");
+        setTimeout(()=>{
+          uni.navigateBack();
        },1000);
-
      }else{
        uni.showToast({
          title: "操作失败",
--- a/src/pages/business/CRM/customer/customerAudit.vue
+++ b/src/pages/business/CRM/customer/customerAudit.vue
@@ -7,7 +7,13 @@
  <view class="con-body">
    <view class="con-bg">
      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="false">
+      <customHeader ref="customHeaderRef" :title="'客户人员审核'" :leftFlag="true" :rightFlag="list.length > 0">
+        <template #right>
+          <view class="head-right" @click="handleReSort">
+            <uni-icons type="arrow-down" size="20" color="#B7D2FF"></uni-icons>
+            {{iconType==='arrow-up'?'最新':'最早'}}
+          </view>
+        </template>
      </customHeader>

      <!-- 高度来避免头部遮挡 -->
@@ -101,9 +107,13 @@ let handleSearch = () => {
 watch(searchValue, (newValue, oldValue) => {
  handleSearch()
 })
-let clearSearchValue = () => {
-  searchValue.value = '';
+// 排序图标
+const iconType = ref('arrow-up');
+let handleReSort = () => {
+  iconType.value = iconType.value === 'arrow-down' ? 'arrow-up' : 'arrow-down';
+  list.value = list.value.reverse();
 }
+
 // 查询列表
 let list = ref([]);

@@ -230,12 +240,7 @@ let handleDetail = (item) => {
 }

 .scroll-h {
-  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
-  /* #endif */
-  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
-  /* #endif */
+  height: 100%;
 }

 .white-bg {
--- a/src/pages/business/CRM/customer/customerUserBelong.vue
+++ b/src/pages/business/CRM/customer/customerUserBelong.vue
@@ -163,7 +163,7 @@ const downCallback = async (mescroll) => {
      const res = await getList(1, mescroll.size || upOption.page.size);
      list.value = res.list;
      // 正确传递 total 参数
-      mescroll.endSuccess(res.list.length, res.total > (mescroll.size || upOption.page.size));
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
    } catch (error) {
      mescroll.endErr();
    } finally {
@@ -184,7 +184,7 @@ const upCallback = async (mescroll) => {
        list.value.push(...res.list);
      }
      // 正确判断是否还有更多数据
-      mescroll.endBySize(res.list.length, res.total)
+      mescroll.endSuccess(res.list.length, res.total >= mescroll.size);
      // mescroll.endSuccess(res.list.length, res.total > mescroll.num * mescroll.size);
    } catch (error) {
      mescroll.endErr();
@@ -222,6 +222,7 @@ let handleDetail = (item) => {
      url: "/pages/business/CRM/customer/components/customerUserEdit",
      events: {
        refreshCusUserList() {
+          console.log('refreshCusUserList',"响应刷新")
          handleSearch();
        }
      },
--- a/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
+++ b/src/pages/business/CRM/mainOwner/audit/confirmForm.vue
@@ -602,11 +602,11 @@ let handleReject = () => {
    async success(res){
      if(res.confirm){
        if(res.content){
-          let res = await changeOfPrimaryOwnershipNoApproved({
+          let response = await changeOfPrimaryOwnershipNoApproved({
            opinionOwn: res.content,
            userId: formData.value.userId
          })
-          if(res.code==200){
+          if(response.code===200){
            uni.showToast({
              title: '操作成功',
              success(){
--- a/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
+++ b/src/pages/business/CRM/mainOwner/audit/mainOwnerChangeAudit.vue
@@ -21,7 +21,6 @@
 <!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"-->
 <!--                          v-model="searchValue"-->
 <!--          />-->
-        <!--          <button type="default" @click="clearSearchValue" size="mini" class="btn-search">清空</button>-->
 <!--        </view>-->

        <!-- 分页部分  -->
@@ -33,8 +32,8 @@
            <view class="report-list" @click.stop="handleDetail(item)">
              <view class="r-list title">
                {{ item.cusName }}
-                <view class="r-right" :class="item.auditStatus ? '' : 'btn-pink' ">
-                  {{ item.auditStatus ? '' : '待您审批' }}
+                <view class="r-right no-wrap" :class="item.auditStatus ? 'btn-blue' : 'btn-pink' ">
+                  {{ item.auditStatus ?  item.auditStatus : '待您审核' }}
                </view>
              </view>
              <view class="r-list">
@@ -100,7 +99,8 @@ const mescrollRef = ref(null);
 let timerId = null;
 // 查询搜索跳转
 let handleSearch = () => {
-  // 防抖搜索    console.log(searchValue.value)
+  // 防抖搜索
+  console.log(searchValue.value)
  if (timerId) clearTimeout(timerId);

  timerId = setTimeout(async () => {
@@ -236,43 +236,17 @@ let handleDetail = (item) => {
  /* #endif */
 }

-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
 .scroll-h{
  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
-
 .white-bg {
  padding-bottom: 10rpx;

@@ -281,7 +255,11 @@ let handleDetail = (item) => {
  }
 }

-.btn-pink {
+.no-wrap {
  white-space: nowrap;
 }
+
+.btn-blue {
+  border-radius: 10rpx;
+}
 </style>
--- a/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
+++ b/src/pages/business/CRM/mainOwner/view/viewMainOwner.vue
@@ -1,19 +1,17 @@
+<!--
+ * @description 查看主归属人变更
+ * @update date 2025/9/17 21:45
+-->
 <template>
  <view class="con-body">
    <view class="con-bg">
      <!-- 头部 -->
-      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true" :rightFlag="false"></customHeader>
+      <customHeader ref="customHeaderRef" :title="'查看主归属人变更'" :leftFlag="true"
+                    :rightFlag="false"></customHeader>
      <!-- 高度来避免头部遮挡 -->
      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>

      <view class="all-body">
-        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
-        <view class="search">
-<!--          <uni-search-bar class="custom-search" radius="28" placeholder="检索功能待开发，感谢您的耐心等待" clearButton="auto"-->
-<!--                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />-->
-<!--          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
-        </view>
-
        <!-- 分页部分  -->
        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
@@ -22,19 +20,11 @@
                @click="showDetail(item)">
            <view>
              <view class="report-list">
-                <view class="title">客户：{{ item.cusName }}</view>
-                <view class="r-list">
+                <view class="r-list title">{{ item.cusName }}
                  <view class="r-name">{{ item.visistCode }}</view>
-                  <view>
-
-                    <view
-                        class="r-right btn-blue"
-                        size="mini">
-                      查看
-                    </view>
+                  <view class="r-right btn-blue no-wrap"> 查看 </view>
                </view>

-                </view>
                <view class="border-bottom"></view>
                <view class="r-list">
                  <view class="r-left">客户人员名称</view>
@@ -94,6 +84,7 @@ onShow(()=>{


 let list = ref([])
+
 //获取列表信息
 function getList(queryParams) {
  queryViewMainOwnerList(queryParams.value).then(res => {
@@ -180,7 +171,7 @@ function showDetail(item) {

 </script>

-<style lang="scss" scoped>
+<style scoped>

 .all-body {
  /* #ifdef APP-PLUS */
@@ -193,44 +184,30 @@ function showDetail(item) {
  /* #endif */
 }

-.search {
-  display: flex;
-}
-
-.search .btn-search {
-  border: none;
-  background: none;
-  line-height: normal;
-  color: #fff;
-  line-height: 56rpx !important;
-  padding: 10rpx 0 0;
-  text-align: left;
-  cursor: pointer;
-}
-
-.search .btn-search::after {
-  display: none;
-}
-
-.search .custom-search {
-  width: 80%;
-
-}
-
-.search .custom-search.uni-searchbar {
-  padding-right: 0 !important;
-}
-
 .scroll-h{
  /* #ifdef APP-PLUS */
-  height: calc(100vh - 120px);
+  top: 160rpx;
+  height: calc(100vh - 160rpx);
  /* #endif */
  /* #ifndef APP-PLUS */
-  height: calc(100vh - 110px);
+  top: 116rpx;
+  height: calc(100vh - 116rpx);
  /* #endif */
 }

 .white-bg {
  padding-bottom: 10rpx;
 }
+
+.title {
+  align-items: baseline
+}
+
+.no-wrap {
+  white-space: nowrap;
+}
+
+.btn-blue {
+  border-radius: 10rpx;
+}
 </style>
--- a/src/pages/business/CRM/map/checkInView.vue
+++ b/src/pages/business/CRM/map/checkInView.vue
@@ -27,8 +27,9 @@
        <view class="white-bg margin-bottom20" v-for="(item, index) in list">
          <view class="report-list">
            <view class="title"
-                            :style="{color: item.mapType == 1 ? '#F5813A' : '#1989FA'}"
-                            >类型：{{ item.mapType == 1 ? '签到' : '打卡' }}</view>
+                  :style="{color: MapType[item.mapType].color}"
+            >类型：{{ MapType[item.mapType].label }}
+            </view><!--item.mapType == 1 ? '#F5813A' : '#1989FA'}-->
            <view class="r-list">
              <view class="r-left">开始签到时间</view>
              <view class="r-right">{{ item.goVisistStartTime }}</view>
@@ -66,6 +67,7 @@ import { onMounted, ref } from 'vue';
 import {getDate} from '@/utils/datetime.js'
 import {CheckInInformationViewing} from '../../../../api/crm/activity/map';
 import {onLoad} from '@dcloudio/uni-app';
+import {MapType} from "./dataMap";

 const navBarPaddingTop = ref(0);
 onMounted(() => {
@@ -83,6 +85,7 @@ let bindDateChange = (e) => {

 //获取list集合信息
 let list = ref([])
+
 function getList() {
  CheckInInformationViewing().then(res => {
    list.value = res.rows
@@ -93,13 +96,17 @@ onLoad(() => {
  getList()
 })

-
-
-
-
 </script>

 <style scoped>
+.r-left {
+  min-width: 6em;
+}
+
+.con-bg {
+  overflow-y: auto;
+}
+
 .search {
  display: flex;
  margin-bottom: 30rpx;
--- a/src/pages/business/CRM/map/dataMap.js
+++ b/src/pages/business/CRM/map/dataMap.js
@@ -0,0 +1,9 @@
+/**
+ * 签到/打卡/出差
+ * @type {{"1": {label: 签到, bgc: string}, "2": {label: 打卡, bgc: string}, "3": {label: 出差, bgc: string}}}
+ */
+export const MapType = {
+    '1': {label:'签到', color:'#F5813A'},
+    '2': {label:'打卡', color:'#1989FA'},
+    '3': {label:'出差', color:'#42b883'}
+}
--- a/src/pages/business/CRM/map/vistorCheckin.vue
+++ b/src/pages/business/CRM/map/vistorCheckin.vue
@@ -10,13 +10,28 @@
      <!-- 正文内容 -->
      <view class="white-bg">
        <image src="../../../../static/images/business/btn-qd.png" class="btn-image" @click="handleCheckIn"/>
-                <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn" />
+<!--        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClockIn"/>-->
+        <image src="../../../../static/images/business/btn-dk.png" class="btn-image" @click="handleClick"/>
        <view class="check-desc">
-                    业务人员可通过<text class="font-orange">签到</text>或<text
-                        class="font-blue">打卡</text>进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
+          业务人员可通过
+          <text class="font-orange">签到</text>
+          或
+          <text
+              class="font-blue">打卡
+          </text>
+          进行行为记录，该时间会和走访报告中的时间进行关联，便于查看。
        </view>
      </view>
    </view>
+    <closeable-modal v-model="modalVisible"
+                     title="确认在此处打卡？"
+                     :content="form.addressForStart"
+                     closeTip="轻触空白处关闭"
+                     cancelText="出差"
+                     confirmText="打卡"
+                     contentAlign="center"
+                     @confirm="handleConfirm"
+                     @cancel="handleCancel"/>

    <!-- 打卡遮罩层 -->
    <!-- <view class="check-con" v-if="checkFlag">
@@ -40,7 +55,9 @@
 <script setup>
 import {ref, onMounted, reactive} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import { addStartMapForClockIn } from '../../../../api/crm/activity/map';
+import {addStartMapForClockIn, businessTripClockIn} from '../../../../api/crm/activity/map';
+import CloseableModal from "@/components/closeableModal.vue";
+import {MapApiConfig} from "../../../../constants/mapApiConstants";

 let form = reactive({
  addressForStart: null,
@@ -49,6 +66,7 @@ let form = reactive({
  staffName: null,
  visistCode: null,
  visistId: null,
+  remark: null,
  mapId: null
 })
 // 签到
@@ -58,25 +76,79 @@ let handleCheckIn = () => {
  })
 }
 // 打卡
-let handleClockIn = () => {
+// let handleClockIn = () => {
+//   uni.getLocation({
+//     type: 'wgs84',
+//     success: (res) => {
+//       const latiude = res.latitude;
+//       const longitude = res.longitude;
+//       //进行解析
+//       inverseGeocoding(latiude, longitude);
+//     },
+//     fail: function (err) {
+//       console.log("获取地址失败" + err)
+//     }
+//   })
+// }
+let modalVisible = ref(false);
+let handleClick = () => {
  uni.getLocation({
    type: 'wgs84',
    success: (res) => {
-            const latiude = res.latitude;
+      const latitude = res.latitude;
      const longitude = res.longitude;
-            //进行解析
-            inverseGeocoding(latiude, longitude);
+      console.log('纬度:',latitude,'，经度:', longitude);
+      inverseGeocoding(latitude, longitude);
    },
    fail: function (err) {
      console.log("获取地址失败" + err)
    }
  })
+
+
+}
+// 反馈提示
+const feedback = (res, callback)=>{
+  if(res.code===200){
+    if(callback) callback();
+    uni.showToast({
+      title: MapApiConfig.OTHER.typeName === form.addressForStart ? MapApiConfig.OTHER.typeName : res.msg,
+      icon: 'success'
+    })
+    setTimeout(()=>{
+      uni.navigateBack(1);
+    }, 500)
+  }
+  else{
+    uni.showToast({
+      icon: 'none',
+      title: res.msg
+    })
+  }
+}
+// 出差
+const handleCancel = () => {
+  businessTripClockIn(form).then(res=>{
+   feedback(res,()=>console.log('出差打卡成功'));
+  }).catch(e=>{
+    console.log(e);
+  })
+}
+// 打卡
+let handleConfirm = () => {
+  addStartMapForClockIn(form).then(res=>{
+   feedback(res, ()=>console.log('打卡成功'));
+  }).catch(e=>{
+    console.log(e)
+  })
 }

+// 判定是否在范围内
 function isWithinRange(lat, lon, centerLat, centerLon, rangeKm) {
  const distance = haversineDistance(centerLat, centerLon, lat, lon);
  return distance <= rangeKm;
 }
+
 function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
  const dLat = degToRad(lat2 - lat1);
  const dLon = degToRad(lon2 - lon1);
@@ -87,23 +159,25 @@ function haversineDistance(lat1, lon1, lat2, lon2, radius = 6371) {
  const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
  return radius * c; // 距离，单位：公里
 }
+
+// 角度转弧度
 function degToRad(deg) {
  return deg * (Math.PI / 180);
 }

 //解析地址
-function inverseGeocoding(latiude, longitude) {
-    let points = longitude + ',' + latiude
-    const apiURL = 'https://tiles.geovisearth.com/geo/v1/geocode/regeo';
+function inverseGeocoding(latitude, longitude) {
+  uni.showLoading();
+    const apiURL = MapApiConfig.URL;
    const params = {
-        lat: latiude,
+        lat: latitude,
        lng: longitude,
        radius: 1000,
        pageSize: 1,
        currentPage: 1,
        //classify: 220100
    };
-    const token = '66c87c897f0251295afdc794e4fbf73046a070338a726fe04f06cece6cb1ffdf';
+    const token = MapApiConfig.token;
    uni.request({
        url: apiURL,
        method: 'GET',
@@ -112,124 +186,31 @@ function inverseGeocoding(latiude, longitude) {
            'Authorization': 'Bearer ' + token
        },
        success: (res) => {
-            console.log(res, "----")
-            if (res.statusCode == 200 && res.data.status == 200) {
+          modalVisible.value=true;
+            console.log(res, "经纬度解析成功")
+            if (res.statusCode === 200 && res.data.status === 200) {
                let resdata = res.data.data.rows[0].address
                if (resdata == null) {
                    console.log(resdata.srcLat)
-                    const latiude1 = 34.1360;
-                    const longitude1 = 108.9126;
-                    if (isWithinRange(latiude1, longitude1, latiude, longitude, 1)) {
-                        form.addressForStart = "西安办事处位置打卡"
-                        uni.showModal({
-                            title: '确定要在此处打卡吗',
-                            content: form.addressForStart,
-                            success: function (res) {
-                                if (res.confirm) {
-                                    var data = {
-                                        mapId: form.mapId,
-                                        addressForStart: form.addressForStart,
-                                        cusName: form.cusName,
-                                        cusId: form.cusId,
-                                        remark: form.remark,
-                                        path: longitude1 + "," + latiude1
-                                    }
-                                    addStartMapForClockIn(data).then(res => {
-                                        if (res.code == 200) {
-                                            uni.showToast({
-                                                icon: 'success',
-                                                title: res.msg,
-                                                duration: 1500,
-                                            });
-                                            setTimeout(() => {
-                                                uni.navigateBack(1)
-                                            }, 500)
-                                        } else {
-                                            uni.showToast({
-                                                icon: 'none',
-                                                title: res.msg,
-                                            });
-                                        }
-                                    })
-                                } else if (res.cancel) {
-                                    console.log('用户点击取消');
+                    if (isWithinRange(latitude1, longitude1, latiude, longitude, 1)) {
+                        form.addressForStart = MapApiConfig.XI_AN_BAN.typeName;
+                        form.path = MapApiConfig.XI_AN_BAN.longitude + ',' + MapApiConfig.XI_AN_BAN.latitude ;
                    }
                }
-                        });
-                    }
-                } else {
+                else {
                    form.addressForStart = resdata;
-                    uni.showModal({
-                        title: '确定要在此处打卡吗',
-                        content: form.addressForStart,
-                        success: function (res) {
-                            if (res.confirm) {
-                                var data = {
-                                    mapId: form.mapId,
-                                    addressForStart: form.addressForStart,
-                                    cusName: form.cusName,
-                                    cusId: form.cusId,
-                                    path: points
-                                }
-                                addStartMapForClockIn(data).then(res => {
-                                    if (res.code == 200) {
-                                        uni.showToast({
-                                            icon: 'success',
-                                            title: res.msg,
-                                            duration: 1500,
-                                        });
-                                    } else {
-                                        uni.showToast({
-                                            icon: 'none',
-                                            title: res.msg,
-                                        });
-                                    }
-                                })
-                            } else if (res.cancel) {
-                                console.log('用户点击取消');
-                            }
-                        }
-                    });
+                    form.path = longitude + ',' + latitude; // 经度，纬度
                }
            } else {
-                form.addressForStart = "第三方维护打卡"
-                uni.showModal({
-                    title: '确定要在此处打卡吗',
-                    content: form.addressForStart,
-                    success: function (res) {
-                        if (res.confirm) {
-                            var data = {
-                                mapId: form.mapId,
-                                addressForStart: form.addressForStart,
-                                cusName: form.cusName,
-                                cusId: form.cusId,
-                                path: points
+                form.addressForStart = MapApiConfig.OTHER.typeName;
+                form.path = longitude + ',' + latitude; // 经度，纬度
            }
-                            addStartMapForClockIn(data).then(res => {
-                                if (res.code == 200) {
-                                    uni.showToast({
-                                        icon: 'success',
-                                        title: '第三方维护打卡',
-                                        duration: 1500,
-                                    });
-                                } else {
-                                    uni.showToast({
-                                        icon: 'none',
-                                        title: res.msg,
-                                    });
-                                }
-                            })
-                        } else if (res.cancel) {
-                            console.log('用户点击取消');
-                        }
-                    }
-                });
-            }
-
+            uni.hideLoading();
        },
        fail(e) {
            console.log("获取位置失败", e)
-        }
+          uni.hideLoading();
+        },
    })


--- a/src/pages/business/CRM/plan/dataMap.js
+++ b/src/pages/business/CRM/plan/dataMap.js
@@ -40,7 +40,7 @@ export const COLOR_MAP = {
    "办事处": "#307af5",
    "请假": "#f2c55c",
    "法定假日": "#e88f89",/*#ED8A73*/
-    "null": "#e7e7e7"
+    "null": "#e7e7e782"
 };
 // 地区/部门
 export const AreaList = [
--- a/src/pages/business/CRM/plan/myPlan.vue
+++ b/src/pages/business/CRM/plan/myPlan.vue
@@ -17,7 +17,7 @@
      <view class="top-height"></view>

      <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+        <!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
        <view v-if="weekNum">
          {{ yearMonth }}
          <view v-if="isThisWeek" style=" display: inline-block;">
@@ -28,16 +28,19 @@
      </view>

      <view class="nav-list">
-        <view class="nav-item" :class="{active:index==activeTab}"
+        <view class="nav-item" :class="{'active': index == activeTab}"
              v-for="(item,index) in allPlans" :key="index"
              @click="handleNav(index)"
        >{{ getTapLabel(item) }}
        </view>
      </view>
-
-      <block v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="item">
+      <uni-transition :duration="300"
+                      :mode-class="['fade','slide-bottom']"
+                      :styles="{'width':'100%', 'background-color':'#f0f0f0','border-top-left-radius': '8px', 'border-top-right-radius': '8px'}"
+                      :show="showTrans">
+        <view v-if="onShowPlan" v-for="(item, index) in OrdinalDate" :key="index">
          <!-- 计划详情 -->
-        <view class="white-bg white-bg-2" :class="index == 0 ? 'white-bg-r' : ''">
+          <view class="white-bg white-bg-2" :class="{'white-bg-r':index === 0}">
            <view class="report-list">
              <view class="w-b-title">
                <view class="r-left">{{ getWorkDate(index) }} {{ WeekCN[index] }}</view>
@@ -54,11 +57,13 @@
              </view>
            </view>
          </view>
-        <view class='bottom-spliter bg-gray'></view>
-      </block>
+          <view class='bottom-spliter'></view>
+        </view>
+
        <view v-else style="text-align: center; margin-top: 50%; color: white">
          暂无数据
        </view>
+      </uni-transition>
      <!-- 底部加高度来避免tabbar遮挡 -->
      <!-- <view class="bottom-height bg-gray"></view> -->
    </view>
@@ -69,13 +74,12 @@

 <script setup>

-import {onMounted, ref, reactive, computed} from "vue";
+import {onMounted, ref, computed, watch} from "vue";
 import {useRoute} from "vue-router"
 import customHeader from '@/components/customHeader.vue'
 import {WeekCN, WorkType, WorkEvent, OrdinalDate} from "./dataMap";
 import {getCurrentWeekNum} from "./dateTimeUtils";
-import {getUserInfo, getWeeklyPlanList} from "@/api/crm/plan/getPlan";
-import {useMessage} from "@/utils/message";
+import {getWeeklyPlanList} from "@/api/crm/plan/getPlan";
 import {judgeThisWeek} from "@/api/crm/plan/updatePlan";

 const userInfo = ref(null)
@@ -94,8 +98,6 @@ const yearMonth = ref(null);
 const weekNum = ref(0);
 const allPlans = ref([]);
 const onShowPlan = ref(null);
-const message = useMessage();
-
 let getWorkDate = (index) => {
  return onShowPlan.value ? onShowPlan.value[OrdinalDate[index]] : '';
 };
@@ -107,7 +109,8 @@ let getWorkEvent = (index) => {
 };
 // 刷新计划列表
 const refreshPlanList = () => {
-  message.showLoading();
+  showTrans.value = false;
+  uni.showLoading();
  // 获取用户信息
  // getUserInfo().then(res => {
  //   userInfo.value = res.user;
@@ -124,12 +127,12 @@ const refreshPlanList = () => {
      weekNum.value = rows[0].date;
      yearMonth.value = rows[0].firstDayOfTheWeek.substring(0, 7);
    }
-    console.log(route.path, "：用户周计划列表获取成功");
+    console.log(route.path, "用户周计划列表获取成功");
  }).catch(err => {
-    console.warn(err, "用户周计划列表获取失败");
-    message.error("周计划获取失败");
+    console.log(err, "周计划列表获取失败")
  }).finally(() => {
-    message.hideLoading();
+    uni.hideLoading();
+    setTimeout(() => showTrans.value = true, 20);
  })
 }

@@ -139,7 +142,7 @@ onMounted(() => {

 // 判断计划是否为本周
 let isThisWeek = computed(() => {
-  let theYear = onShowPlan.value.year || onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
+  let theYear = onShowPlan.value.firstDayOfTheWeek.substring(0, 4); // 获取年份
  weekNum.value = onShowPlan.value.date; // 当目前展示的计划列表变化时，更新weekNum.value
  yearMonth.value = onShowPlan.value.firstDayOfTheWeek.substring(0, 7); // 获取年月
  return date.getFullYear() === parseInt(theYear) &&
@@ -204,6 +207,19 @@ function getTapLabel(row) {
  return row.firstDayOfTheWeek.substring(0, 4) + '年' + row.month + '月 第' + row.date + '周';
 }

+// 展示动画
+const showTrans = ref(false);
+// 监听 activeTab 变化，触发动画
+watch(activeTab, (newVal, oldVal) => {
+  if (oldVal !== newVal) { // 确保不是初始化时的触发
+    showTrans.value = false; // 先隐藏
+    setTimeout(() => {
+      onShowPlan.value = allPlans.value[newVal]; // 更新计划列表视图
+      showTrans.value = true; // 再显示，触发动画
+    }, 20);
+  }
+});
+
 // 选中计划时间段
 function handleNav(index) {
  console.log(index, "tab更换时间段");
@@ -247,7 +263,7 @@ function handleEdit(index) {
 <style scoped>
 .week-plan-title {
  color: #fff;
-  padding: 0 30rpx 30rpx;
+  padding: 0 30rpx;
  display: flex;
  justify-content: space-between;
 }
@@ -273,18 +289,22 @@ function handleEdit(index) {
 .white-bg.white-bg-2 {
  /*  margin-bottom: 20rpx; */
 }
+
 .bottom-spliter {
  height: 20rpx;
 }
+
 .bg-gray {
  background-color: #f0f0f0;
 }
+
 .report-list .w-b-title .btn-edit {
  background-color: #5C96F7;
 }

 .con-bg {
-  /*height: 445rpx;*/
+  /*height: 100%;*/
+  /*  overflow-y: auto;*/
 }

 .nav-list {
@@ -306,10 +326,12 @@ function handleEdit(index) {
  padding: 20rpx 30rpx 0;
  /* #endif */
 }
+
 /* 为 Webkit 浏览器隐藏滚动条 */
 .nav-list::-webkit-scrollbar {
  background-color: transparent;
 }
+
 .nav-list .nav-item {
  /*  flex: 0 0 auto; 关键：不放大、不缩小、自动宽度 */
  /*  width: 200rpx;*/
@@ -334,5 +356,4 @@ function handleEdit(index) {
  color: #3384DF;
  font-weight: bold;
 }
-
 </style>
--- a/src/pages/business/CRM/plan/planEdit.vue
+++ b/src/pages/business/CRM/plan/planEdit.vue
@@ -16,11 +16,11 @@

      <!-- 正文内容 -->
      <view class="week-plan-title">
-        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>
+<!--        <view v-if="userInfo.nickName">姓名：<strong>{{ userInfo.nickName || userInfo.userName }}</strong></view>-->
        <view>{{ currentEditDate.yearMonth }} 第 <strong>{{ currentEditDate.weekNum }}</strong> 周</view>
      </view>
      <uni-forms ref="formRef" :model="weekPlanFormData" :rules="rules" label-width="100px" label-position="top">
-        <block v-for="(item, index) in OrdinalDate">
+        <view v-for="(item, index) in OrdinalDate">
          <view class="white-bg" :class="index==0?'white-bg-2':'white-bg-3'">
            <view class="w-b-title" @click="handleExpand(index)">
              {{ weekPlanFormData[item] }} {{ WeekCN[index] }}
@@ -29,7 +29,8 @@
              </text>
            </view>

-            <view v-show="expandFlag[index]" class="form-con">
+            <!--v-show="expandFlag[index]"-->
+            <view class="form-con" :class="{'show': expandFlag[index], 'hidden': !expandFlag[index]}">
              <uni-forms-item label="工作类型" :name="getTypeField(index)" :required="index < workDays">
                <view class="form-picker">
                  <picker @change="handleTypeChange" :range="WORK_TYPE" :data-field="getTypeField(index)">
@@ -41,13 +42,13 @@
                </view>
              </uni-forms-item>
              <uni-forms-item label="内容" :name="getEventField(index)" :required="index < workDays">
-                <uni-easyinput type="textarea" autoHeight v-model="weekPlanFormData[getEventField(index)]"
+                <uni-easyinput type="textarea" v-model="weekPlanFormData[getEventField(index)]"
                               placeholder="请输入" class="form-texarea"/>
              </uni-forms-item>
            </view>

          </view>
-        </block>
+        </view>
      </uni-forms>

    </view>
@@ -62,7 +63,6 @@ import {useRoute} from "vue-router"
 import {useMessage} from "@/utils/message";
 import {onLoad} from "@dcloudio/uni-app";
 import {updateWeekPlanList, addPlan} from "@/api/crm/plan/updatePlan";
-import {getUserInfo} from "@/api/crm/plan/getPlan";
 import {getDate} from "@/utils/datetime";
 import {getWeek2, getCurrentWeekNum} from "./dateTimeUtils";

@@ -129,13 +129,6 @@ let instance = null;
 // 初始化创建任务
 let initCreate = (params) => {
  const {itemList, selectIndex} = params;
-  // 获取用户信息
-  // getUserInfo().then(res => {
-  //   userInfo.value = res.user;
-  //   console.log(route.path, "：用户信息获取成功");
-  // }).catch(err => {
-  //   console.warn(err, "用户信息获取失败")
-  // });
  console.log(route.path, `：创建${itemList[selectIndex]}计划`);
  title.value = "创建周计划";
  currentEditDate.value.yearMonth = getDate({format: true}).substring(0, 7); // 只要年月
@@ -301,6 +294,7 @@ const submitForm = async () => {
 .white-bg {
  width: 690rpx;
  margin: 0;
+  padding-bottom: 0;
  border-radius: 8px 8px 0 0;
 }

@@ -320,10 +314,17 @@ const submitForm = async () => {

 .form-con {
  padding: 30rpx 0 0;
+  height: 500rpx;
+  overflow: hidden;
+  transition: height 0.3s;
 }

 :deep(.form-con .uni-forms-item) {
  margin-bottom: 22px !important;
 }

+.hidden{
+  height: 0;
+}
+
 </style>
--- a/src/pages/business/CRM/plan/planView.vue
+++ b/src/pages/business/CRM/plan/planView.vue
@@ -1,3 +1,8 @@
+<!--
+ * @author wangzhuo
+ * @update date 2025/9/18 19:38
+ * @description 所有人周计划查看
+-->
 <template>
  <view class="con-body">
    <view class="con-bg">
@@ -32,7 +37,7 @@
              <uni-icons type="down" size="18"></uni-icons>
            </view>
          </picker>
-          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+<!--          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>-->
        </view>

        <!-- 分页部分  -->
@@ -42,22 +47,24 @@
        <view class="white-bg" v-if="list.length">
          <!--v-for="(item, index) in list" :key="index" @click="handleDetail(item)"-->
          <view style="text-align: center; margin-bottom: 30rpx; font-size: 30rpx;">
-            {{ parseInt(searchValue.selectDate.substring(5, 7)) }}月
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(5, 7) }}月
            <span class="line"></span>
-            {{searchValue.selectDate.substring(0, 4) }}年
+            {{ (list[0][OrdinalDate[0]] || searchValue.selectDate).substring(0, 4) }}年
          </view>
          <uni-row class="demo-uni-row">
            <uni-col :span="1">
-              <view class="demo-uni-col right-radius">序号</view>
+              <view class="demo-uni-col right-radius"></view>
            </uni-col>
            <uni-col :span="2">
              <view class="demo-uni-col left-radius">姓名</view>
            </uni-col>
+            <!--日期 星期-->
            <block v-for="(field, i) in OrdinalDate">
              <uni-col :span="3">
                <view class="demo-uni-col mar-left" >
                  <text>{{ WeekShortCN[i] }}</text>
-                  <text v-if="list[0][field]">{{ list[0][field].substring(8) }}</text>
+                  <text v-if="list[0][field]" class="font-bold">{{ list[0][field].substring(8) }}</text>
+                  <text v-else class="font-bold">{{ getWeek(i) }}</text>
                </view>
              </uni-col>
            </block>
@@ -80,7 +87,7 @@
                        :style="{ backgroundColor: COLOR_MAP[item[field]] }"
                  ><!--@click="handleView(index, i)"-->
                    <text v-if="item[field]">{{ item[field] }}</text>
-                    <text v-else style="color: gray">暂无</text>
+                    <text v-else style="font-weight: 300; color: gray">暂无</text>
                  </view>
                </uni-col>
              </block>
@@ -94,22 +101,28 @@
      </view>
    </view>
  </view>
+
+  <closeable-modal closeTip=""
+                   v-model="modalVisible"
+                   :title="modalData.title"
+                   :content="modalData.content"
+                   :cancelBtn="modalData.showCancel"
+                   confirmText="关闭"
+                   @success="modalData.success"/>
+
 </template>

 <script setup>
 import {ref, onMounted} from 'vue'
 import customHeader from '@/components/customHeader.vue'
-import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import CloseableModal from "@/components/closeableModal.vue";
 import {getNavBarPaddingTop} from '@/utils/system.js'
 import {getAllWeekPlanList} from "@/api/crm/plan/getPlan";
 import {AreaList, COLOR_MAP, OrdinalDate, WeekShortCN, WorkEvent, WorkType} from "./dataMap";
-import {getCurrentWeekNum} from "./dateTimeUtils";
+import {getCurrentWeekNum, getWeek2} from "./dateTimeUtils";
 import {getDate} from "@/utils/datetime";
 import {getWeekPlanListByDate} from "@/api/crm/plan/getPlan";
-
-// const currentYear = new Date().getFullYear();
-const currentMonth = new Date().getMonth() + 1;
-const currentWeekNum = getCurrentWeekNum();
+import {onPullDownRefresh} from "@dcloudio/uni-app";

 // 获取导航栏高度用于内容区域padding
 const navBarPaddingTop = ref(0);
@@ -118,8 +131,11 @@ onMounted(() => {
  uni.showLoading({})
  getPlanList().then(res => {
    let {total, rows} = res;
-    console.log(rows, "周计划数据获取成功")
+    console.log(total, rows, "周计划数据获取成功")
    list.value = rows;
+  }).catch((err) => {
+    console.warn(err, "周计划数据获取失败")
+  }).finally(() => {
    uni.hideLoading();
  })
 })
@@ -139,36 +155,38 @@ let searchValue = ref({

 // 查询列表
 let list = ref([]);
-const mescrollRef = ref(null);
-const upOption = ref({
-  page: {num: 0, size: 10},
-  noMoreSize: 5,
-  empty: {tip: '~ 空空如也 ~'},
-  textLoading: '加载中...',
-  textNoMore: '已经到底了'
+// const mescrollRef = ref(null);
+onPullDownRefresh(() => {
+  uni.showLoading();
+  getPlanList().then(res => {
+    const {rows} = res;
+    list.value = rows;
+    console.log(rows,'刷新周计划成功');
+  }).finally(()=>{
+    uni.stopPullDownRefresh();
+    uni.hideLoading();
+  })
 });

-const downOption = ref({
-  auto: true,
-  textInOffset: '下拉刷新',
-  textOutOffset: '释放更新',
-  textLoading: '刷新中...'
-});
-
-let cssFlag = ref(false);//控制样式
-
-// 获取数据列表
-const getPlanList = (month, date, pageIndex, pageSize) => {
-  return new Promise(async (resolve) => {
-    // 查询参数
-    let queryParams = {
-      month: month ? month : currentMonth,
-      date: date ? date : currentWeekNum,
-      pageNum: pageIndex ? pageIndex : 1,
-      pageSize: pageSize ? pageSize : 10
+// 查询当前周一周日期
+// const currentYear = new Date().getFullYear();
+const currentWeekNum = getCurrentWeekNum();
+const aweek = getWeek2('本周');
+const currentMonth = aweek.month;
+console.log(currentWeekNum, '当前周数');
+const getWeek = (i) => {
+  return aweek[OrdinalDate[i]].substring(7)
 }
-
-    let {rows, total} = await getAllWeekPlanList(queryParams);
+const queryParams = ref({
+  month: currentMonth,
+  date: currentWeekNum,
+  pageNum: 1,
+  pageSize: 10
+});
+// 获取数据列表
+const getPlanList = () => {
+  return new Promise(async (resolve) => {
+    let {rows, total} = await getAllWeekPlanList(queryParams.value);
    resolve({
      rows,
      total
@@ -197,10 +215,7 @@ let handleSearch = () => {
    uni.hideLoading();
  })
 }
-const mescrollInit = (mescroll) => {
-  cssFlag.value = true;
-  mescrollRef.value = mescroll;
-};
+
 // 搜索区域变更
 const bindPickerChange = (e) => {
  // console.log('picker发送选择改变，携带值为', peopleIndex.value)
@@ -209,32 +224,43 @@ const bindPickerChange = (e) => {
  // 查询
  handleSearch();
 }
-
-// 跳转到详情
-let handleDetail = (rowIndex, colIndex) => {
+// 模态窗可见性
+const modalVisible = ref(false);
+// 模态框的配置内容
+const modalData = ref({
+  title: null,
+  content: null,
+  showCancel: false,
+  success: console.log
+});
+const showCloseableModal = (param)=>{
+  modalVisible.value = true;
+  Object.assign(modalData.value, param);
+  console.log(modalData.value);
+}
+// 查看计划详情
+const handleDetail = (rowIndex, colIndex) => {
  let detail = list.value[rowIndex];
  let workDate = detail[OrdinalDate[colIndex]];
  let workType = detail[WorkType[colIndex]];
  let workEvent = detail[WorkEvent[colIndex]];
  if (workType && workEvent) {
-    uni.showModal({
-      title: `${workDate}\n${workType}`,
-      content: `${workEvent}`,
-      confirmText: '关闭',
-      showCancel: false,
-      maskClosable: true, // 允许点击蒙层关闭弹窗
-      success: function (res) {
-        if (res.confirm) {
+    showCloseableModal({
+      title: `${workType}`,
+      content: `姓名：${detail.userName}\n时间：${workDate}\n内容：${workEvent}`
+    });
+    // uni.showModal({
+    //   title: `${workDate}\n${workType}`,
+    //   content: `${workEvent}`,
+    //   confirmText: '关闭',
+    //   showCancel: false,
+    //   maskClosable: true, // 允许点击蒙层关闭弹窗
+    //   success: console.log
+    // })

-        } else if (res.cancel) {
-
-        }
-      }
-    })
-  }
-  else{
+  } else {
    uni.showToast({
-      title: "暂无内容",
+      title: "无计划内容",
      icon: "none",
      duration: 1500
    })
@@ -328,8 +354,9 @@ let handleDetail = (rowIndex, colIndex) => {

 .demo-uni-col {
  height: 36px;
-  border-radius: 4px;
-  background-color: #E7E7E7;
+  border-radius: 4rpx;
+  /*background-color: #E7E7E7;*/
+  background-color: #e7e7e782;
  display: flex;
  flex-direction: column;
  align-items: center;
@@ -366,35 +393,17 @@ let handleDetail = (rowIndex, colIndex) => {
  margin: 20rpx 0 0 0;
  border-radius: 8px 8px 0 0;
  /* #ifdef APP-PLUS */
-  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 160rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
  /* #endif */
  /* #ifndef APP-PLUS */
-  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx/*.white-bg padding-bottom*/);
+  min-height: calc(100vh - 116rpx/*.topbar height*/ - 68rpx/*.search height*/ - 40rpx/*.white-bg padding-top*/ - 40rpx /*.white-bg padding-bottom*/
+  );
  /* #endif */
-  //overflow-y: auto;
-}
-
-.white-bg.white-bg-2 {
-  margin-bottom: 20rpx;
-}
-
-.white-bg.white-bg-3 {
-  border-radius: 0
-}
-
-.white-bg .w-b-title {
-  color: #3384DF;
-  font-size: 38rpx;
-}
-
-.form-con {
-  padding: 30rpx 0 0;
 }

 :deep(.form-con .uni-forms-item) {
  margin-bottom: 22px !important;
 }
-/*.con-bg {
-  height: 420rpx;
-}*/
+
 </style>
--- a/src/pages/business/EQF/components/chooseCus.vue
+++ b/src/pages/business/EQF/components/chooseCus.vue
@@ -0,0 +1,257 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户名称列表'" :leftFlag="true" :rightFlag="false">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>
+            新增
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+        <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
+                          v-model="searchValue" @clear="searchValue=''"
+          />
+          <!--          <button type="default" @click="searchValue=''" size="mini" class="btn-search">清空</button>-->
+        </view>
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{'loading-scroll':cssFlag}"
+        ><!-- @down="downCallback"-->
+          <radio-group class="block" @change="radioChange">
+            <view class="white-bg" v-for="(item, index) in list" :key="index" @click="handleDetail(item)">
+              <radio class='radio'
+                     :class="index === selectIndex ? 'checked' : ''"
+                     :checked="index === selectIndex"
+                     :value="index+''">
+              </radio>
+
+              <view class="report-list">
+                <view class="title">{{ item.cusName }}</view>
+                <!--              <view class="r-list">
+                                <view class="r-name">{{ item.shortName }}</view>
+                                <view class="r-right btn-orange" size="mini">{{ item.statusName }}</view>
+                              </view>-->
+                <view class="border-bottom"></view>
+                <!--              <view class="r-list">
+                                <view class="r-left">日期</view>
+                                <view class="r-right">{{ new Date(item.createTime).toLocaleDateString()}}</view>
+                              </view>-->
+              </view>
+            </view>
+          </radio-group>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {getCustomerList} from "@/api/crm/customer/getCustomer";
+
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let searchValue = ref('')
+
+let cssFlag=ref(false);//控制样式
+
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+    let {cusName} = res.data;
+    // console.log(cusName, "客户选择页读取到参数");
+    searchValue.value = cusName;
+  })
+})
+
+let timerId = null;
+// 搜索
+watch(searchValue, (newValue, oldValue) => {
+  // console.log(`新值: ${newValue}, 旧值: ${oldValue}`);
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+    handleSearch();
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    const res = await getList(1, upOption.value.page.size);
+    list.value = res.list;
+    // 正确结束下拉刷新状态
+    mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束下拉刷新
+    mescroll.endErr();
+  }
+}
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
+      list.value = res.list;
+    } else {
+      list.value.push(...res.list);
+    }
+    // 正确结束上拉加载状态
+    mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
+  } catch (error) {
+    console.log(error)
+    // 发生错误时结束上拉加载
+    mescroll.endErr();
+  }
+}
+
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+  let param = {
+    pageNum: pageIndex,
+    pageSize,
+    cusName: searchValue.value
+  }
+  let { rows, total  } = await getCustomerList(param)
+  return {list: rows, total};
+}
+// 选中项的索引号
+const selectIndex = ref(null);
+const radioChange = (e) => {
+  const selectedIndex = e.detail.value;
+  //发送全局事件
+  uni.$emit('onCustomerSelected',list.value[selectedIndex])
+  uni.navigateBack()
+}
+
+
+
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  //padding-bottom:10rpx;
+  margin-bottom: 0;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+}
+
+.radio {
+  padding-right: 20rpx;
+}
+
+.title {
+  font-size: 32rpx;
+  line-height: 48rpx;
+}
+
+.report-list {
+  width: calc(100% - 70rpx);
+  //background-color: pink;
+}
+
+.border-bottom {
+  margin-top: 6rpx;
+}
+</style>
--- a/src/pages/business/EQF/components/customerOrder.vue
+++ b/src/pages/business/EQF/components/customerOrder.vue
@@ -0,0 +1,297 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'客户订单列表'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleConfirm">
+            确定
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索 -->
+        <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入合同名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
+                          v-model="cusCode" @clear="cusCode=''"></uni-search-bar>
+        </view>
+
+        <!-- 分页部分 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{'loading-scroll':cssFlag}"
+        >
+          <checkbox-group class="block">
+            <view class="white-bg" v-for="(item, index) in list" :key="index">
+              <checkbox class='checkbox' 
+                     :checked="selectedItems.includes(index)"
+                     @click.stop="toggleItem(index)"
+              ></checkbox>
+
+              <view class="report-list">
+                <view class="title">批号：{{ item.tokenCode }}</view>
+                <view class="title">数量：{{ item.amount }}</view>
+                <view class="title">合同号：{{ item.orderCoode }}</view>
+                <view class="title">母批：{{ item.texing }}</view>
+                <view class="title">产品大类：{{ item.code }}</view>
+                <view class="title">规格型号：{{ item.name }}</view>
+                <view class="title">产品ID：{{ item.materialId }}</view>
+                <view class="border-bottom"></view>
+              </view>
+            </view>
+          </checkbox-group>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {getCustomerOrderList} from "@/api/eqf/qualityFeedback.js";
+
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let cusCode = ref('')
+
+let cssFlag=ref(false);//控制样式
+
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+    let {cusName} = res.data;
+    cusCode.value = cusName;
+  })
+})
+
+let timerId = null;
+// 搜索
+watch(cusCode, (newValue, oldValue) => {
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+    handleSearch();
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    const res = await getList(1, upOption.value.page.size);
+    list.value = res.list;
+    // 清空选中状态
+    selectedItems.value = [];
+    // 正确结束下拉刷新状态
+    if (mescroll && typeof mescroll.endSuccess === 'function') {
+      mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+    }
+  } catch (error) {
+    // 发生错误时结束下拉刷新，添加空值检查
+    if (mescroll && typeof mescroll.endErr === 'function') {
+      mescroll.endErr();
+    } else {
+      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
+    }
+  }
+}
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
+      list.value = res.list;
+      // 清空选中状态
+      selectedItems.value = [];
+    } else {
+      list.value.push(...res.list);
+    }
+    // 正确结束上拉加载状态
+    if (mescroll && typeof mescroll.endSuccess === 'function') {
+      mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
+    }
+  } catch (error) {
+    // 发生错误时结束上拉加载，添加空值检查
+    if (mescroll && typeof mescroll.endErr === 'function') {
+      mescroll.endErr();
+    } else {
+      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
+    }
+  }
+}
+
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+  const param = {
+    pageNum: pageIndex,
+    pageSize,
+    cusCode: cusCode.value
+  }
+  let { rows, total } = await getCustomerOrderList(param)
+  return {list: rows, total};
+}
+
+// 存储选中项的索引数组
+const selectedItems = ref([]);
+
+// 切换单项选中状态
+const toggleItem = (index) => {
+  if (selectedItems.value.includes(index)) {
+    // 取消选中
+    selectedItems.value = selectedItems.value.filter(item => item !== index);
+  } else {
+    // 选中
+    selectedItems.value.push(index);
+  }
+  console.log('当前选中的索引:', selectedItems.value);
+}
+
+// 不再需要checkboxChange函数，因为已经通过toggleItem处理了所有选择逻辑
+
+// 确认选择并返回
+const handleConfirm = () => {
+  // 确保list.value和selectedItems.value有效
+  if (!list.value || !selectedItems.value || selectedItems.value.length === 0) {
+    uni.showToast({ title: '请选择数据', icon: 'none' });
+    return;
+  }
+  
+  // 获取选中的实际数据项，添加安全检查
+  const selectedData = selectedItems.value
+    .filter(index => index >= 0 && index < list.value.length) // 确保索引有效
+    .map(index => list.value[index]);  
+  
+  console.log('所有选中的数据:', selectedData);
+  
+  // 发送全局事件，传递选中的数据和逗号分隔的字符串
+  uni.$emit('onCustomerSelected', {
+    originalData: selectedData,
+  });
+  
+  // 设置标记，表示从选择页面返回
+  uni.setStorageSync('isFromCustomerOrderPage', true);
+  
+  // 返回上一页
+  uni.navigateBack();
+}
+
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  //padding-bottom:10rpx;
+  margin-bottom: 0;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+}
+
+.checkbox {
+  padding-right: 20rpx;
+  transform: scale(0.8); // 调整复选框大小以匹配UI
+}
+
+.title {
+  font-size: 32rpx;
+  line-height: 48rpx;
+}
+
+.report-list {
+  width: calc(100% - 70rpx);
+  //background-color: pink;
+}
+
+.border-bottom {
+  margin-top: 6rpx;
+}
+</style>
--- a/src/pages/business/EQF/components/gkCustomerOrder.vue
+++ b/src/pages/business/EQF/components/gkCustomerOrder.vue
@@ -0,0 +1,300 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'管壳订单列表'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleConfirm">
+            确定
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索 -->
+        <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入合同名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff"
+                          v-model="gkOrder" @clear="gkOrder=''"></uni-search-bar>
+        </view>
+
+        <!-- 分页部分 -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{'loading-scroll':cssFlag}"
+        >
+          <checkbox-group class="block">
+            <view class="white-bg" v-for="(item, index) in list" :key="index">
+              <checkbox class='checkbox' 
+                     :checked="selectedItems.includes(index)"
+                     @click.stop="toggleItem(index)"
+              ></checkbox>
+
+              <view class="report-list">
+                <view class="title">合同号：{{ item.gkOrder }}</view>
+                <view class="title">客户名称：{{ item.gkCustomerName }}</view>
+                <view class="title">产品名称：{{ item.gkCpName }}</view>
+                <view class="title">产品型号：{{ item.gkProductSpec }}</view>
+                <view class="title">数量：{{ item.gkAmount }}</view>
+                <view class="title">批号：{{ item.gkTokenCode }}</view>
+                <view class="title">母令：{{ item.gkMotherorderCode }}</view>
+                <view class="title">图纸编号：{{ item.gkDrawingNumber }}</view>
+                <view class="title">技术负责人：{{ item.gkTechnicalDirector }}</view>
+                <view class="title">产品ID：{{ item.gkProductId }}</view>
+                <view class="border-bottom"></view>
+              </view>
+            </view>
+          </checkbox-group>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+
+import {ref, onMounted, getCurrentInstance, watch} from 'vue'
+import customHeader from '@/components/customHeader.vue'
+import {getNavBarPaddingTop} from '@/utils/system.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {getGkCustomerOrderList} from "@/api/eqf/qualityFeedback.js";
+
+let instance = null;
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+// 查询列表
+let list = ref([]);
+const mescrollRef = ref(null);
+let gkOrder = ref('')
+
+let cssFlag=ref(false);//控制样式
+
+const upOption = ref({
+  page: { num: 0, size: 10 },
+  noMoreSize: 5,
+  empty: {
+    tip: '~ 空空如也 ~',
+    icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+
+onLoad((options)=>{
+  instance = getCurrentInstance().proxy;
+  const eventChannel = instance.getOpenerEventChannel();
+  eventChannel.on('requestCusList', async (res) => {
+    let {cusName} = res.data;
+    gkOrder.value = cusName;
+  })
+})
+
+let timerId = null;
+// 搜索
+watch(gkOrder, (newValue, oldValue) => {
+  if(timerId) clearTimeout(timerId);
+  timerId = setTimeout(async ()=>{
+    handleSearch();
+    clearTimeout(timerId);
+    timerId = null;
+  }, 500);
+});
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    const res = await getList(1, upOption.value.page.size);
+    list.value = res.list;
+    // 清空选中状态
+    selectedItems.value = [];
+    // 正确结束下拉刷新状态
+    if (mescroll && typeof mescroll.endSuccess === 'function') {
+      mescroll.endSuccess(res.list.length, res.total >= upOption.value.page.size);
+    }
+  } catch (error) {
+    // 发生错误时结束下拉刷新，添加空值检查
+    if (mescroll && typeof mescroll.endErr === 'function') {
+      mescroll.endErr();
+    } else {
+      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
+    }
+  }
+}
+
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    const res = await getList(mescroll.num, mescroll.size);
+    if (mescroll.num === 1) {
+      list.value = res.list;
+      // 清空选中状态
+      selectedItems.value = [];
+    } else {
+      list.value.push(...res.list);
+    }
+    // 正确结束上拉加载状态
+    if (mescroll && typeof mescroll.endSuccess === 'function') {
+      mescroll.endSuccess(res.list.length, res.list.length >= mescroll.size);
+    }
+  } catch (error) {
+    // 发生错误时结束上拉加载，添加空值检查
+    if (mescroll && typeof mescroll.endErr === 'function') {
+      mescroll.endErr();
+    } else {
+      console.error('mescroll 对象不存在或 endErr 方法未定义', error);
+    }
+  }
+}
+
+// 查询搜索跳转
+let handleSearch = async () => {
+  // 触发下拉刷新以重新加载数据
+  if (mescrollRef.value) {
+    cssFlag.value = true;
+    uni.showLoading()
+    await downCallback(mescrollRef.value.mescroll);
+    uni.hideLoading()
+    cssFlag.value = false;
+  }
+}
+// 获取数据列表
+const getList = async (pageIndex, pageSize) => {
+  const param = {
+    pageNum: pageIndex,
+    pageSize,
+    gkOrder: gkOrder.value
+  }
+  let { rows, total } = await getGkCustomerOrderList(param)
+  return {list: rows, total};
+}
+
+// 存储选中项的索引数组
+const selectedItems = ref([]);
+
+// 切换单项选中状态
+const toggleItem = (index) => {
+  if (selectedItems.value.includes(index)) {
+    // 取消选中
+    selectedItems.value = selectedItems.value.filter(item => item !== index);
+  } else {
+    // 选中
+    selectedItems.value.push(index);
+  }
+  console.log('当前选中的索引:', selectedItems.value);
+}
+
+// 不再需要checkboxChange函数，因为已经通过toggleItem处理了所有选择逻辑
+
+// 确认选择并返回
+const handleConfirm = () => {
+  // 确保list.value和selectedItems.value有效
+  if (!list.value || !selectedItems.value || selectedItems.value.length === 0) {
+    uni.showToast({ title: '请选择数据', icon: 'none' });
+    return;
+  }
+  
+  // 获取选中的实际数据项，添加安全检查
+  const selectedData = selectedItems.value
+    .filter(index => index >= 0 && index < list.value.length) // 确保索引有效
+    .map(index => list.value[index]);  
+  
+  console.log('所有选中的数据:', selectedData);
+  
+  // 发送全局事件，传递选中的数据和逗号分隔的字符串
+  uni.$emit('onCustomerSelected', {
+    originalData: selectedData,
+  });
+  
+  // 设置标记，表示从选择页面返回
+  uni.setStorageSync('isFromCustomerOrderPage', true);
+  
+  // 返回上一页
+  uni.navigateBack();
+}
+
+</script>
+
+<style lang="scss" scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  //padding-bottom:10rpx;
+  margin-bottom: 0;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+}
+
+.checkbox {
+  padding-right: 20rpx;
+  transform: scale(0.8); // 调整复选框大小以匹配UI
+}
+
+.title {
+  font-size: 32rpx;
+  line-height: 48rpx;
+}
+
+.report-list {
+  width: calc(100% - 70rpx);
+  //background-color: pink;
+}
+
+.border-bottom {
+  margin-top: 6rpx;
+}
+</style>
--- a/src/pages/business/EQF/components/gkQualityFeedbackDetailComponent.vue
+++ b/src/pages/business/EQF/components/gkQualityFeedbackDetailComponent.vue
@@ -0,0 +1,388 @@
+<template>
+    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
+        <uni-forms-item label="合同号" name="cusName" class="f-c-right">
+            <view @click="chooseCustomer" class="form-item-container">
+                <text class="name">{{ formData.gkOrder || '点击选择合同数据' }}</text>
+            </view>
+        </uni-forms-item>	
+        <uni-forms-item label="合同号" name="gkOrder" class="f-c-right">
+            <uni-easyinput v-model="formData.gkOrder" placeholder="请输入合同号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+         <uni-forms-item label="产品规格型号" name="gkProductSpec" class="f-c-right">
+            <uni-easyinput v-model="formData.gkProductSpec" placeholder="请输入产品规格型号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        <uni-forms-item label="数量" name="gkAmount" class="f-c-right">
+            <uni-easyinput v-model="formData.gkAmount" type="text" placeholder="请输入供货数量" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        <uni-forms-item label="批号" name="gkTokenCode" class="f-c-right">
+            <uni-easyinput v-model="formData.gkTokenCode" placeholder="请输入批号" name="input" :disabled="isDisabled" />
+        </uni-forms-item>
+        <uni-forms-item label="母批号" name="gkMotherorderCode" class="f-c-right">
+            <uni-easyinput v-model="formData.gkMotherorderCode" placeholder="请输入母批号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        <uni-forms-item label="图纸编号" name="gkDrawingNumber" class="f-c-right">
+            <uni-easyinput v-model="formData.gkDrawingNumber" placeholder="请输入图纸编号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        <uni-forms-item label="技术负责人" name="gkTechnicalDirector" class="f-c-right">
+            <uni-easyinput v-model="formData.gkTechnicalDirector" placeholder="请输入技术负责人" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        <uni-forms-item label="产品ID" name="gkProductId" class="f-c-right">
+            <uni-easyinput v-model="formData.gkProductId" placeholder="请输入产品ID" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteDetailItem" size="mini" v-if="false">删除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存</button>
+    </view>
+</template>
+
+<script setup name="gkQualityFeedbackDetailComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../utils/cache'
+import { onShow,onLoad, onUnload } from '@dcloudio/uni-app';
+import {
+        qualityFeedbackGkDetailAdd
+	} from '@/api/eqf/qualityFeedback.js'
+
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number, //客户ID
+    feedbackId: Number, //质量反馈ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerCode: '',
+    batchNumber: '',
+    supplyQuantity: '',
+    specificationModel: '',
+    motherBatch: '',
+    materialId: '',
+    eqfId: '',
+    drawingNumber:'',
+    technicalDirector:'',
+});
+
+// 验证规则
+const rules = {
+    contractNumber: {
+        rules: [
+            { required: true, errorMessage: '请输入合同号' }
+        ]
+    },
+    batchNumber: {
+        rules: [
+            { required: true, errorMessage: '请输入批号' }
+        ]
+    },
+    supplyQuantity: {
+        rules: [
+            { required: true, errorMessage: '请输入供货数量' },
+            { type: 'number', errorMessage: '请输入数字' }
+        ]
+    },
+    specificationModel: {
+        rules: [
+            { required: true, errorMessage: '请输入产品规格型号' }
+        ]
+    }
+};
+
+// 表单ref
+const formRef = ref(null);
+
+
+onLoad((options) => {
+    //清空表单
+    clearForm()
+    // 然后设置eqfId
+    if (options && options.id) {
+        formData.value.eqfId = options.id;
+    }
+    // 清除相关缓存，确保首次加载时没有旧数据干扰
+    cache.remove(`qualityFeedbackDetail_${options?.id || ''}`);
+})
+
+//获取当前外反的明细
+const detailList = ref([])
+const getQualityFeedbackDetail = async () => {
+    let param = {
+        eqfId: formData.value.eqfId
+    }
+    let detailRes = await qualityFeedbackDetailAdd(param);
+    detailList.value = detailRes.rows[0];
+}
+
+//删除明细项的内容
+function handleDeleteDetailItem() {
+    // 使用本地存储或其他方式暂存删除操作
+    uni.showToast({
+        title: '删除成功',
+        duration: 2000
+    });
+    //清空表单
+    clearForm()
+}
+
+// 清空表单
+function clearForm() {
+    formData.value.gkOrder = ''
+    formData.value.gkProductSpec = ''
+    formData.value.gkAmount = ''
+    formData.value.gkTokenCode = ''
+    formData.value.gkMotherorderCode = ''
+    formData.value.gkDrawingNumber = ''
+    formData.value.gkTechnicalDirector = ''
+    formData.value.gkProductId = ''
+}
+
+// 选择合同页面跳转
+function chooseCustomer() {
+    uni.navigateTo({
+        url: '/pages/business/EQF/components/gkCustomerOrder'
+    })
+}
+
+// 提交表单
+const submitForm = async () => {
+    try {
+        // 表单校验
+        await formRef.value.validate()
+        console.log(formData,"5555")
+        const res = await qualityFeedbackGkDetailAdd(formData.value);
+        uni.showToast({
+            title: '提交成功',
+            icon: 'success'
+        })
+            // 发送刷新列表事件，同时支持两种事件名称以兼容现有代码
+            uni.$emit('refreshMarketList');
+            uni.$emit('refreshFeedbackList');
+            setTimeout(() => {
+                uni.navigateBack(1);
+            }, 1500);
+                
+        console.log('表单数据:', formData.value)
+    } catch (err) {
+        console.log('表单验证失败:', err)
+    }
+}
+
+
+//页面渲染完成后，查询详情
+onShow(() => {
+    // Try to load from cache if available
+    const cachedData = cache.get(`qualityFeedbackDetail_${props.feedbackId}`);
+    if (cachedData) {
+        formData.value = {
+            ...formData.value,
+            ...cachedData
+        };
+    }
+    
+    if (props.status == '完成') {
+        isDisabled.value = true
+    } else {
+        isDisabled.value = false
+    }
+    
+    // 监听客户订单选择事件
+    uni.$on('onCustomerSelected', handleCustomerSelected);
+});
+
+// 处理客户订单选择结果
+function handleCustomerSelected(data) {
+    // 确保数据存在
+    if (!data || typeof data !== 'object') {
+        console.error('无效的数据:', data);
+        return;
+    }
+    
+    // 如果返回的是对象
+    let selectedItems = [];
+    
+    console.log('接收到的数据:', data);
+    
+    // 兼容新格式
+    selectedItems = data.originalData || [];
+    
+    if (selectedItems && selectedItems.length > 0) {
+        // 清空表单
+        clearForm();
+        
+        console.log('选中的项目数量:', selectedItems.length);
+        console.log('选中的项目详情:', selectedItems);
+        
+        // 循环拼接所有选中项目的字段
+        const gkOrder = selectedItems.map(item => item.gkOrder || '').filter(Boolean);
+        const gkProductSpec = selectedItems.map(item => item.gkProductSpec || '').filter(Boolean);
+        const gkAmount = selectedItems.map(item => item.gkAmount || '').filter(Boolean);
+        const gkTokenCode = selectedItems.map(item => item.gkTokenCode || '').filter(Boolean);
+        const gkMotherorderCode = selectedItems.map(item => item.gkMotherorderCode || '').filter(Boolean);
+        const gkDrawingNumber = selectedItems.map(item => item.gkDrawingNumber || '').filter(Boolean);
+        const gkTechnicalDirector = selectedItems.map(item => item.gkTechnicalDirector || '').filter(Boolean);
+        const gkProductId = selectedItems.map(item => item.gkProductId || '').filter(Boolean);
+
+
+        console.log('拼接前的合同号:', gkOrder);
+        
+        // 使用nextTick确保DOM更新
+        setTimeout(() => {
+            formData.value.gkOrder = gkOrder.join(',');
+            formData.value.gkProductSpec = gkProductSpec.join(',');
+            formData.value.gkAmount = gkAmount.join(',');
+            formData.value.gkTokenCode = gkTokenCode.join(',');
+            formData.value.gkMotherorderCode = gkMotherorderCode.join(',');
+            formData.value.gkDrawingNumber = gkDrawingNumber.join(',');
+            formData.value.gkTechnicalDirector = gkTechnicalDirector.join(',');
+            formData.value.gkProductId = gkProductId.join(',');
+            
+            console.log('设置后的表单数据:', formData.value);
+        }, 0);
+        
+        // 显示提示信息
+        uni.showToast({
+            title: `已选择${selectedItems.length}个批次`,
+            icon: 'none',
+            duration: 2000
+        });
+        
+        // 保存到缓存
+        cache.set(`qualityFeedbackDetail_${props.feedbackId || ''}`, formData.value);
+    }
+};
+
+// 页面卸载时移除事件监听
+onUnload(() => {
+    uni.$off('onCustomerSelected', handleCustomerSelected);
+});
+
+// 处理批号变化，自动查询数据
+const handleBatchNumberChange = async (value) => {
+    const trimmedValue = value?.trim() || '';
+    // 防止空值查询
+    if (!trimmedValue) {
+        console.log('批号为空，不执行查询');
+        return;
+    }
+    
+    try {
+        // 显示加载提示
+        uni.showLoading({
+            title: '查询中...',
+        });
+        const  param = { batchNumber: value };
+        console.log('查询参数:', param);
+        // 尝试从缓存获取数据，减少重复请求
+        const cacheKey = `batchInfo_${trimmedValue}`;
+        let batchInfo = cache.get(cacheKey);
+        console.log('缓存数据:', batchInfo);
+
+        if (1==1) {
+            // 调用API获取数据
+            console.log('准备调用API...');
+			let apiData 
+            try {
+                const res = await getMockBatchData(param);
+                console.log('API响应原始数据:', res);
+				// 根据isTransformResponse=false的设置，正确处理响应数据
+				// 修复4: 处理可能的嵌套数据结构
+				apiData = res;
+				// 检查是否有data字段，适应不同的响应结构
+				if (res.data !== undefined) {
+				    apiData = res.data;
+				}
+            } catch (apiError) {
+                console.error('API调用直接失败:', apiError);
+                // 重新抛出错误，让外层catch处理
+                throw new Error(`API调用失败: ${apiError?.message || '未知错误'}`);
+            }
+
+            console.log('处理后的数据:', apiData);
+            
+            if (typeof apiData === 'object' && apiData !== null) {
+                // 提取并格式化有用的数据
+                batchInfo = {
+                    supplyQuantity: apiData.supplyQuantity || '',
+                    specificationModel: apiData.specificationModel || '',
+                    motherBatch: apiData.motherBatch || '',
+                    materialId: apiData.materialId || '',
+                    batchNumber: trimmedValue // 确保不会覆盖用户已输入的批号
+                };
+                
+                // 保存到缓存，过期时间设置为1小时
+                cache.set(cacheKey, batchInfo, 3600000);
+                
+                // 安全更新表单数据，避免覆盖整个formData对象
+                formData.value.batchNumber = trimmedValue;
+                formData.value.supplyQuantity = apiData.rows[0].amount || '';
+                formData.value.specificationModel = apiData.rows[0].itemName || '';
+                formData.value.motherBatch = apiData.rows[0].texing || '';
+                formData.value.materialId = apiData.rows[0].materialId || '';
+                formData.value.customerCode = apiData.rows[0].orderCode || '';
+
+                console.log('apiData:', apiData.rows[0]);
+                console.log('更新后的formData:', formData.value);
+                
+                // 显示查询成功提示
+                uni.showToast({
+                    title: '查询成功',
+                    duration: 2000
+                });
+            } else {
+                // 没有数据时的处理
+                console.log('未查询到相关数据');
+                uni.showToast({
+                    title: '未查询到相关数据',
+                    icon: 'none',
+                    duration: 2000
+                });
+            }
+        } else {
+            // 使用缓存数据更新表单
+            formData.value = {
+                ...formData.value,
+                ...batchInfo,
+                // 确保不会覆盖用户正在输入的批号
+                batchNumber: trimmedValue
+            };
+        }
+    } catch (error) {
+        console.error('查询批号数据失败:', error);
+        uni.showToast({
+            title: '查询失败，请重试',
+            icon: 'none',
+            duration: 2000
+        });
+    } finally {
+        // 隐藏加载提示
+        uni.hideLoading();
+    }
+};
+
+
+// 明确暴露给父组件的方法
+defineExpose({
+    clearForm
+})
+</script>
+
+<style scoped>
+.footer-con {
+    display: flex;
+    justify-content: flex-end;
+    padding: 20rpx;
+    gap: 20rpx;
+}
+
+.btn-default {
+    background-color: #f0f0f0;
+    color: #333;
+}
+
+.btn-primary {
+    background-color: #6FA2F8;
+    color: #fff;
+}
+</style>
--- a/src/pages/business/EQF/components/qualityFeedbackDetailComponent.vue
+++ b/src/pages/business/EQF/components/qualityFeedbackDetailComponent.vue
@@ -0,0 +1,379 @@
+<template>
+    <uni-forms ref="formRef" :model="formData" :rules="rules" label-width="100px" label-position="top">
+        <uni-forms-item label="合同号" name="cusName" class="f-c-right">
+            <view @click="chooseCustomer" class="form-item-container">
+                <text class="name">{{ formData.customerCode || '点击选择合同数据' }}</text>
+            </view>
+        </uni-forms-item>	
+        <uni-forms-item label="合同号" name="customerCode" class="f-c-right">
+            <uni-easyinput v-model="formData.customerCode" placeholder="请输入合同号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        
+        <uni-forms-item label="批号" name="batchNumber" class="f-c-right">
+            <uni-easyinput v-model="formData.batchNumber" placeholder="请输入批号" name="input" :disabled="isDisabled" @input="handleBatchNumberChange"/>
+        </uni-forms-item>
+        
+        <uni-forms-item label="供货数量" name="supplyQuantity" class="f-c-right">
+            <uni-easyinput v-model="formData.supplyQuantity" type="text" placeholder="请输入供货数量" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        
+        <uni-forms-item label="产品规格型号" name="specificationModel" class="f-c-right">
+            <uni-easyinput v-model="formData.specificationModel" placeholder="请输入产品规格型号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        
+        <uni-forms-item label="母批号" name="motherBatch" class="f-c-right">
+            <uni-easyinput v-model="formData.motherBatch" placeholder="请输入母批号" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+        
+        <uni-forms-item label="产品ID" name="materialId" class="f-c-right">
+            <uni-easyinput v-model="formData.materialId" placeholder="请输入产品ID" name="input" :disabled="isDisabled"/>
+        </uni-forms-item>
+    </uni-forms>
+    <view class="footer-con">
+        <button class="btn-default" type="default" @click="handleDeleteDetailItem" size="mini" v-if="false">删除</button>
+        <button class="btn-primary" type="primary" @click="submitForm" size="mini">保存</button>
+    </view>
+</template>
+
+<script setup name="qualityFeedbackDetailComponent">
+import { ref, reactive } from 'vue'
+import cache from '../../../../utils/cache'
+import { onShow,onLoad, onUnload } from '@dcloudio/uni-app';
+import {
+		getMockBatchData,
+        qualityFeedbackDetailAdd
+	} from '@/api/eqf/qualityFeedback.js'
+
+let isDisabled = ref(false)
+const props = defineProps({
+    cusName: String, //客户单位名称
+    cusId: Number, //客户ID
+    feedbackId: Number, //质量反馈ID
+    status: String //状态
+})
+
+// 表单数据
+const formData = ref({
+    customerCode: '',
+    batchNumber: '',
+    supplyQuantity: '',
+    specificationModel: '',
+    motherBatch: '',
+    materialId: '',
+    eqfId: '',
+});
+
+// 验证规则
+const rules = {
+    contractNumber: {
+        rules: [
+            { required: true, errorMessage: '请输入合同号' }
+        ]
+    },
+    batchNumber: {
+        rules: [
+            { required: true, errorMessage: '请输入批号' }
+        ]
+    },
+    supplyQuantity: {
+        rules: [
+            { required: true, errorMessage: '请输入供货数量' },
+            { type: 'number', errorMessage: '请输入数字' }
+        ]
+    },
+    specificationModel: {
+        rules: [
+            { required: true, errorMessage: '请输入产品规格型号' }
+        ]
+    }
+};
+
+// 表单ref
+const formRef = ref(null);
+
+
+onLoad((options) => {
+    //清空表单
+    clearForm()
+    // 然后设置eqfId
+    if (options && options.id) {
+        formData.value.eqfId = options.id;
+    }
+    // 清除相关缓存，确保首次加载时没有旧数据干扰
+    cache.remove(`qualityFeedbackDetail_${options?.id || ''}`);
+})
+
+//获取当前外反的明细
+const detailList = ref([])
+const getQualityFeedbackDetail = async () => {
+    let param = {
+        eqfId: formData.value.eqfId
+    }
+    let detailRes = await qualityFeedbackDetailAdd(param);
+    detailList.value = detailRes.rows[0];
+}
+
+//删除明细项的内容
+function handleDeleteDetailItem() {
+    // 使用本地存储或其他方式暂存删除操作
+    uni.showToast({
+        title: '删除成功',
+        duration: 2000
+    });
+    //清空表单
+    clearForm()
+}
+
+// 清空表单
+function clearForm() {
+    formData.value.customerCode = ''
+    formData.value.batchNumber = ''
+    formData.value.supplyQuantity = ''
+    formData.value.specificationModel = ''
+    formData.value.motherBatch = ''
+    formData.value.materialId = ''
+}
+
+// 选择合同页面跳转
+function chooseCustomer() {
+    uni.navigateTo({
+        url: '/pages/business/EQF/components/customerOrder'
+    })
+}
+
+// 提交表单
+const submitForm = async () => {
+    try {
+        // 表单校验
+        await formRef.value.validate()
+        console.log(formData,"5555")
+        const res = await qualityFeedbackDetailAdd(formData.value);
+        uni.showToast({
+            title: '提交成功',
+            icon: 'success'
+        })
+            // 发送刷新列表事件，同时支持两种事件名称以兼容现有代码
+            uni.$emit('refreshMarketList');
+            uni.$emit('refreshFeedbackList');
+            setTimeout(() => {
+                uni.navigateBack(1);
+                }, 1500);
+                
+        console.log('表单数据:', formData.value)
+    } catch (err) {
+        console.log('表单验证失败:', err)
+    }
+}
+
+
+//页面渲染完成后，查询详情
+onShow(() => {
+    // Try to load from cache if available
+    const cachedData = cache.get(`qualityFeedbackDetail_${props.feedbackId}`);
+    if (cachedData) {
+        formData.value = {
+            ...formData.value,
+            ...cachedData
+        };
+    }
+    
+    if (props.status == '完成') {
+        isDisabled.value = true
+    } else {
+        isDisabled.value = false
+    }
+    
+    // 监听客户订单选择事件
+    uni.$on('onCustomerSelected', handleCustomerSelected);
+});
+
+// 处理客户订单选择结果
+function handleCustomerSelected(data) {
+    // 确保数据存在
+    if (!data || typeof data !== 'object') {
+        console.error('无效的数据:', data);
+        return;
+    }
+    
+    // 如果返回的是对象
+    let selectedItems = [];
+    
+    console.log('接收到的数据:', data);
+    
+    // 兼容新格式
+    selectedItems = data.originalData || [];
+    
+    if (selectedItems && selectedItems.length > 0) {
+        // 清空表单
+        clearForm();
+        
+        console.log('选中的项目数量:', selectedItems.length);
+        console.log('选中的项目详情:', selectedItems);
+        
+        // 循环拼接所有选中项目的字段
+        const customerCodes = selectedItems.map(item => item.orderCoode || '').filter(Boolean);
+        const supplyQuantities = selectedItems.map(item => item.amount || '').filter(Boolean);
+        const specificationModels = selectedItems.map(item => item.name || '').filter(Boolean);
+        const motherBatches = selectedItems.map(item => item.texing || '').filter(Boolean);
+        const materialIds = selectedItems.map(item => item.materialId || '').filter(Boolean);
+        const batchNumbers = selectedItems.map(item => item.tokenCode || '').filter(Boolean);
+
+        console.log('拼接前的合同号:', customerCodes);
+        
+        // 使用nextTick确保DOM更新
+        setTimeout(() => {
+            formData.value.customerCode = customerCodes.join(',');
+            formData.value.supplyQuantity = supplyQuantities.join(',');
+            formData.value.specificationModel = specificationModels.join(',');
+            formData.value.motherBatch = motherBatches.join(',');
+            formData.value.materialId = materialIds.join(',');
+            formData.value.batchNumber = batchNumbers.join(',');
+            
+            console.log('设置后的表单数据:', formData.value);
+        }, 0);
+        
+        // 显示提示信息
+        uni.showToast({
+            title: `已选择${selectedItems.length}个批次`,
+            icon: 'none',
+            duration: 2000
+        });
+        
+        // 保存到缓存
+        cache.set(`qualityFeedbackDetail_${props.feedbackId || ''}`, formData.value);
+    }
+};
+
+// 页面卸载时移除事件监听
+onUnload(() => {
+    uni.$off('onCustomerSelected', handleCustomerSelected);
+});
+
+// 处理批号变化，自动查询数据
+const handleBatchNumberChange = async (value) => {
+    const trimmedValue = value?.trim() || '';
+    // 防止空值查询
+    if (!trimmedValue) {
+        console.log('批号为空，不执行查询');
+        return;
+    }
+    
+    try {
+        // 显示加载提示
+        uni.showLoading({
+            title: '查询中...',
+        });
+        const  param = { batchNumber: value };
+        console.log('查询参数:', param);
+        // 尝试从缓存获取数据，减少重复请求
+        const cacheKey = `batchInfo_${trimmedValue}`;
+        let batchInfo = cache.get(cacheKey);
+        console.log('缓存数据:', batchInfo);
+
+        if (1==1) {
+            // 调用API获取数据
+            console.log('准备调用API...');
+			let apiData 
+            try {
+                const res = await getMockBatchData(param);
+                console.log('API响应原始数据:', res);
+				// 根据isTransformResponse=false的设置，正确处理响应数据
+				// 修复4: 处理可能的嵌套数据结构
+				apiData = res;
+				// 检查是否有data字段，适应不同的响应结构
+				if (res.data !== undefined) {
+				    apiData = res.data;
+				}
+            } catch (apiError) {
+                console.error('API调用直接失败:', apiError);
+                // 重新抛出错误，让外层catch处理
+                throw new Error(`API调用失败: ${apiError?.message || '未知错误'}`);
+            }
+
+            console.log('处理后的数据:', apiData);
+            
+            if (typeof apiData === 'object' && apiData !== null) {
+                // 提取并格式化有用的数据
+                batchInfo = {
+                    supplyQuantity: apiData.supplyQuantity || '',
+                    specificationModel: apiData.specificationModel || '',
+                    motherBatch: apiData.motherBatch || '',
+                    materialId: apiData.materialId || '',
+                    batchNumber: trimmedValue // 确保不会覆盖用户已输入的批号
+                };
+                
+                // 保存到缓存，过期时间设置为1小时
+                cache.set(cacheKey, batchInfo, 3600000);
+                
+                // 安全更新表单数据，避免覆盖整个formData对象
+                formData.value.batchNumber = trimmedValue;
+                formData.value.supplyQuantity = apiData.rows[0].amount || '';
+                formData.value.specificationModel = apiData.rows[0].itemName || '';
+                formData.value.motherBatch = apiData.rows[0].texing || '';
+                formData.value.materialId = apiData.rows[0].materialId || '';
+                formData.value.customerCode = apiData.rows[0].orderCode || '';
+
+                console.log('apiData:', apiData.rows[0]);
+                console.log('更新后的formData:', formData.value);
+                
+                // 显示查询成功提示
+                uni.showToast({
+                    title: '查询成功',
+                    duration: 2000
+                });
+            } else {
+                // 没有数据时的处理
+                console.log('未查询到相关数据');
+                uni.showToast({
+                    title: '未查询到相关数据',
+                    icon: 'none',
+                    duration: 2000
+                });
+            }
+        } else {
+            // 使用缓存数据更新表单
+            formData.value = {
+                ...formData.value,
+                ...batchInfo,
+                // 确保不会覆盖用户正在输入的批号
+                batchNumber: trimmedValue
+            };
+        }
+    } catch (error) {
+        console.error('查询批号数据失败:', error);
+        uni.showToast({
+            title: '查询失败，请重试',
+            icon: 'none',
+            duration: 2000
+        });
+    } finally {
+        // 隐藏加载提示
+        uni.hideLoading();
+    }
+};
+
+
+// 明确暴露给父组件的方法
+defineExpose({
+    clearForm
+})
+</script>
+
+<style scoped>
+.footer-con {
+    display: flex;
+    justify-content: flex-end;
+    padding: 20rpx;
+    gap: 20rpx;
+}
+
+.btn-default {
+    background-color: #f0f0f0;
+    color: #333;
+}
+
+.btn-primary {
+    background-color: #6FA2F8;
+    color: #fff;
+}
+</style>
--- a/src/pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter.vue
+++ b/src/pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { ref, reactive, onUnmounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
+import cache from '../../../../utils/cache';
+import customHeader from '../../../../components/customHeader.vue';
+import gkQualityFeedbackDetailComponent from '../components/gkQualityFeedbackDetailComponent.vue';
+
+const cusName = ref()
+const cusId = ref()
+const visistId = ref()
+const status = ref()
+
+// 质量反馈明细组件引用
+const qualityFeedbackDetailComponentRef = ref(null)
+// 展开/收起标志
+let expandFlagRC = ref(true);
+
+onLoad(options => {
+    cusName.value = options.cusName
+    cusId.value = options.cusId
+    visistId.value = options.visistId
+    status.value = options.status
+    // 首次加载时，如果组件已挂载，立即清空明细数据
+    setTimeout(() => {
+        if (qualityFeedbackDetailComponentRef.value) {
+            qualityFeedbackDetailComponentRef.value.clearForm();
+        }
+    }, 100);
+})
+
+// 质量反馈明细
+// 处理展开/收起明细区域
+let handleExpandRC = () => {
+    expandFlagRC.value = !expandFlagRC.value;
+    if (expandFlagRC.value) {
+        // 展开时清空明细数据，确保每次展开都是空表单
+        if (qualityFeedbackDetailComponentRef.value) {
+            qualityFeedbackDetailComponentRef.value.clearForm();
+        }
+    }
+};
+
+// 返回上一页功能
+const handleBack = () => {
+    navigateBack({
+        delta: 1
+    });
+};
+
+// ... 其他现有代码
+</script>
+
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'外反明细录入'" :leftFlag="true" :rightFlag="false" @back="handleBack"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 质量反馈明细录入 -->
+            <view class="white-bg white-bg-2">
+                <view class="w-b-title" @click="handleExpandRC">明细录入
+                    <text>
+                        {{ expandFlagRC ? '收起' : '展开' }}
+                        <i :class="{ iconfont: true, 'icon-up': expandFlagRC, 'icon-down': !expandFlagRC }"></i>
+                    </text>
+                </view>
+                <view v-show="expandFlagRC" class="form-con">
+                    <gkQualityFeedbackDetailComponent 
+                        :cusName="cusName" 
+                        :cusId="cusId" 
+                        :feedbackId="visistId" 
+                        :status="status" 
+                        ref="qualityFeedbackDetailComponentRef"
+                    ></gkQualityFeedbackDetailComponent>
+                </view>
+            </view>
+
+        </view>
+    </view>
+</template>
--- a/src/pages/business/EQF/qualityFeedback/qualityFeedbackAdd.vue
+++ b/src/pages/business/EQF/qualityFeedback/qualityFeedbackAdd.vue
@@ -0,0 +1,502 @@
+<template>
+	<view class="con-body">
+		<view class="con-bg">
+			<!-- 头部 -->
+			<customHeader ref="customHeaderRef" :title="'质量反馈新增'" :leftFlag="true" :rightFlag="true">
+				<template #right>
+					<view class="head-right" @click="submitForm">
+						<uni-icons custom-prefix="iconfont" type="icon-phonebaocun" size="22"
+							color="#B7D2FF"></uni-icons>保存
+					</view>
+				</template>
+			</customHeader>
+
+			<!-- 高度来避免头部遮挡 -->
+			<view class="top-height"></view>
+
+			<!-- 正文内容 -->
+			<view class="white-bg">
+				<view class="form-con">
+					<uni-forms ref="formRef" :model="formData" :rules="rules" label-width="120px">
+						<uni-forms-item label="客户名称" name="cusName" class="f-c-right" required>
+							<view @click="chooseCustomer" class="form-item-container">
+								<text class="name">{{ formData.cusName || '点击选择客户' }}</text>
+							</view>
+						</uni-forms-item>						
+						<uni-forms-item label="产品类型" name="productType" class="f-c-right">
+							<uni-data-select v-model="formData.productType" :localdata="productTypeList"
+							placeholder="请选择产品类型"/>
+						</uni-forms-item>
+						<uni-forms-item label="产品类别" class="f-c-right" name="productCategory" v-if="formData.productType == '电阻器'" required>
+							<uni-data-select v-model="formData.productCategory" :localdata="productCategoryList" 
+								placeholder="请选择产品类别" />
+						</uni-forms-item>
+						<uni-forms-item label="产品大类" class="f-c-right" name="productCategories" v-if="formData.productType == '管壳'">
+							<uni-data-select v-model="formData.productCategories" :localdata="productCategoriesList" 
+								placeholder="请选择产品大类" />
+						</uni-forms-item>
+						<uni-forms-item label="产品分类" class="f-c-right" name="classification" v-if="formData.productType == '管壳'">
+							<uni-data-select v-model="formData.classification" :localdata="classificationList" 
+								placeholder="请选择产品分类" />
+						</uni-forms-item>
+						<uni-forms-item label="问题现象" name="ppNameLabel" class="f-c-right">
+							<uni-data-select v-model="formData.ppNameLabel" :localdata="problemPhenomenonList" 
+								placeholder="请选择问题现象" />
+						</uni-forms-item>
+						<uni-forms-item label="问题现象描述" name="ppNameDescribe" class="f-c-right">
+							<uni-easyinput v-model="formData.ppNameDescribe" type="textarea" placeholder="请详细描述问题现象" />
+						</uni-forms-item>
+						<uni-forms-item label="使用数量" name="employQuantity" class="f-c-right">
+							<uni-easyinput v-model.number="formData.employQuantity" type="number" placeholder="请输入使用数量" />
+						</uni-forms-item>
+						<uni-forms-item label="问题数量" name="problemQuantity" class="f-c-right">
+							<uni-easyinput v-model.number="formData.problemQuantity" type="number" placeholder="请输入问题数量" />
+						</uni-forms-item>
+						<uni-forms-item label="使用方法" name="employMethod" class="f-c-right">
+							<uni-easyinput v-model="formData.employMethod" placeholder="请输入使用方法" />
+						</uni-forms-item>
+						<uni-forms-item label="问题发生阶段" name="posName" class="f-c-right" required>
+							<uni-data-select v-model="formData.posName" :localdata="problemStageList" 
+								placeholder="请选择问题发生阶段" />
+						</uni-forms-item>
+						<uni-forms-item label="用户诉求标签" name="customerAppealLabels" class="f-c-right" required>
+							<uni-data-select v-model="formData.customerAppealLabels" :multiple="true"  :localdata="customerAppealLabelList" 
+								placeholder="请选择用户诉求标签" />
+						</uni-forms-item>
+						<uni-forms-item label="用户诉求" name="customerAppeal" class="f-c-right" required>
+							<uni-easyinput v-model="formData.customerAppeal" type="textarea" placeholder="请输入用户诉求" />
+						</uni-forms-item>
+						<uni-forms-item label="是否返厂" name="isReturnfactory" class="f-c-right">
+							<uni-data-select v-model="formData.isReturnfactory" :localdata="isReturnfactoryYesNoList" 
+								placeholder="请选择是否返厂" />
+						</uni-forms-item>
+						<uni-forms-item label="是否需要归零" name="isReturnzero" class="f-c-right" required>
+							<uni-data-select v-model="formData.isReturnzero" :localdata="isReturnzeroYesNoList" 
+								placeholder="请选择是否需要归零" />
+						</uni-forms-item>
+						<uni-forms-item label="业务员" name="salesman" class="f-c-right">
+							<uni-easyinput v-model="formData.salesman" placeholder="请输入业务员" />
+						</uni-forms-item>
+						<uni-forms-item label="联系方式" name="salesmanPhone" class="f-c-right">
+							<uni-easyinput v-model="formData.salesmanPhone" placeholder="请输入联系方式" />
+						</uni-forms-item>
+						<uni-forms-item label="答复日期" name="replyTime" class="uni-forms-item is-direction-top is-top">
+							<uni-datetime-picker type="date" :clear-icon="false" v-model="formData.replyTime" @change="changeDate" />
+						</uni-forms-item>
+					</uni-forms>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		onMounted,
+		reactive,
+		onUnmounted,
+		computed
+	} from 'vue'
+	import customHeader from '@/components/customHeader.vue'
+	import {
+		getGuestList
+	} from '@/api/business.js'
+	import {
+		isEmpty
+	} from '@/utils/validate.js'
+	import {
+		listgetResistorTypeList,
+		listgetProductCategoriesList,
+		listgetClassificationList,
+		listgetProblemPhenomenonList,
+		listgetProblemStageList,
+		listgetCustomerAppealLabelList,
+		qualityFeedbackAdd,
+	} from '@/api/eqf/qualityFeedback.js'
+
+
+	let customerUser = reactive({})
+	// 客户相关
+	const guestList = ref([])
+	const guestArr = ref([])
+	const guestIndex = ref(0)
+
+	/// 正确的数据绑定示例
+const formData = ref({
+  leader: '',          // 我方领导
+  userDemand: '',      // 用户诉求
+  isReturnFactory: '否', // 是否返厂
+  isNeedReset: '否',     // 是否需要归零
+  salesman: '',        // 业务员
+  contact: '',         // 联系方式
+  productCategory: '', // 产品分类
+  productType: '电阻器',     // 产品类型
+  problemPhenomenon: '', // 问题现象
+  problemDescription: '', // 问题现象描述
+  usageQuantity: '',   // 使用数量
+  problemQuantity: '', // 问题数量
+  usageMethod: '',      // 使用方法
+  cusName: '',
+  customerId: '',
+  ppNameLabel: '',
+  ppNameDescribe: '',
+  employQuantity: '',
+  problemQuantity: '', // 问题数量
+  employMethod: '',
+  posName: '',
+  customerAppealLabels: [],
+  customerAppeal: '',
+  isReturnfactory: '',
+  isReturnzero:	'',
+  salesman: '',
+  salesmanPhone: '',
+  replyTime: '',
+});
+
+// 添加表单验证规则
+const rules = {
+  cusName: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择客户'
+      }
+    ]
+  },
+  productType: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择产品类型'
+      }
+    ]
+  },
+  productCategory: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择产品类别',
+        validateFunction: (rule, value, data, callback) => {
+          // 只有当产品类型为电阻器时才验证
+          if (data.productType === '电阻器' && !value) {
+            callback('请选择产品类别');
+          } else {
+            callback();
+          }
+        }
+      }
+    ]
+  },
+  productCategories: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择产品大类',
+        validateFunction: (rule, value, data, callback) => {
+          // 只有当产品类型为管壳时才验证
+          if (data.productType === '管壳' && !value) {
+            callback('请选择产品大类');
+          } else {
+            callback();
+          }
+        }
+      }
+    ]
+  },
+  classification: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择产品分类',
+        validateFunction: (rule, value, data, callback) => {
+          // 只有当产品类型为管壳时才验证
+          if (data.productType === '管壳' && !value) {
+            callback('请选择产品分类');
+          } else {
+            callback();
+          }
+        }
+      }
+    ]
+  },
+  posName: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择问题发生阶段'
+      }
+    ]
+  },
+  customerAppealLabels: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择用户诉求标签',
+        validateFunction: (rule, value, data, callback) => {
+          if (!value || value.length === 0) {
+            callback('请选择用户诉求标签');
+          } else {
+            callback();
+          }
+        }
+      }
+    ]
+  },
+  customerAppeal: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请输入用户诉求'
+      }
+    ]
+  },
+  isReturnzero: {
+    rules: [
+      {
+        required: true,
+        errorMessage: '请选择是否需要归零'
+      }
+    ]
+  }
+}
+// 定义产品分类列表
+const productTypeList =[
+	{ text: '电阻器', value: '电阻器' },
+	{ text: '管壳', value: '管壳' },
+  	// 其他产品类型...
+]
+// 是/否选项
+const isReturnfactoryYesNoList = [
+	{ text: '是', value: '是' },
+	{ text: '否', value: '否' },
+	{ text: '在途', value: '在途' }
+]
+// 是/否选项
+const isReturnzeroYesNoList = [
+	{ text: '是', value: '是' },
+	{ text: '否', value: '否' },
+]
+
+//产品类别
+const productCategoryList = ref([]);
+//产品大类
+const productCategoriesList = ref([]);
+//	产品分类
+const classificationList = ref([]);
+//问题现象
+const problemPhenomenonList = ref([]);
+//问题发生阶段
+const problemStageList = ref([]);
+//用户诉求标签
+const customerAppealLabelList = ref([]);
+
+
+// 初始化产品类别数据
+const initProductCategoryData = async () => {
+  try {
+    // 这里需要根据实际的API接口进行调用，以下为示例
+    // 加载产品类别数据
+    // 使用listgetResistorTypeList接口获取电阻器类型数据
+	const resistorTypeRes = await listgetResistorTypeList();
+	productCategoryList.value = resistorTypeRes.rows.map(item => ({
+		text: item.resistorTypeText,  // 显示文本
+		value: item.resistorTypeValue  // 对应的值
+	}));
+    
+    // 加载产品大类数据
+	const productCategories = await listgetProductCategoriesList();
+	console.log(productCategories)
+    productCategoriesList.value = productCategories.rows.map(item => ({
+		text: item.productCategoriesText,  // 显示文本
+		value: item.productCategoriesValue  // 对应的值
+	}));
+    
+    // 加载产品分类数据
+	const classification = await listgetClassificationList();
+    classificationList.value = classification.rows.map(item => ({
+		text: item.classificationText,  // 显示文本
+		value: item.classificationValue  // 对应的值
+	}));
+
+	//问题现象
+	const problemPhenomenon = await listgetProblemPhenomenonList();
+	console.log(problemPhenomenon)
+	problemPhenomenonList.value = problemPhenomenon.rows.map(item => ({
+		text: item.problemPhenomenonText,  // 显示文本
+		value: item.problemPhenomenonValue  // 对应的值
+	}));
+
+	//问题发生阶段
+	const problemStage = await listgetProblemStageList();
+	problemStageList.value = problemStage.rows.map(item => ({
+		text: item.problemStageText,  // 显示文本
+		value: item.problemStageValue  // 对应的值
+	}));
+	
+	//用户诉求标签
+	const customerAppealLabel = await listgetCustomerAppealLabelList();
+	customerAppealLabelList.value = customerAppealLabel.rows.map(item => ({
+		text: item.customerAppealLabelText,  // 显示文本
+		value: item.customerAppealLabelValue  // 对应的值
+	}));
+  } catch (error) {
+    console.error('加载产品类别数据失败:', error);
+    uni.showToast({ title: '加载产品类别数据失败', icon: 'none' });
+  }
+};
+
+
+	// 表单引用 & 客户选择器引用
+	const formRef = ref(null)
+	const customHeaderRef = ref(null)
+	// 选择客户页面跳转
+	function chooseCustomer() {
+		uni.navigateTo({
+			url: '/pages/business/EQF/components/chooseCus'
+		})
+	}
+	//定义数据接收的值
+	let selectedCustomer = reactive(null)
+
+	//监听时间
+	onMounted(() => {
+		uni.$on('onCustomerSelected', handleCustomerSelected)
+		initProductCategoryData();
+	})
+	//取消监听
+	onUnmounted(() => {
+		uni.$off('onCustomerSelected', handleCustomerSelected)
+	})
+
+	//处理 接收数据
+	const handleCustomerSelected = (data) => {
+		formData.value.cusName = data.cusName
+		formData.value.customerId = data.cusId
+	}
+	// 提交表单
+	const submitForm = async () => {
+		try {
+			// 表单校验
+			await formRef.value.validate()
+			console.log(formData,"5555")
+			const res = await qualityFeedbackAdd(formData.value);
+			uni.showToast({
+				title: '提交成功',
+				icon: 'success'
+			})
+			  uni.$emit('refreshMarketList');
+			  setTimeout(() => {
+			        uni.navigateBack(1);
+			      }, 1500);
+			      
+			console.log('表单数据:', formData.value)
+		} catch (err) {
+			console.log('表单验证失败:', err)
+		}
+	}
+
+</script>
+
+<style scoped>
+/* 基本布局样式 */
+.con-body {
+  background-color: #F8F8F8;
+}
+
+.con-bg {
+  padding-bottom: 20rpx;
+}
+
+/* 顶部占位高度，避免内容被头部遮挡 */
+.top-height {
+  height: 80rpx;
+}
+
+/* 表单区域背景 */
+.white-bg {
+  padding: 20rpx;
+  background-color: #FFFFFF;
+}
+
+/* 表单容器 */
+.form-con {
+  margin-top: 20rpx;
+}
+
+/* 表单项目对齐方式 */
+.f-c-right {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 10rpx 0;
+}
+
+/* 加载遮罩 */
+.loading-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.3);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+/* ======== 表单组件样式优化 ======== */
+
+/* 基础表单样式 */
+:deep(.uni-forms) {
+  width: 100%;
+}
+
+:deep(.uni-forms-item) {
+  margin-bottom: 20rpx;
+  position: relative; /* 为伪元素定位做准备 */
+}
+
+/* 日期选择器样式 */
+:deep(.uni-date-x .uni-date__x-input) {
+  padding-left: 20rpx;
+  color: #919191;
+}
+
+/* ======== 强制显示必填项红色标识 ======== */
+
+/* 方案1: 使用伪元素在标签前添加红色星号 */
+:deep(.uni-forms-item--required)::before {
+  content: '*';
+  color: #ff4d4f !important;
+  position: absolute;
+  left: -16rpx;
+  top: 50%;
+  transform: translateY(-50%);
+  font-size: 28rpx !important;
+  font-weight: bold !important;
+  z-index: 10;
+}
+
+/* 调整标签内边距，避免文本与星号重叠 */
+:deep(.uni-forms-item__label) {
+  padding-left: 16rpx !important;
+}
+
+/* 方案2: 增强内置必填项标识的样式（备用方案） */
+:deep(.uni-forms-item--required .uni-forms-item__required) {
+  display: inline !important;
+  color: #ff4d4f !important;
+  margin-right: 8rpx !important;
+  font-size: 28rpx !important;
+  font-weight: bold !important;
+}
+
+/* 方案3: 直接在标签文本中显示星号（最可靠的后备方案） */
+:deep(.uni-forms-item--required .uni-forms-item__label::before) {
+  content: '*';
+  color: #ff4d4f !important;
+  margin-right: 4rpx;
+}
+</style>
--- a/src/pages/business/EQF/qualityFeedback/qualityFeedbackEnter.vue
+++ b/src/pages/business/EQF/qualityFeedback/qualityFeedbackEnter.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { ref, reactive, onUnmounted } from 'vue'
+import { onLoad } from '@dcloudio/uni-app';
+import cache from '../../../../utils/cache';
+import customHeader from '../../../../components/customHeader.vue';
+import QualityFeedbackDetailComponent from '../components/qualityFeedbackDetailComponent.vue';
+
+const cusName = ref()
+const cusId = ref()
+const visistId = ref()
+const status = ref()
+
+// 质量反馈明细组件引用
+const qualityFeedbackDetailComponentRef = ref(null)
+// 展开/收起标志
+let expandFlagRC = ref(true);
+
+onLoad(options => {
+    cusName.value = options.cusName
+    cusId.value = options.cusId
+    visistId.value = options.visistId
+    status.value = options.status
+    // 首次加载时，如果组件已挂载，立即清空明细数据
+    setTimeout(() => {
+        if (qualityFeedbackDetailComponentRef.value) {
+            qualityFeedbackDetailComponentRef.value.clearForm();
+        }
+    }, 100);
+})
+
+// 质量反馈明细
+// 处理展开/收起明细区域
+let handleExpandRC = () => {
+    expandFlagRC.value = !expandFlagRC.value;
+    if (expandFlagRC.value) {
+        // 展开时清空明细数据，确保每次展开都是空表单
+        if (qualityFeedbackDetailComponentRef.value) {
+            qualityFeedbackDetailComponentRef.value.clearForm();
+        }
+    }
+};
+
+// 返回上一页功能
+const handleBack = () => {
+    navigateBack({
+        delta: 1
+    });
+};
+
+// ... 其他现有代码
+</script>
+
+<template>
+    <view class="con-body">
+        <view class="con-bg">
+            <!-- 头部 -->
+            <customHeader ref="customHeaderRef" :title="'外反明细录入'" :leftFlag="true" :rightFlag="false" @back="handleBack"></customHeader>
+            <!-- 高度来避免头部遮挡 -->
+            <view class="top-height"></view>
+
+            <!-- 质量反馈明细录入 -->
+            <view class="white-bg white-bg-2">
+                <view class="w-b-title" @click="handleExpandRC">明细录入
+                    <text>
+                        {{ expandFlagRC ? '收起' : '展开' }}
+                        <i :class="{ iconfont: true, 'icon-up': expandFlagRC, 'icon-down': !expandFlagRC }"></i>
+                    </text>
+                </view>
+                <view v-show="expandFlagRC" class="form-con">
+                    <QualityFeedbackDetailComponent 
+                        :cusName="cusName" 
+                        :cusId="cusId" 
+                        :feedbackId="visistId" 
+                        :status="status" 
+                        ref="qualityFeedbackDetailComponentRef"
+                    ></QualityFeedbackDetailComponent>
+                </view>
+            </view>
+
+        </view>
+    </view>
+</template>
--- a/src/pages/business/EQF/qualityFeedback/qualityFeedbackIndex.vue
+++ b/src/pages/business/EQF/qualityFeedback/qualityFeedbackIndex.vue
@@ -0,0 +1,534 @@
+<template>
+  <view class="con-body">
+    <view class="con-bg">
+      <!-- 头部 -->
+      <customHeader ref="customHeaderRef" :title="'质量反馈'" :leftFlag="true" :rightFlag="true">
+        <template #right>
+          <view class="head-right" @click="handleAdd">
+            <uni-icons type="plus" size="24" color="#B7D2FF"></uni-icons>新增
+          </view>
+        </template>
+      </customHeader>
+
+      <!-- 高度来避免头部遮挡 -->
+      <view class="top-height" :style="{ paddingTop: navBarPaddingTop + 'px' }"></view>
+
+      <!-- 正文内容 -->
+      <view class="all-body">
+        <!-- 搜索  @blur="blur" @focus="focus" @input="input" @cancel="cancel" @clear="clear"-->
+        <view class="search">
+          <uni-search-bar class="custom-search" radius="28" placeholder="请输入客户名称" clearButton="auto"
+                          cancelButton="none" bgColor="#6FA2F8" textColor="#ffffff" v-model="searchValue" />
+          <button type="default" @click="handleSearch" size="mini" class="btn-search">查询</button>
+        </view>
+
+        <!-- 分页部分  -->
+        <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
+                      :up="upOption" :down="downOption" :fixed="false" textColor="#ffffff" bgColor="#ffffff"
+                      class="scroll-h" :class="{ 'loading-scroll': cssFlag }">
+          <view class="white-bg margin-bottom20" v-for="(item, index) in list" :key="index"
+                @touchstart.prevent="touchstart(item)" @touchend.prevent="touchend">
+            <view>
+              <view class="report-list">
+                <view class="title">客户：{{ item.customerName }}-{{ item.id }}</view>
+                <view class="r-list">
+                  <view class="r-name">{{ item.qualityCode }}</view>
+                  <view @touchstart.stop="handleStatusTouchStart"
+                        @touchend.stop="handleStatusTouchEnd" @click.stop="chooseStatus(item)">
+                    <view class="r-right btn-orange" size="mini">
+                      {{ item.status }}
+                    </view>
+                  </view>
+
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">外反类型</view>
+                  <view class="r-right">{{ item.productType }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">问题现象描述</view>
+                  <view class="r-right">{{ item.ppNameDescribe }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">问题发生阶段</view>
+                  <view class="r-right">{{ item.posName }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                <view class="r-left">明细信息</view>
+                  <view class="r-right detail-info" @click="showDetailInfo(item)">
+                    <view class="detail-item">
+                      <span class="detail-label">合同号：</span>
+                      <span class="detail-value">{{ formatTextWithLineBreak(item.customerCode) }}</span>
+                    </view>
+                    <view class="detail-item">
+                      <span class="detail-label">批号：</span>
+                      <span class="detail-value">{{ formatTextWithLineBreak(item.batchNumber) }}</span>
+                    </view>
+                  </view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">创建人</view>
+                  <view class="r-right">{{ item.createName }}</view>
+                </view>
+                <view class="border-bottom"></view>
+                <view class="r-list">
+                  <view class="r-left">创建日期</view>
+                  <view class="r-right">{{ item.createTime }}</view>
+                </view>
+
+              </view>
+            </view>
+          </view>
+        </mescroll-uni>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { ref, onMounted, watch } from 'vue'
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import customHeader from '@/components/customHeader.vue'
+import { getNavBarPaddingTop } from '@/utils/system.js'
+import { listFeedback, removeQualityFeedback, updateStatus } from '@/api/eqf/qualityFeedback.js';
+
+// 获取导航栏高度用于内容区域padding
+const navBarPaddingTop = ref(0);
+onMounted(() => {
+  navBarPaddingTop.value = getNavBarPaddingTop() * 2;
+})
+
+let informationId = ref(0);
+let id = ref(null);
+// 定义存储列表数据的响应式变量
+// 查询列表
+let list = ref([]);
+let totalCount = ref(0);
+
+onLoad((options) => {
+  informationId.value = options.informationId;
+  // 调用时传入分页参数，首次加载第一页，每页10条
+  getQualityFeedbackList(1, 10)
+    .then(data => {
+      // 将数据更新到响应式变量
+      list.value = data.list;
+      totalCount.value = data.total;
+    })
+    .catch(error => {
+      console.error('获取数据失败:', error);
+    });
+    
+  // 监听刷新列表事件
+  uni.$on('refreshFeedbackList', refreshList);
+});
+
+onShow(() => {
+  // 页面显示时重新加载数据，确保数据最新
+  getQualityFeedbackList(1, 10)
+    .then(data => {
+      list.value = data.list;
+      totalCount.value = data.total;
+    })
+    .catch(error => {
+      console.error('刷新数据失败:', error);
+    });
+});
+
+// 在页面卸载时移除事件监听，避免内存泄漏
+uni.$on('onUnload', () => {
+  uni.$off('refreshFeedbackList', refreshList);
+});
+
+// 刷新列表数据的函数
+const refreshList = () => {
+  getQualityFeedbackList(1, 10)
+    .then(data => {
+      list.value = data.list;
+      totalCount.value = data.total;
+      // 如果有滚动组件实例，重置上拉加载状态
+      if (mescrollRef.value) {
+        mescrollRef.value.resetUpScroll();
+      }
+    })
+    .catch(error => {
+      console.error('刷新列表数据失败:', error);
+    });
+};
+
+
+
+let searchValue = ref(null)
+
+//监视查询的内容的变化
+watch(searchValue, (newValue, oldValue) => {
+  //变化了之后，重新查询内容
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+  };
+  listFeedback(data).then(res => {
+    if (res.code === 200) {
+      //设置列表数据
+      list.value = res.rows;
+    }
+  })
+})
+
+// 添加显示详细信息的函数
+const showDetailInfo = (item) => {
+  uni.showModal({
+    title: '明细信息',
+    content: `合同号：${formatEmptyValue(item.customerCode)}\n批号：${formatEmptyValue(item.batchNumber)}`,
+    showCancel: false
+  });
+};
+
+// 添加数据格式化和验证的辅助函数
+const formatTextWithLineBreak = (text) => {
+  if (!text || typeof text !== 'string') return '-';
+  // 将逗号替换为换行符
+  return text.split(',').join('\n');
+};
+
+// 显示空值的默认文本
+const formatEmptyValue = (value) => {
+  if (value === null || value === undefined || value === '') {
+    return '-';
+  }
+  return value;
+};
+
+// 查询搜索跳转
+let handleSearch = () => {
+  var data = {
+    pageNum: 1,
+    pageSize: 10,
+  };
+  listFeedback(data).then(res => {
+    if (res.code == 200) {
+      //设置列表数据
+      list.value = res.rows;
+    } else {
+      uni.showToast({
+        icon: 'none',
+        title: "请求失败",
+      });
+      list.value = null;
+    }
+
+  })
+}
+
+// 新增
+let handleAdd = () => {
+  uni.navigateTo({url: '/pages/business/EQF/qualityFeedback/qualityFeedbackAdd'})
+}
+
+
+const mescrollRef = ref(null);
+const upOption = ref({
+  page: {num: 0, size: 10},
+  noMoreSize: 5,
+  empty: {
+      tip: '~ 空空如也 ~',
+      icon: "../../../../static/images/mescroll-empty.png"
+  },
+  textLoading: '加载中...',
+  textNoMore: '已经到底了'
+});
+
+const downOption = ref({
+  auto: true,
+  textInOffset: '下拉刷新',
+  textOutOffset: '释放更新',
+  textLoading: '刷新中...'
+});
+
+let cssFlag = ref(false);//控制样式
+const mescrollInit = (mescroll) => {
+  cssFlag.value = true;
+  mescrollRef.value = mescroll;
+};
+
+// 下拉刷新
+const downCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await getQualityFeedbackList(1, upOption.value.page.size);
+      cssFlag.value = false;
+      list.value = res.list;
+      mescroll.resetUpScroll();
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  } finally {
+    setTimeout(async () => {
+      mescroll.endSuccess();
+    }, 500);
+  }
+}
+// 上拉加载更多
+const upCallback = async (mescroll) => {
+  try {
+    setTimeout(async () => {
+      const res = await getQualityFeedbackList(mescroll.num, mescroll.size);
+      if (mescroll.num === 1) {
+        list.value = res.list;
+      } else {
+        list.value.push(...res.list);
+      }
+      mescroll.endBySize(res.list.length, res.total);
+    }, 500);
+  } catch (error) {
+    mescroll.endErr();
+  }
+}
+
+// 获取数据列表 - 完善版本
+const getQualityFeedbackList = (pageNum, pageSize) => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      // 检查分页参数是否存在
+      if (!pageNum || !pageSize) {
+        reject(new Error('分页参数不能为空'));
+        return;
+      }
+      
+      let param = {
+        pageNum,
+        pageSize,
+        // 可能还需要传递informationId作为查询条件
+        informationId: informationId.value
+      };
+      
+      let res = await listFeedback(param);
+      
+      // 检查接口返回是否有效
+      if (!res) {
+        reject(new Error('接口返回为空'));
+        return;
+      }
+      
+      console.log('接口返回数据:', res);
+      resolve({
+        list: res.rows || [],
+        total: res.total || 0
+      });
+    } catch (error) {
+      console.error('请求过程出错:', error);
+      reject(error);
+    }
+  });
+};
+
+ // 空依赖数组确保只在组件挂载时执行一次
+
+let Loop = ref(0)
+let now
+const visistId = ref();
+const cusName = ref();
+const cusId = ref();
+const status = ref();
+const productType = ref();
+
+function touchstart(item) {
+  cusName.value = item.cusName
+  cusId.value = item.cusId
+  status.value = item.status
+  id.value = item.id
+  productType.value = item.productType
+  now = new Date();
+  clearInterval(Loop.value); //再次清空定时器，防止重复注册定时器
+  Loop.value = setTimeout(() => {
+    uni.showModal({
+      title: '删除',
+      content: '请问要删除本条消息吗？',
+      success: (res) => {
+        if (res.confirm) {
+          const data = {
+            num: 1,
+            pageSize: 10,
+            status: "录入"
+          };
+          const parm = {
+            id: item.id
+          };
+          removeQualityFeedback(parm).then(res => {
+            if (res.code == 500) {
+              uni.showToast({
+                icon: 'none',
+                title: "存在明细项，不能直接删除！",
+              });
+            } else {
+              uni.showToast({
+                title: "删除成功",
+                duration: 2000
+              });
+            }
+            // 刷新内容
+            upCallback()
+          });
+        }
+      }
+    });
+  }, 750);
+
+}
+
+function touchend() {
+  if(productType.value == '电阻器'){
+    uni.navigateTo({
+      url: "/pages/business/EQF/qualityFeedback/qualityFeedbackEnter?id=" + id.value + '&status=' + status.value
+    })
+  }else if(productType.value == '管壳'){
+    uni.navigateTo({
+      url: "/pages/business/EQF/qualityFeedback/gkQualityFeedbackEnter?id=" + id.value + '&status=' + status.value
+    })
+  }
+    
+  clearInterval(Loop.value);
+}
+
+//点击状态按钮
+function chooseStatus(item) {
+  console.log(item,"item")
+  updateStatus(item).then(
+      res => {
+        if (res.code == 200) {
+          uni.showToast({
+            title: '提交成功',
+            duration: 2000
+          });
+          setTimeout(function () {
+            uni.navigateBack({
+              success: () => {
+              }
+            })
+          }, 500);
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: 'none',
+          });
+        }
+      },
+      rej => {
+      }
+  );
+}
+
+//保留点击状态，关闭长按的冒泡
+function handleStatusTouchStart(e) {
+  // e.stopPropagation(); // 阻止冒泡
+  // e.preventDefault();  // 阻止默认行为（如滚动）
+}
+
+function handleStatusTouchEnd(e) {
+  // e.stopPropagation();
+  // e.preventDefault();
+}
+
+</script>
+
+<style scoped>
+.all-body {
+  /* #ifdef APP-PLUS */
+  top: 150rpx;
+  height: calc(100vh - 75px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  top: 120rpx;
+  height: calc(100vh);
+  /* #endif */
+}
+
+.search {
+  display: flex;
+}
+
+.search .btn-search {
+  border: none;
+  background: none;
+  line-height: normal;
+  color: #fff;
+  line-height: 56rpx !important;
+  padding: 10rpx 0 0;
+  text-align: left;
+  cursor: pointer;
+}
+
+.search .btn-search::after {
+  display: none;
+}
+
+.search .custom-search {
+  width: 80%;
+
+}
+
+.search .custom-search.uni-searchbar {
+  padding-right: 0 !important;
+}
+
+.scroll-h {
+  /* #ifdef APP-PLUS */
+  height: calc(100vh - 120px);
+  /* #endif */
+  /* #ifndef APP-PLUS */
+  height: calc(100vh - 110px);
+  /* #endif */
+}
+
+.white-bg {
+  padding-bottom: 10rpx;
+}
+
+/* 新增样式：为列表行设置flex布局 */
+.r-list {
+  display: flex;
+  justify-content: space-between;
+  padding: 10rpx 0;
+}
+
+/* 新增样式：为左侧标签设置固定宽度 */
+.r-left {
+  width: 180rpx;
+  font-weight: bold;
+}
+
+/* 新增样式：为右侧内容设置自动换行 */
+.r-right {
+  flex: 1;
+  word-break: break-all;
+  text-align: right;
+  padding-left: 40rpx;
+}
+
+/* 保持边框样式 */
+.border-bottom {
+  height: 1rpx;
+  background-color: #f0f0f0;
+  margin: 0 20rpx;
+}
+
+/* 添加悬停效果 */
+.detail-info {
+  text-align: left;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+  cursor: pointer;
+  transition: background-color 0.3s;
+  padding: 10rpx;
+  border-radius: 8rpx;
+}
+
+.detail-info:active {
+  background-color: rgba(111, 162, 248, 0.1);
+}
+</style>
--- a/src/pages/loading/loading.vue
+++ b/src/pages/loading/loading.vue
@@ -111,7 +111,7 @@ const getOSVesion = async()=>{
    versionData.value = param;
    let data = await versionCheck(param);
    newVersion.value = data.verNumber;
-    downloadURL.value = data.downloadUrl || '';
+    downloadURL.value = data.downPageUrl || '';

    // isForceUpdate 是否强制更新 1-是 2-否
    let isForceUpdate = data.isForceUpdate;
Author	SHA1	Message	Date
cui	9a384c3bb7	外反APP-必填优化	2025-10-09 09:58:25 +08:00
cui	c9a925916a	外反App-补充	2025-09-29 15:44:47 +08:00
cui	664461ef7b	外反App-补充	2025-09-29 15:44:09 +08:00
cui	c8c0f4752a	Merge branch 'develop' of http://123.57.20.168:4000/admin/ys-app into develop	2025-09-29 15:41:51 +08:00
cui	2a1ef92bd0	外反app-开发	2025-09-29 15:40:03 +08:00
wangzhuo	af25a14c17	fea: 打卡查看-支持出差打卡类型	2025-09-24 16:51:33 +08:00
wangzhuo	082d60e2da	feat: 出差打卡-简化提示	2025-09-24 16:51:33 +08:00
xuli3099	ee41790cc9	修改下载url	2025-09-22 14:05:19 +08:00
wangzhuo	f76757198c	feat: 出差打卡	2025-09-19 13:42:31 +08:00
wangzhuo	74f4712e9d	fix: 自定义弹窗组件支持内容居中	2025-09-19 13:41:02 +08:00
wangzhuo	e8dddd8dca	fix: 我的计划和计划编辑优化	2025-09-18 22:20:13 +08:00
wangzhuo	1aa1507336	fix: 计划查看模态弹窗替换为自定义的模态弹窗	2025-09-18 19:44:17 +08:00
wangzhuo	53117fc9f5	feat: 自定义模态弹窗组件（支持蒙层触摸关闭、文本换行显示）	2025-09-18 19:41:25 +08:00
wangzhuo	3e5a70f147	fix: 优化客户人员所属	2025-09-17 21:59:03 +08:00
wangzhuo	f3e20ce31a	fix: 客户人员审核	2025-09-17 21:52:58 +08:00
wangzhuo	409597fa7f	fix: 调整滚动视图高度	2025-09-17 21:49:53 +08:00
wangzhuo	1a3c014c83	fix: 主归属人变更审核	2025-09-17 21:47:23 +08:00
wangzhuo	3a1339fc76	feat: 周计划查看支持下拉刷新	2025-09-17 21:44:01 +08:00
wangzhuo	933714be60	Merge remote-tracking branch 'origin/develop' into develop	2025-09-16 18:06:13 +08:00
wangzhuo	24d35be511	fix: 主归属人变更审核	2025-09-16 18:06:00 +08:00