1.核对送检重置按钮开发
2.登录页面优化,保存账号信息
3.产品绑定送检重置按钮
已修改8个文件
67 ■■■■ 文件已修改
H5/Cpdbsj.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/IPQC_XJ/Add.aspx 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/IPQC_XJ/List.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/Cpbdsj.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/IPQC_XJ/Add.js 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/IPQC_XJ/List.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/UserLogin.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserLogin.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Cpdbsj.aspx
@@ -155,7 +155,7 @@
                  <van-button 
                    type="warning" 
                    class="action-button reset-button"
<%--                      @click.native="handleClear"--%>
                      @click.native="handleClear"
                  >重置</van-button>
                  <van-button 
                    type="info" 
H5/IPQC_XJ/Add.aspx
@@ -111,6 +111,7 @@
                    <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 == "N:不合格"' colon v-model="remarks" readonly class="wrap-field"> 
                  <template #input>
@@ -120,6 +121,7 @@
                    <van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">输入</van-tag>
                  </template>
              </van-field>
                <van-field label="检验工位" colon="true" v-model="jyGw" @keyup.enter.native="selIpqcItemsByGw" ></van-field>
            <van-dialog v-model="showDialog" title="不合格描述" :show-cancel-button="false"  @confirm="remarksConfirm">
              <van-field
                v-model="remarks"
@@ -158,19 +160,24 @@
          <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="8">已检数/抽检数</van-col>
                       <van-col span="8" center class="text-left padding-left">检验项目</van-col>
                      <van-col span="5">已检数/抽检数</van-col>
                      <van-col span="5">工位</van-col>
                      <van-col span="6">检验结果</van-col>
                  </van-row>
                  <van-row  v-for="(item,index) in tableData" :key="index"  type="flex" justify="left">
        
                       <van-col span="10" center class="text-left padding-left" >
                       <van-col span="8" center class="text-left padding-left" >
                           <van-cell center
                            center :title="item.fcheckItem" @click="togglePopup(index)"></van-cell>
                      </van-col>
                      <van-col span="8" >
                      <van-col span="5" >
                            <van-cell center 
                                center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
                        </van-col>
                       <van-col span="5" >
                            <van-cell center
                                center :title="item.stationName" @click="togglePopup(index)"></van-cell>
                        </van-col>
                      <van-col center span="6" >
                          <van-cell center
@@ -220,8 +227,8 @@
                              <van-field label="标准值" colon="true" v-model="jymxData.fstand" readonly ></van-field>
                              <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="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.result" readonly ></van-field>--%>
                              <%--<van-field label="结果录入" colon="true" v-model="resultValue"  placeholder="请输入OK-数字或NG-数字"></van-field>--%>
                              
@@ -351,5 +358,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/IPQC_XJ/Add.js?<%=11111111111 %>"></script>
 <script src="../Js/IPQC_XJ/Add.js?<%=111111111113 %>"></script>
</asp:Content>
H5/IPQC_XJ/List.aspx
@@ -133,5 +133,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/IPQC_XJ/List.js?<%=11 %>"></script>
 <script src="../Js/IPQC_XJ/List.js?<%=111 %>"></script>
</asp:Content>
H5/Js/Cpbdsj.js
@@ -252,7 +252,7 @@
            that.LsBar = ""; // 清空输入框
        },
        GetWeightByXt() {
        handleClear() {
            
        },
H5/Js/IPQC_XJ/Add.js
@@ -24,6 +24,7 @@
                mocode: "",
                boardStyle: ""
            },
            jyGw:"",//检验工位
            isShowTable: false,
            tableData: [],//返回的检验项目
            jymxData: [],//展示的检验项目
@@ -257,7 +258,7 @@
        //检验明细刷新
        refreshJYItem() {
            const that = this;
            return that.AxiosHttp("post", 'LLJ/getJYItem', {
            return that.AxiosHttp("post", 'Ipqc/getJYItem', {
                releaseNo: that.formData.releaseNo
            }, false).then(res1 => {
                const tableData = res1.data.tbBillList || [];
@@ -285,7 +286,7 @@
                        that.formData = data;
                        that.remarks = that.formData.fnGDesc;
                        that.lineId = data.lineId;
                        that.AxiosHttp("post", 'LLJ/getJYItem', {
                        that.AxiosHttp("post", 'Ipqc/getJYItem', {
                            //id: that.formData.guid,
                            releaseNo: that.formData.releaseNo
                        }, false).then(function (res1) {
@@ -534,5 +535,31 @@
                that.init();//刷新检验项目
            })
        },
        //检验项目扫描工位可做检验
        selIpqcItemsByGw() {
            const that = this;
            var guid1 = that.formData.guid;//主表id
            return that.AxiosHttp("post", 'Ipqc/selIpqcItemsByGw', {
                inOrderGuid1: guid1,
                userAccount: that.userInfo.loginAccount,
                gw: that.jyGw
            }, false).then(res => {
                var json = res;
                if (json.status == 0) {
                    that.init();//刷新
                }
                else {
                    that.$toast.fail(json.message);
                    that.$playSound('error');
                    that.jyGw = "";
                }
                that.isLoading = false;
            }).catch(error => {
                that.$toast.fail("网络错误,请重试!");
                console.error('Refresh error:', error);
            });
        },
    }
})
H5/Js/IPQC_XJ/List.js
@@ -43,7 +43,7 @@
        },
        onLoad() {
            this.pageIndex = 0;
            if (this.refreshing) {
                this.data = [];
                this.refreshing = false;
H5/Js/UserLogin.js
@@ -11,9 +11,10 @@
    },
    mounted() {
        var that = this;
        if (typeof (Cookies.get('phone')) == "undefined") { }
        if (typeof (Cookies.get('loginAccount')) == "undefined") {
        }
        else {
            that.phone = Cookies.get('phone');
            that.phone = Cookies.get('loginAccount');
            //that.passwd = Cookies.get('passwd');
        }
        //that.phone = "admin";
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?<%=1235 %>"></script>
    <script src="/H5/Js/UserLogin.js?<%=1237 %>"></script>
</asp:Content>