南骏 池
2025-03-19 564905ed2b4d1b977071f459ea1d7ab575051f9c
1.明细界面进一步调整。
已修改5个文件
238 ■■■■ 文件已修改
H5/Js/LLJ/Add.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/LLJ/Add.aspx 203 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/LLJ/List.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Images/Style.css 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Mst.master 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/LLJ/Add.js
@@ -34,6 +34,7 @@
            tabActive: 0,
            inputValue: '',//特征值输入
            resultValue: '',//检验结果录入
            showButton: false,//右上角菜单触发
        }
    },
    mounted() {
@@ -80,8 +81,10 @@
        },
        init() {
            //alert(this.Request("id"));
            var that = this;
            that.showButton = false;
            that.AxiosHttp("post", 'LLJ/getPage', {
                id: that.Request("id"),
                pageIndex: 1,
@@ -188,6 +191,9 @@
        },
        GetBack1() {
            window.history.back();
        }
        },
        onClickRight() {
        },
    }
})
H5/LLJ/Add.aspx
@@ -29,8 +29,6 @@
                text-align: center;
            }
            .si-container {
                padding: 0.16rem;
            }
@@ -138,6 +136,16 @@
                color: #1890ff;
            }
            .si-status__label{
                 color: #ffffff;
            }
            .si-status__right{
                justify-content: center; /* 新增居中 */
                background: #e3edf7;
                padding-right: 0.16rem;
            }
            /* Vant输入框深度定制 */
            :deep(.si-input-field .van-field__control) {
                height: 0.6rem !important;
@@ -146,43 +154,84 @@
                color: #333;
            }
/*            .van-dropdown-menu__bar {
                position: relative;
                display: -webkit-box;
                display: -webkit-flex;
                display: flex;
                height:  0.23rem;
                background-color: #fff;
                box-shadow: 0 .0533rem .32rem rgba(100, 101, 102, .12);
            }
            .van-dropdown-menu__title {
                position: relative;
                box-sizing: border-box;
                max-width: 100%;
                padding: 0 .2133rem;
                color: #323233;
                font-size: .20rem;
                line-height: .23rem;
            }
*/
            .van-icon-popup {
                font-size: 0.5rem;
            }
            .inline-title {
              display: flex;
              align-items: center;
              gap: 8px; /* 间距控制 */
              max-width: 80vw;
            }
            .release-no {
              overflow: hidden;
              text-overflow: ellipsis;
              white-space: nowrap;
            }
            .status-tag {
              flex-shrink: 0; /* 防止被压缩 */
              font-size: 12px;
              padding: 2px 6px;
            }
            /* 覆盖导航栏默认样式 */
            :deep(.van-nav-bar__title) {
              max-width: none !important;
            }
            /* 深度覆盖vant样式,换行 */
            :deep(.wrap-field .van-field__control) {
              white-space: pre-wrap !important;
              word-break: break-all !important;
              line-height: 1.5;
              min-height: 24px; /* 最小高度保障 */
              padding: 4px 0; /* 增加垂直间距 */
            }
            /* 专用内容容器,换行 */
            .wrap-content {
              width: 100%;
              display: block;
            }
        </style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
        <van-nav-bar
          title="来料检验明细"
<%--        <van-nav-bar
          :title=formData.releaseNo
          left-text="返回"
          left-arrow
          @click-left="GetBack1()"
        ></van-nav-bar>
        ></van-nav-bar>--%>
            <van-nav-bar
              left-text="返回"
              left-arrow
              @click-left="GetBack1"
              @click-right="showButton = true"
            >
              <template #title>
                <div class="inline-title">
                  <span class="release-no">{{ formData.releaseNo }}</span>
                  <van-tag  round plain
                    :type="formData.fcheckResu === '不合格' ? 'danger' :
                          formData.fcheckResu === '检验中' ? 'warning' : 'success'"
                    class="status-tag"
                  >
                    {{ formData.fcheckResu || '合格' }}
                  </van-tag>
                </div>
              </template>
                <template #right>
                    <van-icon name="ellipsis" />
                  </template>
            </van-nav-bar>
        <div class="content-wrapper">
            <van-cell-group >
              <van-field label="检验单号" colon="true" v-model="formData.releaseNo" readonly ></van-field>
              <van-field label="到货单号" colon="true" v-model="formData.lotNo" readonly ></van-field>
<%--              <van-field label="检验单号" colon="true" v-model="formData.releaseNo" readonly ></van-field>--%>
                
              <!-- 自定义字段用于显示两个标识 -->
              <van-field label="标识" colon="true" readonly>
@@ -193,26 +242,46 @@
                  </div>
                </template>
              </van-field>
              <van-field label="创建时间" colon="true" v-model="formData.createDate" readonly ></van-field>
              <van-field label="创建人" colon="true" v-model="formData.createBy" readonly ></van-field>
              <van-field label="到货单号" colon="true" v-model="formData.lotNo" readonly ></van-field>
<%--              <van-field label="创建时间" colon="true" v-model="formData.createDate" readonly ></van-field>
              <van-field label="创建人" colon="true" v-model="formData.createBy" readonly ></van-field>--%>
              <van-field label="物料编码" colon="true" v-model="formData.itemNo" readonly ></van-field>
              <van-field label="物料名称" colon="true" v-model="formData.itemName" readonly ></van-field>
              <van-field label="规格型号" colon="true" v-model="formData.itemModel" readonly ></van-field>
              <%--<van-field label="规格型号" colon="true" v-model="formData.itemModel" readonly ></van-field>--%>
                <van-field
                  label="规格型号"
                  colon
                  v-model="formData.itemModel"
                  readonly
                  class="wrap-field"
                >
                  <template #input>
                    <div class="wrap-content">{{ formData.itemModel }}</div>
                  </template>
                </van-field>
              <van-field label="数量" colon="true" v-model="formData.fcovertQty" readonly ></van-field>
              <van-field label="不合格描述" v-if='formData.fcheckResu == "不合格"' colon="true" v-model="formData.remarks" ></van-field>
              <van-field label="检测结果" colon="true" v-model="formData.fcheckResu" readonly ></van-field>
<%--              <van-field label="检测结果" colon="true" v-model="formData.fcheckResu" readonly ></van-field>--%>
<%--                <van-field label="检测结果" colon="true" readonly >
                   <template #input>
                       <van-tag round v-if="formData.fcheckResu === '不合格'" type="danger">不合格</van-tag>
                       <van-tag round v-else-if="formData.fcheckResu === '检验中'" type="warning">检验中</van-tag>
                       <van-tag round v-else type="success">合格</van-tag>
                   </template>
                </van-field>--%>
            </van-cell-group>
        </div>
<%--            <van-button :loading="ttrre" type="info" loading-text="加载中..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">检验提交</van-button>
            <van-button type="danger" v-if="!isShowTable && formData.fsubmit == 0" @click="removeXJ">重新加载项目</van-button>--%>
            <van-button :loading="ttrre" type="info" loading-text="加载中..."  @click="submit">检验提交</van-button>
            <van-button type="danger"  @click="removeXJ">重新加载项目</van-button>
          <van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
<%--            <van-button :loading="ttrre"  type="info" loading-text="加载中..."  @click="submit">检验提交</van-button>
            <van-button type="danger"  @click="removeXJ">刷新重做</van-button>--%>
          <van-tabs color="#000"  title-active-color="#0283EF" style="padding-bottom: 120px;">
              <van-tab title="检验项目" class="mySolid font">
                  <van-row type="flex" justify="center">
                       <van-col span="10" center class="text-left padding-left">检验项目</van-col>
                      <van-col span="4">已检数/抽检数</van-col>
                      <van-col span="4">特征值</van-col>
                      <van-col span="6">检验结果</van-col>
                      <van-col span="8">已检/待检</van-col>
                  </van-row>
                  <van-row  v-for="(item,index) in tableData" :key="index"  type="flex" justify="left">
        
@@ -220,25 +289,29 @@
                           <van-cell center
                            center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
                      </van-col>
                      <van-col span="4" >
                            <van-cell center
                                center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
                        </van-col>
                      <van-col span="4" >
                            <van-cell center
                                center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
                        </van-col>
                      <van-col center span="6" >
                          <van-cell center
                            center v-if="item.fcheckResu === '合格'">
                            <van-tag type="success" style="font-size:15px">合格</van-tag>
                            <van-tag round  plain type="success" style="font-size:15px" @click="togglePopup(index)">合格</van-tag>
                          </van-cell>
                          <van-cell center
                          center v-else-if="item.fcheckResu === '不合格'">
                          <van-tag type="danger" style="font-size:15px">不合格</van-tag>
                          <van-tag round plain type="danger" style="font-size:15px" @click="togglePopup(index)">不合格</van-tag>
                        </van-cell>
                            <van-cell center
                              center v-else >
                              <van-tag type="warning" style="font-size:15px">未完成</van-tag>
                              <van-tag round plain type="warning" style="font-size:15px" @click="togglePopup(index)">检验中</van-tag>
                            </van-cell>
                      </van-col>
                      <van-col span="8" >
                          <van-cell center
                              center :title="item.checkQyt + '/' + item.fenterQty"></van-cell>
                      </van-col>
                </van-row>
              </van-tab>
           </van-tabs>
@@ -276,9 +349,9 @@
                              <van-field label="结果录入" colon="true" v-model="resultValue"  placeholder="请输入OK-数字或NG-数字"></van-field>
                              <van-field label="检测结果" colon="true" readonly >
                                   <template #input>
                                       <van-tag v-if="jymxData.fcheckResu === '合格'" type="success">合格</van-tag>
                                       <van-tag v-else-if="jymxData.fcheckResu === '不合格'" type="danger">不合格</van-tag>
                                       <van-tag v-else type="warning">未完成</van-tag>
                                       <van-tag round plain v-if="jymxData.fcheckResu === '合格'" type="success">合格</van-tag>
                                       <van-tag round plain v-else-if="jymxData.fcheckResu === '不合格'" type="danger">不合格</van-tag>
                                       <van-tag round plain v-else type="warning">检验中</van-tag>
                                   </template>
                                </van-field>
                            </van-cell-group>
@@ -292,7 +365,7 @@
                            <div class="si-status__left">
                              <span class="si-status__label">合格数</span>
                            </div>
                            <div class="si-status__right">256</div>
                            <div  class="si-status__right">256</div>
                          </div>
                          <div class="si-status-box si-status--error">
@@ -338,15 +411,15 @@
                                <van-col center span="8" >
                                    <van-cell center
                                      center v-if="item.fstand === '√'">
                                      <van-tag type="success" style="font-size:15px">合格</van-tag>
                                      <van-tag round plain type="success" style="font-size:15px">合格</van-tag>
                                    </van-cell>
                                    <van-cell center
                                    center v-else-if="item.fstand === '×'">
                                    <van-tag type="danger" style="font-size:15px">不合格</van-tag>
                                    <van-tag round plain type="danger" style="font-size:15px">不合格</van-tag>
                                  </van-cell>
                                      <van-cell center
                                        center v-else >
                                        <van-tag type="warning" style="font-size:15px">未完成</van-tag>
                                        <van-tag round plain type="warning" style="font-size:15px">检验中</van-tag>
                                      </van-cell>
                                </van-col>
                          </van-row>
@@ -355,11 +428,37 @@
            </van-tabs>
          </div>
        </van-popup>
        <!-- 弹出菜单 -->
          <van-popup
            v-model="showButton"
            position="bottom"
            :style="{ width: '100%' }"
          >
            <div style="padding: 12px;">
              <van-button
                block
                type="info"
                @click="submit"
                :loading="ttrre"
                loading-text="加载中..."
              >检验提交</van-button>
              <van-button
                block
                type="danger"
                @click="removeXJ"
                style="margin-top: 8px;"
              >刷新重做</van-button>
            </div>
          </van-popup>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/LLJ/Add.js?<%=118 %>"></script>
 <script src="../Js/LLJ/Add.js?<%=1191 %>"></script>
</asp:Content>
H5/LLJ/List.aspx
@@ -70,9 +70,9 @@
                               
                               <van-field label="检测结果" colon="true" readonly >
                                  <template #input>
                                      <van-tag v-if="item.fcheckResu === '不合格'" type="danger">不合格</van-tag>
                                      <van-tag v-else-if="item.fcheckResu === '检验中'" type="warning">检验中</van-tag>
                                      <van-tag v-else type="success">合格</van-tag>
                                      <van-tag round plain v-if="item.fcheckResu === '不合格'" type="danger">不合格</van-tag>
                                      <van-tag round plain v-else-if="item.fcheckResu === '检验中'" type="warning">检验中</van-tag>
                                      <van-tag round plain v-else type="success">合格</van-tag>
                                  </template>
                               </van-field>
                             </van-cell-group>
Images/Style.css
@@ -359,7 +359,7 @@
}
/* 当屏幕宽度小于或等于600px时应用的样式 */
@media (max-width: 300px) {
@media (max-width: 500px) {
    .van-cell {
        font-size: .33rem; /* 更小的字体大小 */
        line-height: .50rem;
@@ -368,7 +368,7 @@
}
/* 当屏幕宽度大于600px且小于或等于1024px时应用的样式 */
@media (min-width: 300px) and (max-width: 1600px) {
@media (min-width: 500px) and (max-width: 1600px) {
    .van-cell {
        font-size: .20rem; /* 中等字体大小 */
        line-height: .23rem;
@@ -467,7 +467,7 @@
/* 确保禁用状态下勾选框仍然显示为蓝色 */
.van-checkbox--disabled .van-checkbox__icon .van-icon {
    background-color: transparent !important; /* 移除禁用状态下的灰色背景 */
    border-color: #1989fa !important; /* 设置禁用状态下的边框颜色为蓝色 */
    /*border-color: #1989fa !important;*/ /* 设置禁用状态下的边框颜色为蓝色 */
    
}
@@ -500,7 +500,7 @@
    margin: 0 auto;
    color: #323233;
    font-weight: 500;
    font-size: .33rem;
    font-size: .25rem;
    font-weight: bold; /* 字体加粗 */
}
@@ -537,6 +537,13 @@
/* 检验明细页输入框界面样式 */
.van-tag {
    font-size: .25rem;
    line-height: .40rem
}
    /* 检验明细页输入框界面样式 */
/* 检验明细页输入框界面样式 */
/*全局按钮缩小*/
.van-nav-bar__left, .van-nav-bar__right {
    font-size: .25rem;
}
Mst.master
@@ -14,7 +14,7 @@
    <script src="/scripts/config.js?<%=1234 %>"></script>
    <link href="/scripts/vant/vant.css" rel="stylesheet" />
    <script src="/scripts/vant/vant.js"></script>
    <link href="/Images/Style.css?<%=1694 %>" rel="stylesheet" />
    <link href="/Images/Style.css?<%=1697 %>" rel="stylesheet" />
    <script src="/Scripts/uni.webview.1.5.2.js"></script>
    <asp:ContentPlaceHolder ID="head" runat="server">
    </asp:ContentPlaceHolder>