From 635bb771a0ebc8bba6f8b35a8610f061c69e25ce Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 27 三月 2025 11:28:16 +0800
Subject: [PATCH] 1.IPQC首检 2.iqc检验
---
H5/IPQC_SJ/List.aspx | 6
H5/IPQC_SJ/Add.aspx | 49 +++--------
H5/Js/IPQC_SJ/Add.js | 136 ++++++++--------------------------
H5/LLJ/Add.aspx | 4
4 files changed, 52 insertions(+), 143 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index 818c573..9412466 100644
--- a/H5/IPQC_SJ/Add.aspx
+++ b/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>
diff --git a/H5/IPQC_SJ/List.aspx b/H5/IPQC_SJ/List.aspx
index 50049e3..d9e77bd 100644
--- a/H5/IPQC_SJ/List.aspx
+++ b/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>
diff --git a/H5/Js/IPQC_SJ/Add.js b/H5/Js/IPQC_SJ/Add.js
index faa203f..a3b84e0 100644
--- a/H5/Js/IPQC_SJ/Add.js
+++ b/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,鎴栬�卬g-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,鎴栬�卬g-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);
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index bbdb51a..d39512d 100644
--- a/H5/LLJ/Add.aspx
+++ b/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
--
Gitblit v1.9.3