Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaClient

cnf

2025-08-01 30f3dcaf21de21c5ff4ebe5cbcf62d3a323dc422

Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_PdaClient

 H5/Default.aspx

@@ -28,6 +28,7 @@
           </template>
      </van-tab>
</van-tabs>
     <div style="height:100px;">&nbsp;</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" runat="Server">
     <webnav :active="0"></webnav>

 H5/Js/LLJ/Add.js

@@ -40,6 +40,8 @@
            okValue: '',//OK-数量
            ngValue: '',//NG-数量
            showDialog: false,//不良表述输入框
            ybsDialog: false,//样本值输入框
            ybsValue: '',//样本数量
            //图片上传框
            fileList: [
                //{
@@ -82,6 +84,11 @@
            this.inputValue = value.replace(/[^\d.]/g, '')  // 1. 去除非数字和小数点
                .replace(/(\..*)\./g, '$1')               // 2. 禁止多个小数点
                .replace(/^\./g, '');    
        },
        handleNumberInput4(value) {
            // 去除非数字并确保首位不为0（除非是单独的0）
            this.jymxData.ybsl = value.replace(/[^\d]/g, '') // 去除非数字字符
                .replace(/^0+(?!$)/, ''); // 去除开头的0，除非整个字符串是0
        },

        togglePopup(index) {
@@ -299,8 +306,7 @@
            var that = this;
            that.ttrre = true;
            that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditModelSubmit', {
                guid: that.formData.guid,
                userGuid: this.GetLoginInfor().loginGuid // 新增参数：用户唯一标识
                guid: that.formData.guid
            }, true, 1).then(function (res1) {
                if (res1.rtnData.outSum == 1) {
                    that.$notify({ type: 'success', message: '提交成功' });
@@ -352,6 +358,40 @@
        updateRemarks(guid) {
            this.showDialog= true
        },
        EditYangLi(GUID) {
            // 切换指定索引的 popup 状态
            var that = this;

            if (!that.jymxData.ybsl) {
                this.$toast.fail("样本数不能为空");
                that.isLoading = false;
                return;
            }

            var mxguid = that.tableData[that.tabActive].guid;//检验项目的guid
            var input = that.jymxData.ybsl;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditYangLi', {
                dt05Guid: mxguid,
                fSeq: "样本数",
                fVal: input,
            }, true, 1).then(function (res1) {
                if (res1.rtnData.outSum == 1) {
                    that.$notify({
                        type: 'success', message: res1.rtnMsg
                    });
                    that.okValue = null;
                    that.refreshJYItem();//刷新检验项目
                } else {
                    that.$toast.fail(res1.rtnMsg);
                }
                that.isLoading = false;
            }).catch(function (error) {
                that.$toast.fail("网络错误，请重试！");
                that.isLoading = false;
            });
        },

        deleteDetail13(guid13) {
            const that = this;
            

 H5/Js/UserLogin.js

@@ -11,13 +11,13 @@
    },
    mounted() {
        var that = this;
        if (typeof (Cookies.get('phone')) == "undefined") { }
        if (typeof (Cookies.get('loginAccount')) == "undefined") { }
        else {
            that.phone = Cookies.get('phone');
            that.passwd = Cookies.get('passwd');
            that.phone = Cookies.get('loginAccount');
          //  that.passwd = Cookies.get('passwd');
        }
        that.phone = "admin";
        that.passwd = "123456";
       // that.phone = "admin";
      //  that.passwd = "123456";
    },
    methods: {
        onSubmit(name) {

 H5/LLJ/Add.aspx

@@ -83,7 +83,7 @@
                  </template>
                </van-field>
              <van-field label="数量" colon="true" v-model="formData.fcovertQty" readonly ></van-field>
              <van-field label="不合格描述"   v-if='formData.fcheckResu == "N:不合格"' colon v-model="remarks" readonly class="wrap-field"> 
              <van-field label="异常描述"   v-if='formData.fcheckResu == "N:不合格"' colon v-model="remarks" readonly class="wrap-field"> 
                  <template #input>
                      <div class="wrap-content">{{ remarks }}</div>
                    </template>
@@ -103,7 +103,7 @@
                show-word-limit
            />--%>
                            <!-- 不合格表述输入 -->
            <van-dialog v-model="showDialog" title="不合格描述" :show-cancel-button="false"  @confirm="remarksConfirm">
            <van-dialog v-model="showDialog" title="异常描述" :show-cancel-button="false"  @confirm="remarksConfirm">
              <van-field
                v-model="remarks"
                rows="5"
@@ -154,7 +154,7 @@
                        </van-col>
                      <van-col span="4" >
                            <van-cell center 
                                center :title="item.ybslIn ?? 0 + '/' + item.ybsl" @click="togglePopup(index)"></van-cell>
                                center :title="item.ybslIn + '/' + item.ybsl" @click="togglePopup(index)"></van-cell>
                        </van-col>
                      <van-col center span="6" >
                          <van-cell center
@@ -193,7 +193,7 @@
          <div  class="content-wrapper-jymx">
            <van-tabs v-model="tabActive" sticky color="#000" round  ellipsis="false"  @click="handleTabClick">
                <van-tab v-for="(itm,index) in tableData" round  :key="index" :name="index" >
                    <template #title > {{itm.fcheckItem}} <van-icon v-if="itm.fenterQty >=itm.checkQyt" name="success" color="#1989fa" class="badge-icon" ></van-icon></template>
                    <template #title > {{itm.fcheckItem}} <van-icon v-if="parseFloat(itm.fenterQty) >= parseFloat(itm.checkQyt) && parseFloat(itm.ybslIn) >= parseFloat(itm.ybsl)" name="success" color="#1989fa" class="badge-icon" ></van-icon></template>
                    <template>
                          <van-cell-group>
                              <van-field label="项目名称" colon="true" v-model="jymxData.fcheckItem" readonly ></van-field>
@@ -205,7 +205,11 @@
                              <van-field label="上限" colon="true" v-model="jymxData.fupAllow" readonly ></van-field>
                              <%--<van-field label="AC数" colon="true" v-model="jymxData.facQty" readonly ></van-field>--%>
                              <van-field label="RE数" colon="true" v-model="jymxData.freQty" readonly ></van-field>
                              <van-field label="样本数" colon="true" v-model="jymxData.ybsl" readonly ></van-field>
                              <van-field label="样本数" colon="true" v-model="jymxData.ybsl" @input="handleNumberInput4" >
                                  <template #button>
                                    <van-tag type="primary" style="font-size:15px" @click="EditYangLi(jymxData.guid)">修改</van-tag>
                                  </template>
                              </van-field>
                              <%--<van-field label="预览结果" colon="true" v-model="jymxData.result" readonly ></van-field>--%>
                              <%--<van-field label="结果录入" colon="true" v-model="resultValue"  placeholder="请输入OK-数字或NG-数字"></van-field>--%>
                              
@@ -384,5 +388,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/LLJ/Add.js?<%=119997112 %>"></script>
 <script src="../Js/LLJ/Add.js?<%=119997118%>"></script>
</asp:Content>

 H5/PurchaseInventory.aspx

@@ -4,7 +4,6 @@
    .bg-info {
        background-color:#fff;
    }
      
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
@@ -39,25 +38,12 @@
      @keyup.enter.native="getModel"
    <%--@change="getModel" --%>
      autofocus="true"
  ></van-field>
   <van-field
  v-model="depotData.depotName"
  label="仓库名称"
  placeholder=""
  disabled
></van-field>
     <van-field
  v-model="depotData.depotCode"
  label="仓库编码"
  placeholder=""
  disabled
></van-field>
 <van-field
   ref="barcode"
   v-model="formData.barcode"
  label="物料条码"
   clearable 
 placeholder="请扫码"
  >
  </van-field>

 <%--  <van-field  v-model="depotData.depotName"  label="仓库名称"  placeholder=""  disabled ></van-field>
   <van-field  v-model="depotData.depotCode"  label="仓库编码" placeholder="" disabled></van-field>--%>
 <van-field ref="barcode" v-model="formData.barcode" label="物料条码"clearable  placeholder="请扫码"
  :right-icon-size="19"
  v-focus.noKeyboard
     @keyup.enter.native="getScan"

 Mst.master

@@ -11,7 +11,7 @@
    <script src="/Scripts/vue.min.js"></script>
    <script src="/Scripts/js.cookie.min.js"></script>
    <script src="/scripts/axios0.25.0.js"></script>
    <script src="/scripts/config.js?<%=123611121 %>"></script>
    <script src="/scripts/config.js?<%=123611124 %>"></script>
    <link href="/scripts/vant/vant.css" rel="stylesheet" />
    <script src="/scripts/vant/vant.js"></script>
    <link href="/Images/Style.css?<%=169950 %>" rel="stylesheet" />

 Scripts/config.js

@@ -1,7 +1,7 @@
/*var APIURL = "http://192.168.1.187:8083/api/";*///后端发布测试地址
var APIURL = "http://localhost:5204/api/";
/*var APIURL_PC = "http://192.168.1.187:81/";*/ //PC后端的地址
var APIURL_PC = "http://192.168.1.187:8081/";//
var APIURL_PC = "http://116.148.211.203:8081/";//
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {

 UserLogin.aspx

@@ -54,5 +54,5 @@
  <comloading  v-if="isLoading"></comloading>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" runat="Server">
    <script src="/H5/Js/UserLogin.js?<%=1234 %>"></script>
    <script src="/H5/Js/UserLogin.js?<%=1236 %>"></script>
</asp:Content>