1.生产报工优化 2.PDA样式调整 3.返回按钮取消 4.检验标识样式调整

南骏 池

2025-02-19 9e346bda123bba64e6eeebe0dff503bf84658af2

1.生产报工优化
2.PDA样式调整
3.返回按钮取消
4.检验标识样式调整

 H5/BarCf.aspx

@@ -68,7 +68,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/BarCf.js?<%=121 %>"></script>

 H5/Config.aspx

@@ -22,7 +22,7 @@
    </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="Server">
   <comback ></comback>
   <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="Server">
    <script src="Js/jquery-2.1.4.min.js"></script>

 H5/Dbck.aspx

@@ -82,7 +82,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Dbck.js?<%=11211134 %>"></script>

 H5/Dbrk.aspx

@@ -82,7 +82,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Dbrk.js?<%=11211134 %>"></script>

 H5/Js/Scbg.js

@@ -80,6 +80,7 @@
            if (staf.length > 0) {
                this.stafName = staf[0].staffName;
                this.stafId = staf[0].staffNo;
                this.$refs.barcode.focus();
            } else {
                this.$toast("未找到匹配的 staffName");
            }
@@ -87,9 +88,51 @@
            //this.$toast(item.name);

        },
        getBarcode(value) {
        getStaff() {

            this.barcode = value;
            var that = this;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesStaff/GetList', {
                //name: that.userInfo.loginAccount,
            }, false)
                .then(function (res) {
                    var json = res;
                    if (json.status == 0) {
                        that.actions = json.data.tbBillList.map(item => {
                            return { name: item.staffName }
                        });

                        that.stafList = json.data.tbBillList;
                    }
                    else {
                        that.$toast.fail(json.message);
                    }
                    that.isLoading = false;
                })
                .catch(function (error) {
                    that.isLoading = false;
                    that.$toast.fail("网络错误，请重试！");
                    console.log(error);
                });
            // 默认情况下点击选项时不会自动收起
            // 可以通过 close-on-click-action 属性开启自动收起

            let staf = that.stafList.filter(it => it.staffNo === that.stafId);

            if (staf.length > 0) {
                that.stafName = staf[0].staffName;
                that.stafId = staf[0].staffNo;
                that.$refs.barcode.focus();
            } else {
                that.$toast("未找到匹配的 用户名称");
            }
            //this.GetMesItemBlDetailByBillNo();
            //this.$toast(item.name);

        },
        getBarcode() {

            //this.barcode = value;

            var that = this;
            
@@ -129,10 +172,13 @@
                        that.itemName = entity.itemName; //物料名称
                        that.itemModel = entity.itemModel; //物料型号
                        that.$notify({ type: 'success', message: '扫描成功' });
                        that.$refs.barcode.focus();
                        that.barcode = null;
                    }
                    else {
                        that.$toast.fail(json.message);
                        that.$refs.barcode.focus();
                        that.barcode = null;
                    }
                    that.isLoading = false;
                })

 H5/LLJ/Add.aspx

@@ -5,6 +5,7 @@
            .bg-info {
                background-color: #fff;
            }

            .custom-title {
                margin-right: 4px;
                vertical-align: middle;
@@ -22,8 +23,16 @@
            <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-checkbox v-model="formData.ftype" disabled>委外</van-checkbox>
                <van-checkbox v-model="formData.urgentFlag == 1" disabled>急料标识</van-checkbox>
                
              <!-- 自定义字段用于显示两个标识 -->
              <van-field label="标识" colon="true" readonly>
                <template #input>
                  <div class="checkbox-container">
                    委外<van-checkbox v-model="formData.ftype" disabled></van-checkbox>
                    急料<van-checkbox v-model="formData.urgentFlag" disabled></van-checkbox>
                  </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.itemNo" readonly ></van-field>
@@ -71,7 +80,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/LLJ/Add.js?<%=11243123 %>"></script>

 H5/LLJ/List.aspx

@@ -28,8 +28,17 @@
                             <van-cell-group>
                               <van-cell :title="item.releaseNo" is-link :url="'Add.aspx?id='+item.guid+'&lotNo='+item.lotNo+'&releaseNo='+item.releaseNo" ></van-cell>
                               <van-field label="到货单号" colon="true" v-model="item.lotNo" readonly ></van-field>
                                 <van-checkbox v-model="item.ftype" disabled>委外</van-checkbox>
                                 <van-checkbox v-model="item.urgentFlag == 1" disabled>急料标识</van-checkbox>
                                 <!-- 自定义字段用于显示两个标识 -->
                                <van-field label="标识" colon="true" readonly>
                                  <template #input>
                                    <div class="checkbox-container">
                                      委外<van-checkbox v-model="item.ftype" disabled></van-checkbox>
                                      急料<van-checkbox v-model="item.urgentFlag" disabled></van-checkbox>
                                    </div>
                                  </template>
                                </van-field>
<%--                                 <van-checkbox v-model="item.ftype" disabled>委外</van-checkbox>
                                 <van-checkbox v-model="item.urgentFlag == 1" disabled>急料标识</van-checkbox>--%>
                               <van-field label="创建时间" colon="true" v-model="item.createDate" readonly ></van-field>
                               <van-field label="创建人" colon="true" v-model="item.createBy" readonly ></van-field>
                               <van-field label="物料编码" colon="true" v-model="item.itemNo" readonly ></van-field>
@@ -79,7 +88,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/LLJ/List.js?<%=114 %>"></script>

 H5/LLJ/detail.aspx

@@ -79,7 +79,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/LLJ/detail.js?<%=114 %>"></script>

 H5/PurchaseInventory.aspx

@@ -168,7 +168,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/PurchaseInventory.js?<%=1234 %>"></script>

 H5/PurchaseReturn.aspx

@@ -175,7 +175,7 @@
    <comloading  v-if="isLoading"></comloading>


    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/PurchaseReturn.js?<%=128 %>"></script>

 H5/Qcrk.aspx

@@ -57,7 +57,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Qcrk.js?<%=121134 %>"></script>

 H5/Qtck.aspx

@@ -81,7 +81,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Qtck.js?<%=11211134 %>"></script>

 H5/Qtrk.aspx

@@ -88,7 +88,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Qtrk.js?<%=1240 %>"></script>

 H5/Scbg.aspx

@@ -18,11 +18,12 @@
        <van-cell-group>
  <van-field
    value=""
    label="员工id"
    label="员工编号"
    clearable 
     placeholder="选择"
    :right-icon-size="19"
      v-model="stafId"
      @keyup.enter.native ="getStaff"
     v-focus.noKeyboard
  ><template #button>
    <van-button size="small" type="info" plain @click="getInfo" >选择</van-button>
@@ -37,11 +38,13 @@
    readonly
></van-field>
 <van-field
     ref="barcode"
  value=""
  label="报工条码"
   clearable 
 placeholder="请扫码"
     @input="getBarcode"
     @keyup.enter.native ="getBarcode"
     <%--@input="getBarcode"--%>
  :right-icon-size="19"
     v-model="barcode"
  v-focus.noKeyboard
@@ -125,8 +128,8 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Scbg.js?<%=12325 %>"></script>
    <script src="Js/Scbg.js?<%=12327 %>"></script>
</asp:Content>

 H5/Scbl.aspx

@@ -101,7 +101,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Scbl.js?<%=12318 %>"></script>

 H5/Sccl.aspx

@@ -83,7 +83,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Sccl.js?<%=12322 %>"></script>

 H5/Scll.aspx

@@ -99,7 +99,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Scll.js?<%=123333 %>"></script>

 H5/Sctl.aspx

@@ -87,7 +87,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
   <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Sctl.js?<%=160 %>"></script>

 H5/Test.aspx

@@ -14,7 +14,7 @@

</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="Server">
   <comback ></comback>
   <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="Server">
    

 H5/Wwbl.aspx

@@ -82,7 +82,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Wwbl.js?<%=14 %>"></script>

 H5/Wwcl.aspx

@@ -83,7 +83,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Wwcl.js?<%=122 %>"></script>

 H5/Wwll.aspx

@@ -98,7 +98,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/Wwll.js?<%=12322 %>"></script>

 H5/Wwtl.aspx

@@ -81,7 +81,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
   <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="Js/Wwtl.js?<%=156 %>"></script>

 H5/cprk.aspx

@@ -82,7 +82,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
    <comback ></comback>
    <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
    <script src="Js/cprk.js?<%=1214 %>"></script>

 H5/msgDetail.aspx

@@ -34,7 +34,7 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
    <comloading  v-if="isLoading"></comloading>
  <comback ></comback>
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/msgDetail.js?<%=11114 %>"></script>

 Images/Style.css

@@ -333,4 +333,103 @@
}
.mySolid .van-row {
    border-bottom: .0267rem solid #646566;
}
}

/*2025-02-19 池南骏修改
    begin
*/
.van-cell {
    position: relative;
    display: -webkit-box;
    display: -webkit-flex;
    display: flex;
    box-sizing: border-box;
    width: 100%;
    padding: .030rem .1000rem;
    overflow: hidden;
    color: #323233;
    font-size: .3733rem;
    line-height: .64rem;
    background-color: #fff;
    align-items: center; /* 垂直居中对齐 */
}

.van-button--small {
    height: 100%;
    padding: 0 .2133rem;
    font-size: .32rem;
    align-items: center; /* 垂直居中对齐 */
}

van-field__button {
    display: flex; /* 使用 Flexbox 布局 */
    align-items: center; /* 垂直居中对齐 */
    justify-content: center; /* 水平居中对齐 */
    height: 100%; /* 按钮高度与父容器一致 */
    //min-height: 36px; /* 设置最小高度以避免过小 */
    padding: 0; /* 移除默认内边距 */
}

.van-button {
    position: relative;
    display: inline-flex; /* 使用 Flexbox 布局 */
    align-items: center; /* 垂直居中对齐 */
    justify-content: center; /* 水平居中对齐 */
    box-sizing: border-box;
    height: 100%; /* 按钮高度与父容器一致 */
    margin: 0;
    padding: 0.1rem 0.1rem; /* 内边距可以根据需要调整 */
    font-size: inherit; /* 字体大小继承自父容器 */
    line-height: normal; /* 调整行高为正常值 */
    text-align: center;
    border-radius: 0.2rem; /* 圆角半径 */
    cursor: pointer;
    transition: opacity 0.2s;
    -webkit-appearance: none;
    white-space: nowrap; /* 防止文字换行 */
    font-size: .32rem;
}

/* 按钮长度根据内容自适应 */
.van-button {
    min-width: fit-content; /* 按钮宽度根据内容自动调整 */
    padding: 0.2rem 0.4rem; /* 保留适当的内边距 */
}


/* 设置 checkbox 容器的样式 */
.checkbox-container {
    display: flex; /* 使用 Flexbox 布局 */
    justify-content: space-between; /* 左右平均分布 */
    align-items: center; /* 垂直居中对齐 */
    padding: 0 16px; /* 内边距与 van-field 保持一致 */
}

    /* 调整 checkbox 的样式 */
    .checkbox-container .van-checkbox {
        flex: 1; /* 让每个 checkbox 占据相等的空间 */
        text-align: center; /* 文本居中显示 */
    }

.van-checkbox__icon--checked .van-icon {
    color: blue !important; /* 勾选框的颜色设置为蓝色 */
}

/* 保持字体颜色不变 */
.van-checkbox__label {
    color: inherit !important; /* 字体颜色继承父级样式 */
}

/* 确保禁用状态下勾选框仍然显示为蓝色 */
.van-checkbox--disabled .van-checkbox__icon .van-icon {
    background-color: transparent !important; /* 移除禁用状态下的灰色背景 */
    border-color: blue !important; /* 设置禁用状态下的边框颜色为蓝色 */
}

.van-tabs--line .van-tabs__wrap {
    height: 0.8rem;
}

/* 2025-02-19 池南骏修改
    end
*/

 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?<%=1 %>" rel="stylesheet" />
    <link href="/Images/Style.css?<%=14 %>" rel="stylesheet" />
    <script src="/Scripts/uni.webview.1.5.2.js"></script>
    <asp:ContentPlaceHolder ID="head" runat="server">
    </asp:ContentPlaceHolder>