From 03ff743705dd64f67e6e4aabd03ec5591b922ff9 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 09 六月 2025 12:28:50 +0800
Subject: [PATCH] 1.生产补料/超领优化 2.委外补料/超领优化 3.巡检检验新增工单查询选择 4.巡检优化新增时间段字段
---
H5/Js/Scbl.js | 2
H5/Wwbl.aspx | 2
Scripts/config.js | 3
H5/LLJ/List.aspx | 2
H5/IPQC_SJ/List.aspx | 2
H5/IPQC_SJ/Add.aspx | 2
H5/IPQC_XJ/List.aspx | 5 +
H5/Xctl.aspx | 2
H5/Js/Wwbl.js | 4
H5/IPQC_XJ/Add.aspx | 18 +++++
H5/Js/IPQC_XJ/Add.js | 82 +++++++++++++++++++++++++++
H5/LLJ/Add.aspx | 2
12 files changed, 111 insertions(+), 15 deletions(-)
diff --git a/H5/IPQC_SJ/Add.aspx b/H5/IPQC_SJ/Add.aspx
index 746911a..6603364 100644
--- a/H5/IPQC_SJ/Add.aspx
+++ b/H5/IPQC_SJ/Add.aspx
@@ -185,7 +185,7 @@
<%-- <van-tag round plain v-else-if="formData.fCheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>--%>
<van-tag round plain v-else-if="formData.fCheckResu === 'I:杩涜涓�'" type="warning">杩涜涓�</van-tag>
<van-tag round plain v-else-if="formData.fCheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
<%-- <van-tag round plain
:type="formData.fCheckResu === '涓嶅悎鏍�' ? 'danger' :
formData.fCheckResu === '妫�楠屼腑' ? 'warning' :
diff --git a/H5/IPQC_SJ/List.aspx b/H5/IPQC_SJ/List.aspx
index 6087847..e137cd8 100644
--- a/H5/IPQC_SJ/List.aspx
+++ b/H5/IPQC_SJ/List.aspx
@@ -78,7 +78,7 @@
<van-tag round plain v-else-if="item.fCheckResu === 'W:鏈煡'" 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 === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
</template>
</van-field>
</van-cell-group>
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index d3abb8b..86cf8ec 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -54,7 +54,7 @@
<%-- <van-tag round plain v-else-if="formData.fCheckResu === '鏈楠�'" type="warning">鏈楠�</van-tag>--%>
<van-tag round plain v-else-if="formData.fCheckResu === 'I:杩涜涓�'" type="warning">杩涜涓�</van-tag>
<van-tag round plain v-else-if="formData.fCheckResu === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
<%-- <van-tag round plain
:type="formData.fCheckResu === '涓嶅悎鏍�' ? 'danger' :
formData.fCheckResu === '妫�楠屼腑' ? 'warning' :
@@ -80,7 +80,21 @@
</div>
</template>
</van-field>--%>
+ <van-field
+ ref ="selectKey"
+ value=""
+ label="宸ュ崟鏌ヨ"
+ clearable
+ placeholder="璇疯緭鍏ュ伐鍗曞彿杩涜鏌ヨ"
+ :right-icon-size="19"
+ v-model="selectKey"
+ ><template #button>
+ <van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
+ </template></van-field>
+ <van-action-sheet v-model="daashow" :actions="actions" @select="onSelect" ></van-action-sheet>
+
<van-field label="鎸囦护宸ュ崟" colon="true" v-model="formData.lotNo" @keyup.enter.native="createByWomdaa" ></van-field>
+ <van-field label="妫�楠屾椂娈�" colon="true" v-model="formData.checkTimeSlot" 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>--%>
<van-field label="鐗╂枡缂栫爜" colon="true" v-model="formData.itemNo" readonly ></van-field>
@@ -337,5 +351,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/IPQC_XJ/Add.js?<%=11111111 %>"></script>
+ <script src="../Js/IPQC_XJ/Add.js?<%=11111111111 %>"></script>
</asp:Content>
diff --git a/H5/IPQC_XJ/List.aspx b/H5/IPQC_XJ/List.aspx
index 3b175d6..9775353 100644
--- a/H5/IPQC_XJ/List.aspx
+++ b/H5/IPQC_XJ/List.aspx
@@ -51,7 +51,8 @@
<div>
<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-field label="妫�楠屾椂娈�" colon="true" v-model="item.checkTimeSlot" readonly ></van-field>
+ <van-field label="鎸囦护宸ュ崟" colon="true" v-model="item.lotNo" readonly ></van-field>
<!-- 鑷畾涔夊瓧娈电敤浜庢樉绀轰袱涓爣璇� -->
<%-- <van-field label="鏍囪瘑" colon="true" readonly >
<template #input>
@@ -78,7 +79,7 @@
<van-tag round plain v-else-if="item.fCheckResu === 'W:鏈煡'" 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 === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
</template>
</van-field>
</van-cell-group>
diff --git a/H5/Js/IPQC_XJ/Add.js b/H5/Js/IPQC_XJ/Add.js
index 757de69..5351162 100644
--- a/H5/Js/IPQC_XJ/Add.js
+++ b/H5/Js/IPQC_XJ/Add.js
@@ -40,6 +40,10 @@
okValue: '',//OK-鏁伴噺
ngValue: '',//NG-鏁伴噺
showDialog: false,//涓嶈壇琛ㄨ堪杈撳叆妗�
+ selectKey: "",//鏌ヨ鍏抽敭瀛�
+ actions: [],//鍒楄〃鐨勫��
+ daashow: false,//宸ュ崟鍒楄〃灞曠ず
+ lineId:[],
//鍥剧墖涓婁紶妗�
fileList: [
@@ -111,6 +115,70 @@
console.log(error);
});
},
+
+ getInfo() {
+ this.daashow = true;
+ var that = this;
+ that.actions = [];
+ that.isLoading = true;
+ console.log(that.lineId);
+
+ that.AxiosHttp("post", 'Ipqc/GetIpqcXjDaa', {
+ selectKey: that.selectKey,
+ xt: that.lineId,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ if (json.data.tbBillList.length <= 0) {
+ that.$toast.fail("娌℃湁鍙敤鐨勬暟鎹�");
+ that.$playSound('error');
+ } else {
+ that.itemInfo = json.data.tbBillList;
+ that.actions = json.data.tbBillList.map(item => {
+ return {
+ name: item.daaInfo // 鎷兼帴瀛楁
+
+ };
+ });
+ }
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+
+ onSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.daashow = false;
+ console.log(item);
+ // 姝ｅ垯鍖归厤绗竴涓柟鎷彿鍐呭
+ const regex = /\[([^\]]+)\]/;
+ const matchResult = item.name.match(regex);
+
+ if (matchResult && matchResult[1]) {
+ this.formData.lotNo = matchResult[1]; // PPBOM00000088-1
+ console.log('鎻愬彇鐨凞AA001:', this.formData.lotNo);
+ } else {
+ this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ this.formData.lotNo = '';
+ }
+ this.createByWomdaa();
+ //this.$toast(item.name);
+
+ },
+
getInputJYZ() {
// 鍒囨崲鎸囧畾绱㈠紩鐨� popup 鐘舵��
var that = this;
@@ -167,8 +235,19 @@
inOrderGuid1: guid1,
userAccount: that.userInfo.loginAccount,
DAA001: that.formData.lotNo
- }, false).then(res1 => {
+ }, false).then(res => {
+ var json = res;
+ if (json.status == 0) {
+
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
+ that.formData.lotNo = "";
+ }
+ that.isLoading = false;
that.init();
+
}).catch(error => {
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.error('Refresh error:', error);
@@ -205,6 +284,7 @@
if (data) {
that.formData = data;
that.remarks = that.formData.fnGDesc;
+ that.lineId = data.lineId;
that.AxiosHttp("post", 'LLJ/getJYItem', {
//id: that.formData.guid,
releaseNo: that.formData.releaseNo
diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index 9f00599..926b55b 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -78,7 +78,7 @@
GetMesItemBlDetailByBillNo() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
+ that.AxiosHttp("post", 'MesItemBl/GetMesItemWWBlDetailByBillNo', {
billNo: that.billNo,
type: selectType
}, false)
diff --git a/H5/Js/Wwbl.js b/H5/Js/Wwbl.js
index 78a7923..d871eea 100644
--- a/H5/Js/Wwbl.js
+++ b/H5/Js/Wwbl.js
@@ -78,7 +78,7 @@
GetMesItemBlDetailByBillNo() {
var that = this;
that.isLoading = true;
- that.AxiosHttp("post", 'MesItemBl/GetMesItemBlDetailByBillNo', {
+ that.AxiosHttp("post", 'MesItemBl/GetMesItemWWBlDetailByBillNo', {
billNo: that.billNo,
type: selectType,
}, false)
@@ -87,7 +87,7 @@
if (json.status == 0) {
that.ItemBlDetail = json.data.tbBillList.item2;
- that.daa001 = json.data.tbBillList.item1;
+ that.daa001 = json.data.tbBillList.daa001;
that.$refs.barcode.focus();
}
else {
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index c4c406a..cc9e1fe 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -35,7 +35,7 @@
<van-tag round plain v-else-if="formData.fcheckResu === 'W:鏈煡'" 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 === 'Y:鍚堟牸'" type="success">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
<%-- <van-tag round plain
:type="formData.fcheckResu === '涓嶅悎鏍�' ? 'danger' :
formData.fcheckResu === '妫�楠屼腑' ? 'warning' :
diff --git a/H5/LLJ/List.aspx b/H5/LLJ/List.aspx
index 93ace78..a49f79c 100644
--- a/H5/LLJ/List.aspx
+++ b/H5/LLJ/List.aspx
@@ -79,7 +79,7 @@
<van-tag round plain v-else-if="item.fcheckResu === 'W:鏈煡'" 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 === 'Y:鍚堟牸'" type="warning">鍚堟牸</van-tag>
- <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+ <van-tag round plain v-else type="danger">鏈煡</van-tag>
</template>
</van-field>
</van-cell-group>
diff --git a/H5/Wwbl.aspx b/H5/Wwbl.aspx
index e0aa513..b707233 100644
--- a/H5/Wwbl.aspx
+++ b/H5/Wwbl.aspx
@@ -97,5 +97,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Wwbl.js?<%=144 %>"></script>
+ <script src="Js/Wwbl.js?<%=1441 %>"></script>
</asp:Content>
diff --git a/H5/Xctl.aspx b/H5/Xctl.aspx
index a7a9189..02314b6 100644
--- a/H5/Xctl.aspx
+++ b/H5/Xctl.aspx
@@ -73,7 +73,7 @@
placeholder="璇疯緭鍏ュ伐鍗曞彿杩涜鏌ヨ"
:right-icon-size="19"
v-model="selectKey"
- @keyup.enter.native="GetMesItemBlDetailByBillNo"
+<%-- @keyup.enter.native="GetMesItemBlDetailByBillNo"--%>
><template #button>
<van-button size="small" type="info" plain @click="getInfo" >閫夋嫨</van-button>
</template></van-field>
diff --git a/Scripts/config.js b/Scripts/config.js
index 2d68190..97d05c2 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,6 +1,7 @@
锘�/*var APIURL = "http://192.168.1.145:83/api/";*/
var APIURL = "http://localhost:5204/api/";
-var APIURL_PC = "http://192.168.1.145:81/";
+/*var APIURL_PC = "http://192.168.1.145:81/";*/
+var APIURL_PC = "http://192.168.1.145:8081/";//娴嬭瘯
var APIURL_IMAGE = APIURL_PC+"upload/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {
--
Gitblit v1.9.3