最新代码

kyy

2 天以前 ab826d12b52265bc4f25044d43a042df2104f972

 pages/QC/XJ/List.vue

@@ -1,88 +1,107 @@
<template>
  <view>
    <!-- 刷新页面后的顶部提示框 -->
    <view class="tips" :class="{ 'tips-ani': tipShow }">刷新成功</view>
    <view class="tips" :class="{ 'tips-ani': tipShow }">
      <view class="tips-icon">✓</view>
      <view class="tips-text">刷新成功</view>
    </view>

    <view class="newsTab">
      <uni-segmented-control :current="current" :values="items" @clickItem="onClickItem" style-type="button"
                             active-color="#87cefa" ></uni-segmented-control>
      <uni-segmented-control 
        :current="current" 
        :values="items" 
        @clickItem="onClickItem" 
        style-type="button"
        active-color="#409EFF" 
        class="segmented-control fixed-tabs"
      ></uni-segmented-control>
      
      <view class="content">
        <view v-show="current===0">
          <!-- 基于 uni-list 的页面布局 -->
          <uni-list>
            <!-- to 属性携带参数跳转详情页面，当前只为参考 -->
            <uni-list-item style="margin-top: 10px;background-color:#EFEFF4;border-radius: 5px;"
                           class="list-item" direction="column" v-for="item in data" :key="item.id"
                           :to="'Add?id='+item.id+'&releaseNo='+item.releaseNo">
          <view v-if="data.length === 0" class="empty-state">
            <view class="empty-icon">📝</view>
            <view class="empty-text">暂无未提交的检验单</view>
          </view>
          
          <uni-list v-else>
            <!-- 优化后的列表项 -->
            <uni-list-item 
              style="margin-top: 15px;"
              class="list-item enhanced-list" 
              direction="column" 
              v-for="item in data" 
              :key="item.id"
              :to="'Add?id='+item.id+'&releaseNo='+item.releaseNo"
            >
              <!-- 通过header插槽定义列表的标题 -->
              <template v-slot:header>
                <view class="form-group uni-title" style="margin-bottom: 0;">
                  <label class="form-label">检验单号:</label>
                  <input class="form-input" disabled="true" type="text" v-model="item.releaseNo"/>
                <view class="card-header pending-header">
                  <view class="form-group">
                    <label class="form-label">检验单号:</label>
                    <input class="form-input order-no" disabled="true" type="text" v-model="item.releaseNo"/>
                  </view>
                </view>
              </template>
              
              <!-- 通过body插槽定义列表内容显示 -->
              <template v-slot:body>
                <view style="margin-top: 0;">
                  <view class="uni-content">
                    <view class="uni-title-sub uni-ellipsis-2">
                <view class="card-body pending-body">
                  <view class="row">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">创建时间:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.createDate"/>
                      </view>
                    </view>
                    <view class="uni-note" >
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">创建人:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.createBy"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                  </view>
                  
                  <view class="row">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">产线:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.daa020"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">物料编码:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.itemNo"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                      <view class="form-group">
                        <label class="form-label">物料名称:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.itemName"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                      <view class="form-group">
                        <label class="form-label">规格型号:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.itemModel"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                  </view>
                  
                  <!-- 产品名称单独一行 -->
                  <view class="form-group">
                    <label class="form-label">产品名称:</label>
                    <input class="form-input" disabled="true" type="text" v-model="item.itemName"/>
                  </view>
                  
                  <!-- 产品规格单独一行 -->
                  <view class="form-group">
                    <label class="form-label">产品规格:</label>
                    <input class="form-input" disabled="true" type="text" v-model="item.itemModel"/>
                  </view>
                  
                  <view class="row status-row">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label">工单数量:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.planQty"/>
                      </view>
                    </view>

                    <view class="uni-note" style="color: red">
                      <view class="form-group">
                        <label class="form-label lab">检验人:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.fcheckBy"/>
                      </view>
                    </view>
                    <view class="uni-note" style="color: red">
                      <view class="form-group">
                    <view class="col-50">
                      <view class="form-group status-group">
                        <label class="form-label lab">检测结果:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.fcheckResu"/>
                        <span class="status-tag pending-tag" :class="item.fcheckResu === '合格' ? 'success' : 'danger'">
                          {{ item.fcheckResu }}
                        </span>
                      </view>
                    </view>
                  </view>
@@ -90,89 +109,92 @@
              </template>
            </uni-list-item>
          </uni-list>
          <!-- 通过 loadMore 组件实现上拉加载效果，如需自定义显示内容，可参考：https://ext.dcloud.net.cn/plugin?id=29 -->
          <!-- <uni-load-more v-if="loading || options.status === 'noMore' " :status="options.status" /> -->

          <!-- <view class="fab" @click="handleFabClick">
            <text class="fab-icon">+</text>
          </view> -->
          <view class="plus-button" @click="handleFabClick">
            +
          </view>
        </view>
        
        <view v-show="current===1">
          <uni-list>
            <!-- to 属性携带参数跳转详情页面，当前只为参考 -->
            <uni-list-item  style="margin-top: 10px;background-color:#EFEFF4;border-radius:5px;"
                class="list-item" direction="column" v-for="item in data" :key="item.id"
                           :to="'Add?id='+item.id+'&releaseNo='+item.releaseNo">
          <view v-if="data.length === 0" class="empty-state">
            <view class="empty-icon">📁</view>
            <view class="empty-text">暂无已提交的检验单</view>
          </view>
          
          <uni-list v-else>
            <!-- 已提交列表项样式 -->
            <uni-list-item 
              style="margin-top: 15px;"
              class="list-item enhanced-list" 
              direction="column" 
              v-for="item in data" 
              :key="item.id"
              :to="'Add?id='+item.id+'&releaseNo='+item.releaseNo"
            >
              <!-- 通过header插槽定义列表的标题 -->
              <template v-slot:header>
                <view class="form-group uni-title" style="margin-bottom: 0;">
                  <label class="form-label">检验单号:</label>
                  <input class="form-input" disabled="true" type="text" v-model="item.releaseNo"/>
                <view class="card-header submitted-header">
                  <view class="form-group">
                    <label class="form-label">检验单号:</label>
                    <input class="form-input order-no" disabled="true" type="text" v-model="item.releaseNo"/>
                  </view>
                </view>
              </template>
              
              <!-- 通过body插槽定义列表内容显示 -->
              <template v-slot:body>
                <view style="margin-top: 0;">
                  <view class="uni-content">
                    <view class="uni-title-sub uni-ellipsis-2">
                <view class="card-body submitted-body">
                  <view class="row">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">创建时间:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.createDate"/>
                      </view>
                    </view>
                    <view class="uni-note" >
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">创建人:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.createBy"/>
                      </view>
                    </view>
                    <view class="uni-title-sub uni-ellipsis-2">
                  </view>
                  
                  <view class="row">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">产线:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.daa020"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label lab">物料编码:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.itemNo"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                      <view class="form-group">
                        <label class="form-label">物料名称:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.itemName"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                      <view class="form-group">
                        <label class="form-label">规格型号:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.itemModel"/>
                      </view>
                    </view>

                    <view class="uni-title-sub uni-ellipsis-2">
                  </view>
                  
                  <!-- 产品名称单独一行 -->
                  <view class="form-group">
                    <label class="form-label">产品名称:</label>
                    <input class="form-input" disabled="true" type="text" v-model="item.itemName"/>
                  </view>
                  
                  <!-- 产品规格单独一行 -->
                  <view class="form-group">
                    <label class="form-label">产品规格:</label>
                    <input class="form-input" disabled="true" type="text" v-model="item.itemModel"/>
                  </view>
                  
                  <view class="row status-row">
                    <view class="col-50">
                      <view class="form-group">
                        <label class="form-label">工单数量:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.planQty"/>
                      </view>
                    </view>
                    <view class="uni-note" style="color: red">
                      <view class="form-group">
                        <label class="form-label lab">检验人:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.fcheckBy"/>
                      </view>
                    </view>
                    <view class="uni-note" style="color: red">
                      <view class="form-group">
                    <view class="col-50">
                      <view class="form-group status-group">
                        <label class="form-label lab">检测结果:</label>
                        <input class="form-input" disabled="true" type="text" v-model="item.fcheckResu"/>
                        <span class="status-tag submitted-tag" :class="item.fcheckResu === '合格' ? 'success' : 'danger'">
                          {{ item.fcheckResu }}
                        </span>
                      </view>
                    </view>
                  </view>
@@ -182,6 +204,11 @@
          </uni-list>
        </view>
      </view>
    </view>
    
    <!-- 加载更多组件 -->
    <view v-if="loading || noData" class="load-more-container">
      <uni-load-more :status="options.status" />
    </view>
  </view>
</template>
@@ -194,36 +221,68 @@
      items: ['未提交', '已提交'],
      current: 0,
      data: [],
      tipShow: false // 是否显示顶部提示框
      tipShow: false, // 是否显示顶部提示框
      
      // 多页数据所需参数
      pageIndex: 1,
      limit: 20,
      totalPage: 0,
      totalCount: 0,
      noData: false, // 没有更多数据了
      isLoading: false, // 是否正在加载
      
      // 加载更多组件状态
      options: {
        status: 'more'
      }
    };
  },
  onLoad() {
    //页面加载时调用的事件
    // 页面加载时调用的事件
    this.init();
  },
  methods: {
    init() {

      let result = "未完成";
      if (this.current === 1) {
        result = "已完成";
      }

      //获取当前登录的用户
      let userName = this.$loginInfo.account;
		
      //页面加载时调用的事件
      // 获取当前登录的用户
      let userName = this.$loginInfo.account;
      
      // 页面加载时调用的事件
      this.$post({
        url: "/XJ/getPage",
        data: {
          pageIndex: 1,
          limit: 20,
          pageIndex: this.pageIndex,
          limit: this.limit,
          createUser: userName,
          result: result
        }
      }).then(res => {
        this.data = res.data.tbBillList;
      })
        if (this.pageIndex === 1) {
          // 如果是第一页，直接覆盖原数据
          this.data = res.data.tbBillList;
        } else {
          if (res.data.tbBillList.length > 0) {
            // 如果是下一页，追加新数据
            this.data = [...this.data, ...res.data.tbBillList];
          }
        }
        
        this.totalCount = res.data.totalCount;
        this.totalPage = Math.ceil(this.totalCount / this.limit);
        
        this.noData = this.pageIndex >= this.totalPage;
        this.isLoading = false; // 结束加载
        
        // 更新加载更多状态
        this.options.status = this.noData ? 'noMore' : 'more';
      }).catch(() => {
        this.isLoading = false; // 出现错误时结束加载
        this.options.status = 'fail';
      });
    },
    handleFabClick() {
      uni.navigateTo({
@@ -233,6 +292,8 @@
    onClickItem(index) {
      if (this.current !== index.currentIndex) {
        this.current = index.currentIndex;
        this.data = [];
        this.pageIndex = 1;
        this.init();
      }
    },
@@ -241,25 +302,31 @@
   * 下拉刷新回调函数
   */
  onPullDownRefresh() {
    //重新执行一遍查询
    // 重新执行一遍查询
    this.init();
    this.tipShow = true;
    //关闭动画
    
    // 关闭动画
    uni.stopPullDownRefresh();

    setTimeout(function () {
    
    // 正确写法（使用箭头函数保持this指向）
    setTimeout(() => {
      this.tipShow = false;
    }, 3000);
    }, 1000);
  },
  /**
   * 上拉加载回调函数
   */
  onReachBottom() {
    this.init();
    if (this.noData || this.isLoading) return;
    
    this.isLoading = true;
    this.pageIndex++;
    this.init(); // 加载更多数据
  },
  onShow() {
    //每次进入页面都会执行的方法
    this.init();
    // 每次进入页面都会执行的方法
    // this.init();
  }
};
</script>
@@ -267,76 +334,36 @@
<style lang="scss">
@import '@/common/uni-ui.scss';

.uni-note {
  margin-top: 0;
}

/* Set the input backgrounds to be gray */
.form-input {
  background-color: #f2f2f2; /* Or any other shade of gray you prefer */
}

/* Ensure automatic adaptation based on page size */
.form-group {
  display: flex;
  align-items: center;
}

.form-label {
  margin-bottom: 0;
  border-bottom: 1px solid #FFFFFF;
  padding: 5px;
  font-size: 12px;
  width: 60px;
  /* Adjust the font size as per your requirement */
}

.form-input {
  flex: 1;
  margin-bottom: 0;
  border-bottom: 1px solid #c7c7c7;
  padding: 5px;
  font-size: 12px;
  background-color: #FFFFFF;
  /* Adjust the font size as per your requirement */
}

.plus-button {
  position: fixed;
  bottom: 20px;
  right: 20px;
  width: 60px;
  height: 60px;
  border-radius: 50%;
  background-color: #007bff;
  color: #ffffff;
  text-align: center;
  line-height: 59px;
  font-size: 24px;
  cursor: pointer;
  z-index: 1000;
  margin-bottom: 35px;
}

/* 全局样式 */
page {
  display: flex;
  flex-direction: column;
  box-sizing: border-box;
  background-color: #efeff4;
  background-color: #f8f9fa;
  min-height: 100%;
  height: auto;
  padding-bottom: 80px; /* 为浮动按钮留出空间 */
}

/* 顶部提示框 */
.tips {
  color: #67c23a;
  position: fixed;
  top: 0;
  left: 0;
  right: 0;
  display: flex;
  align-items: center;
  justify-content: center;
  color: #3a86ff;
  font-size: 14px;
  line-height: 40px;
  text-align: center;
  background-color: #f0f9eb;
  background-color: #e6f7ff;
  height: 0;
  opacity: 0;
  transform: translateY(-100%);
  transition: all 0.3s;
  transition: all 0.3s ease;
  z-index: 1000;
  box-shadow: 0 2px 10px rgba(64, 158, 255, 0.2);
}

.tips-ani {
@@ -345,36 +372,259 @@
  opacity: 1;
}

.tips-icon {
  margin-right: 8px;
  font-size: 18px;
  font-weight: bold;
}

/* 固定标签页样式 */
.fixed-tabs {
  background-color: #fff;
  border-bottom: 2px solid #409EFF;
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
  position: sticky;
  top: 0;
  z-index: 999;
}

/* 分段控件按钮样式增强 */
.uni-segmented-control__button {
  font-weight: 500;
  font-size: 16px;
  color: #606266;
  transition: all 0.2s;
}

.uni-segmented-control__button--active {
  color: #409EFF;
  border-bottom: 2px solid #409EFF;
  background-color: transparent;
  font-weight: 600;
}

/* 内容区域 */
.content {
  width: 100%;
  padding: 15px;
  box-sizing: border-box;
  margin-top: 10px;
}

.list-picture {
  width: 100%;
  height: 145px;
/* 卡片样式 - 增强视觉层次 */
.card-header, .card-body {
  border-radius: 12px;
  padding: 18px;
  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.05);
  transition: all 0.3s ease;
}

.thumb-image {
  width: 100%;
  height: 100%;
}

.ellipsis {
.card-header {
  margin-bottom: 10px;
  display: flex;
  align-items: center;
}

.card-body {
  margin-bottom: 15px;
}

/* 未提交状态卡片样式 */
.pending-header {
  background: linear-gradient(145deg, #f0f9ff, #e0f2fe);
  border-left: 4px solid #409EFF;
}

.pending-body {
  background-color: #f0f9ff;
}

/* 已提交状态卡片样式 */
.submitted-header {
  background: linear-gradient(145deg, #f6f6f6, #e9e9e9);
  border-left: 4px solid #909399;
}

.submitted-body {
  background-color: #f6f6f6;
}

/* 表单样式增强 */
.form-group {
  display: flex;
  align-items: flex-start;
  margin-bottom: 18px; /* 增加间距 */
}

.form-label {
  margin-bottom: 0;
  padding: 6px 10px;
  font-size: 14px;
  width: 100px; /* 增加标签宽度 */
  color: #606266;
  flex-shrink: 0;
  font-weight: 500;
}

.form-label.lab {
  color: #303133;
  font-weight: 600;
}

.form-input {
  flex: 1;
  margin-bottom: 0;
  padding: 10px 14px; /* 增加内边距 */
  font-size: 14px; /* 增大字体 */
  background-color: rgba(255, 255, 255, 0.7);
  border: 1px solid #dcdfe6;
  border-radius: 8px; /* 增大圆角 */
  color: #303133;
  transition: all 0.2s;
  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
}

.form-input:active {
  transform: scale(0.99);
}

/* 检验单号底色 */
.order-no {
  background-color: #e6f7ff; /* 浅蓝色底色 */
  border-color: #bfdbfe;
  font-weight: 500;
}

/* 行和列布局 */
.row {
  display: flex;
  margin-bottom: 18px; /* 增加间距 */
}

.status-row {
  border-top: 1px dashed #dcdfe6;
  padding-top: 12px;
  margin-top: 12px;
}

.col-50 {
  flex: 1;
  margin-right: 18px; /* 增加间距 */
}

.col-50:last-child {
  margin-right: 0;
}

/* 状态标签增强 */
.status-group {
  align-items: center;
}

.status-tag {
  display: inline-block;
  padding: 6px 12px; /* 增加内边距 */
  font-size: 14px; /* 增大字体 */
  border-radius: 20px; /* 圆形标签 */
  margin-left: 12px; /* 增加间距 */
  font-weight: 500;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
}

.pending-tag {
  background-color: rgba(64, 158, 255, 0.1);
  color: #409EFF;
}

.submitted-tag {
  background-color: rgba(144, 147, 153, 0.1);
  color: #909399;
}

.success {
  background-color: #e6f7ed;
  color: #36b37e;
  border: 1px solid #d1fae5;
}

.danger {
  background-color: #ffefef;
  color: #ff4d4f;
  border: 1px solid #fee2e2;
}

/* 浮动按钮 */
.plus-button {
  position: fixed;
  bottom: 20px;
  right: 20px;
  width: 72px;
  height: 72px;
  border-radius: 50%;
  background: linear-gradient(135deg, #409EFF, #66B1FF);
  color: #ffffff;
  text-align: center;
  line-height: 72px;
  font-size: 32px;
  cursor: pointer;
  z-index: 1000;
  box-shadow: 0 6px 20px rgba(64, 158, 255, 0.4); /* 增强按钮阴影 */
  display: flex;
  align-items: center;
  justify-content: center;
  transition: all 0.3s ease;
}

.plus-button:active {
  transform: scale(0.95);
  box-shadow: 0 4px 15px rgba(64, 158, 255, 0.3);
}

.plus-button:hover {
  transform: scale(1.03);
}

/* 空状态 */
.empty-state {
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
  padding: 60px 0;
  color: #909399;
}

.empty-icon {
  font-size: 64px;
  margin-bottom: 24px;
  color: #c0c4cc;
}

.empty-text {
  font-size: 16px;
  font-weight: 500;
}

/* 加载更多容器 */
.load-more-container {
  padding: 30px 0;
  text-align: center;
}

/* 增强列表项动画 */
.enhanced-list {
  transition: all 0.3s ease;
  border-radius: 12px;
  overflow: hidden;
}

.uni-ellipsis-1 {
  overflow: hidden;
  white-space: nowrap;
  text-overflow: ellipsis;
.enhanced-list:active {
  transform: translateY(2px);
  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
}

.uni-ellipsis-2 {
  overflow: hidden;
  text-overflow: ellipsis;
  display: -webkit-box;
  -webkit-line-clamp: 2;
  -webkit-box-orient: vertical;
.enhanced-list:hover {
  box-shadow: 0 6px 16px rgba(0, 0, 0, 0.08);
  transform: translateY(-2px);
}
</style>