南骏 池
2025-03-27 635bb771a0ebc8bba6f8b35a8610f061c69e25ce
1.IPQC首检
2.iqc检验
已修改4个文件
195 ■■■■ 文件已修改
H5/IPQC_SJ/Add.aspx 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/IPQC_SJ/List.aspx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/Js/IPQC_SJ/Add.js 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/LLJ/Add.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
H5/IPQC_SJ/Add.aspx
@@ -53,7 +53,7 @@
                    <van-tag round plain v-else-if="formData.fCheckResu === '检验中'" type="warning">检验中</van-tag>
                    <van-tag round plain v-else-if="formData.fCheckResu === '未检验'" type="warning">未检验</van-tag>
                    <van-tag round plain v-else-if="formData.fCheckResu === ''" type="warning">未检验</van-tag>
                    <van-tag round plain v-else-if="formData.fCheckResu === '合格'" type="warning">合格</van-tag>
                    <van-tag round plain v-else-if="formData.fCheckResu === '合格'" type="success">合格</van-tag>
                    <van-tag round plain v-else type="danger">异常状态</van-tag>
<%--                  <van-tag  round plain
                    :type="formData.fCheckResu === '不合格' ? 'danger' : 
@@ -73,13 +73,13 @@
        <div class="content-wrapper">
            <van-cell-group >
              <!-- 自定义字段用于显示两个标识 -->
              <van-field label="标识" colon="true" readonly>
<%--              <van-field label="标识" colon="true" readonly>
                <template #input>
                  <div class="checkbox-container">
                    急料<van-checkbox v-model="formData.urgentFlag" disabled></van-checkbox>
                  </div>
                </template>
              </van-field>
              </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>--%>
@@ -87,14 +87,12 @@
              <van-field label="物料名称" colon="true" v-model="formData.itemName" readonly ></van-field>
                <van-field label="生产车间" colon="true" v-model="formData.departmentName" readonly ></van-field>
                <van-field label="生产线别" colon="true" v-model="formData.xtName" 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"
                >
                  class="wrap-field">
                  <template #input>
                    <div class="wrap-content">{{ formData.itemModel }}</div>
                  </template>
@@ -108,18 +106,6 @@
                    <van-tag type="primary" style="font-size:15px" @click="updateRemarks(formData.guid)">输入</van-tag>
                  </template>
              </van-field>
<%--            <van-field
                v-if='formData.fCheckResu == "不合格"' colon="true"
                v-model="formData.remarks"
                rows="2"
                autosize
                label="不合格描述"
                type="textarea"
                maxlength="50"
                placeholder="请输入不合格描述"
                show-word-limit
            />--%>
                            <!-- 不合格表述输入 -->
            <van-dialog v-model="showDialog" title="不合格描述" :show-cancel-button="false"  @confirm="remarksConfirm">
              <van-field
                v-model="remarks"
@@ -159,8 +145,7 @@
              <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="8">已检数/抽检数</van-col>
                      <van-col span="6">检验结果</van-col>
                  </van-row>
                  <van-row  v-for="(item,index) in tableData" :key="index"  type="flex" justify="left">
@@ -169,21 +154,17 @@
                           <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-col span="8" >
                            <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 === '合格'">
                            center v-if="item.fcheckResu === '合格'">
                            <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 === '不合格'">
                          center v-else-if="item.fcheckResu === '不合格'">
                          <van-tag round plain type="danger" style="font-size:15px" @click="togglePopup(index)">不合格</van-tag>   
                        </van-cell>
                            <van-cell center
@@ -232,8 +213,8 @@
                              
                              <van-field label="检测结果" colon="true" readonly >
                                   <template #input>
                                       <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-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>
@@ -253,7 +234,7 @@
                                      :border="false"
                                      class="si-input-field"
                                      @input="handleNumberInput3"
                                      @keyup.enter.native="getInputTZZ"
                                      @keyup.enter.native="getInputJYZ"
                                  />
                                </div>
                              </div>
@@ -283,12 +264,12 @@
                      </div>
                    </template>
                            <van-row type="flex" justify="center">
                                 <van-col span="6"></van-col>
                                 <van-col span="6">项目</van-col>
                                <van-col span="6">检验值</van-col>
                                <van-col span="6">判定标志</van-col>
                                <van-col span="6">操作</van-col>
                            </van-row>
                            <van-row  v-for="(item,index) in tableMxData.list2" :key="index"  type="flex" justify="left">
                            <van-row  v-for="(item,index) in tableMxData.list" :key="index"  type="flex" justify="left">
        
                                 <van-col span="6"  >
                                     <van-cell center
@@ -296,7 +277,7 @@
                                </van-col>
                                <van-col span="6" >
                                    <van-cell center 
                                        center :title="item.fCheckResu"></van-cell>
                                        center :title="item.fcheckResu"></van-cell>
                                </van-col>
                                <van-col center span="6" >
                                    <van-cell center
@@ -356,5 +337,5 @@
  <%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
 <script src="../Js/IPQC_SJ/Add.js?<%=12 %>"></script>
 <script src="../Js/IPQC_SJ/Add.js?<%=11111 %>"></script>
</asp:Content>
H5/IPQC_SJ/List.aspx
@@ -53,13 +53,13 @@
                               <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-field label="标识" colon="true" readonly >
<%--                                <van-field label="标识" colon="true" readonly >
                                  <template #input>
                                    <div class="checkbox-container">
                                      急料<van-checkbox v-model="item.urgentFlag" disabled></van-checkbox>
                                    </div>
                                  </template>
                                </van-field>
                                </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>
@@ -77,7 +77,7 @@
                                      <van-tag round plain v-else-if="item.fCheckResu === '检验中'" type="warning">检验中</van-tag>
                                      <van-tag round plain v-else-if="item.fCheckResu === '未检验'" type="warning">未检验</van-tag>
                                      <van-tag round plain v-else-if="item.fCheckResu === ''" type="warning">未检验</van-tag>
                                      <van-tag round plain v-else-if="item.fCheckResu === '合格'" type="warning">合格</van-tag>
                                      <van-tag round plain v-else-if="item.fCheckResu === '合格'" type="success">合格</van-tag>
                                      <van-tag round plain v-else type="danger">异常状态</van-tag>
                                  </template>
                               </van-field>
H5/Js/IPQC_SJ/Add.js
@@ -85,15 +85,17 @@
        },
        //针对没有上下限值的数据,只需选择合格或不合格.按钮触发
        handleQualified(isQualified) {
            if (isQualified) {
                console.log('合格操作');
            var input = "";
            if (isQualified) {
                // 执行合格相关逻辑
                 input = "OK-1";
                this.addJyzIpqc(input);
            } else {
                console.log('不合格操作');
                // 执行不合格相关逻辑
                 input = "NG-1";
                this.addJyzIpqc(input);
            }
        },
        togglePopup(index) {
            // 切换指定索引的 popup 状态
            var that = this;
@@ -109,14 +111,6 @@
            }, true, 1).then(function (res1) {
                if (res1.rtnCode == 1) {
                    that.tableMxData = res1.rtnData;
                    // 统计合格数和不合格数
                    const list = res1.rtnData?.list || []; // 确保 list 是数组,避免 undefined 错误
                    const okNum = list.filter(item => item.fstand === '√').length;
                    const ngNum = list.length - okNum;
                    // 将结果保存到指定变量(如 that 的成员属性)
                    that.okNum = okNum;
                    that.ngNum = ngNum;
                } else {
                    that.$toast.fail(res1.rtnMsg);
@@ -125,105 +119,34 @@
                that.$toast.fail("网络错误,请重试!");
                console.log(error);
            });
        },
        getInputOK() {
            var that = this;
            var jys = that.tableData[that.tabActive].checkQyt;//检验项目的检验数
            if (!that.okValue) {
                this.$toast.fail("OK数不能为空");
                that.isLoading = false;
                return;
            }
            if (jys < that.okValue) {
                that.$toast.fail("录入数量不能大于检验数!");
                that.okValue = null;
                //that.$refs.okValue.focus();
                return;
            }
            // 切换指定索引的 popup 状态
            var resultValue = "OK-" + this.okValue;
            this.getInput(resultValue);
            that.okValue = null;
        },
        getInputNG() {
            var that = this;
            var jys = that.tableData[that.tabActive].checkQyt;//检验项目的检验数
            if (!that.ngValue) {
                this.$toast.fail("NG数不能为空");
                that.isLoading = false;
                return;
            }
            if (jys < that.ngValue) {
                that.$toast.fail("录入数量不能大于检验数!");
                that.ngValue = null;
                //that.$refs.ngValue.focus();
                return;
            }
            // 切换指定索引的 popup 状态
            var resultValue = "NG-" + this.ngValue;
            this.getInput(resultValue);
            that.ngValue = null;
        },
        getInput(resultValue) {
            // 切换指定索引的 popup 状态
            var that = this;
            var guid1 = that.formData.guid;//主表id
            var mxguid = that.tableData[that.tabActive].guid;//检验项目的guid
            that.isLoading = true;
            console.log(that.formData);
            var input = resultValue;//拼接检验值
            that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EdtModel12', {
                inOrderGuid1: guid1,
                inOrderGuid5: mxguid,
                inP1: input,//或者0k-19,或者ng-19
            }, true, 1).then(function (res1) {
                if (res1.rtnCode == 1) {
                    that.$notify({
                        type: 'success', message: res1.rtnMsg
                    });
                    that.refreshJYItem();//刷新检验项目
                    //that.tableData = null;
                    //that.$refs.inputValue.focus();
                } else {
                    that.$toast.fail(res1.rtnMsg);
                }
                that.isLoading = false;
            }).catch(function (error) {
                that.$toast.fail("网络错误,请重试!");
                that.isLoading = false;
            });
        },
        getInputTZZ() {
        getInputJYZ() {
            // 切换指定索引的 popup 状态
            var that = this;
            if (!that.inputValue) {
                this.$toast.fail("特征值不能为空");
                this.$toast.fail("检验值不能为空");
                that.isLoading = false;
                return;
            }
            that.addJyzIpqc(that.inputValue);
        },
        addJyzIpqc(input) {
            var that = this;
            var guid1 = that.formData.guid;//主表id
            var mxguid = that.tableData[that.tabActive].guid;//检验项目的guid
            var input = that.inputValue;
            that.isLoading = true;
            that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditYangLi', {
                dt05Guid: mxguid,
                fSeq : "pda",
                fVal : input,
            that.AxiosHttp("post", 'PqcManager/AddIpqcJyz', {
                inOrderGuid1: guid1,
                inOrderGuid5: mxguid,
                inP1: input,//或者0k-19,或者ng-19,或实际检验值
            }, true, 1).then(function (res1) {
                if (res1.rtnData.outSum == 1) {
                if (res1.rtnCode > 0) {
                    that.$notify({
                        type: 'success', message: res1.rtnMsg
                    });
                    that.okValue = null;
                    that.refreshJYItem();//刷新检验项目
                    //that.handleTabClick();//刷新检验明细面板
                    //that.$refs.inputValue.focus();
@@ -361,21 +284,26 @@
        updateRemarks(guid) {
            this.showDialog= true
        },
        deleteDetail13(guid13) {
        deleteDetail13(guid12) {
            const that = this;
            var guid1 = that.formData.guid;//主表id
            var mxguid = that.tableData[that.tabActive].guid;//检验项目的guid
            // 添加确认弹窗
            that.$dialog.confirm({
                message: '确认要删除该样本值记录吗?',
                message: '确认要删除该检验值记录吗?',
                confirmButtonText: '确认',
                cancelButtonText: '取消'
            }).then(() => {  // 确认回调
                that.isLoading = true;
                that.AxiosHttp("post", 'Llj/deleteDetail13', {
                    id13: guid13
                }, true, 0).then(res1 => {
                    if (res1.status == 0) {
                        that.$notify({ type: 'success', message: '删除成功' });
                that.AxiosHttp("post", 'PqcManager/DeleteIpqcJyz', {
                    inOrderGuid1: guid1,
                    inOrderGuid5: mxguid,
                    inOrderGuid12: guid12
                }, true, 1).then(res1 => {
                    if (res1.rtnCode > 0) {
                        that.$notify({
                            type: 'success', message: res1.rtnMsg
                        });
                        that.refreshJYItem();//刷新检验项目
                    } else {
                        that.$toast.fail(res1.rtnMsg);
H5/LLJ/Add.aspx
@@ -34,7 +34,7 @@
                    <van-tag round plain v-else-if="formData.fcheckResu === '检验中'" type="warning">检验中</van-tag>
                    <van-tag round plain v-else-if="formData.fcheckResu === '未检验'" type="warning">未检验</van-tag>
                    <van-tag round plain v-else-if="formData.fcheckResu === ''" type="warning">未检验</van-tag>
                    <van-tag round plain v-else-if="formData.fcheckResu === '合格'" type="warning">合格</van-tag>
                    <van-tag round plain v-else-if="formData.fcheckResu === '合格'" type="success">合格</van-tag>
                    <van-tag round plain v-else type="danger">异常状态</van-tag>
<%--                  <van-tag  round plain
                    :type="formData.fcheckResu === '不合格' ? 'danger' : 
@@ -154,7 +154,7 @@
                        </van-col>
                      <van-col span="4" >
                            <van-cell center 
                                center :title="item.fenterQty + '/' + item.checkQyt" @click="togglePopup(index)"></van-cell>
                                center :title="item.ybslIn ?? 0 + '/' + item.ybsl" @click="togglePopup(index)"></van-cell>
                        </van-col>
                      <van-col center span="6" >
                          <van-cell center