From b48cbaed482a5e530052a9e31fa0d2e8fd06cec4 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期一, 08 九月 2025 09:00:51 +0800
Subject: [PATCH] 1.巡检上下限为0的，判定为选择合格不合格(已更新) 2.AGV选择点位 3.现场收料新增参数
---
H5/Xcsl.aspx | 48 ++++++++++++++++-------
H5/Scll.aspx | 15 ++++++-
H5/Js/Scll.js | 2 +
H5/Js/Xcsl.js | 19 ++++++++-
H5/IPQC_XJ/Add.aspx | 4 +-
H5/Js/Sctl.js | 10 +++-
H5/Sctl.aspx | 8 +++
7 files changed, 79 insertions(+), 27 deletions(-)
diff --git a/H5/IPQC_XJ/Add.aspx b/H5/IPQC_XJ/Add.aspx
index e21e52b..83c79b1 100644
--- a/H5/IPQC_XJ/Add.aspx
+++ b/H5/IPQC_XJ/Add.aspx
@@ -253,11 +253,11 @@
</template>
<template>
<!-- 杈撳叆妗� -->
- <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-input-box">
+ <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-input-box">
<div class="si-input__left">
<span class="si-input__label">妫�楠屽�艰緭鍏�</span>
</div>
- <div v-if="jymxData.fdownAllow !== '' && jymxData.fupAllow !== ''" class="si-status__right">
+ <div v-if="jymxData.fdownAllow !== '' && jymxData.fdownAllow !== '0' && jymxData.fupAllow !== ''&& jymxData.fupAllow !== '0'" class="si-status__right">
<van-field
:ref="'inputValue' + tabActive"
v-model="inputValue"
diff --git a/H5/Js/Scll.js b/H5/Js/Scll.js
index 96b9b3c..381055d 100644
--- a/H5/Js/Scll.js
+++ b/H5/Js/Scll.js
@@ -29,6 +29,7 @@
// 瀛樺偍閫変腑琛屾暟鎹璞�
selItem: {} ,
ItemBarKw: [],//褰撳ぉ琛岀浉鍏虫潯鐮佸簱浣嶄俊鎭�
+ DaaInfo: {},
}
},
mounted() {
@@ -106,6 +107,7 @@
var json = res;
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
+ that.DaaInfo = json.data.tbBillList.daaInfo;
that.modeInfo.planNo = json.data.tbBillList.planNo;
that.modeInfo.startTime = json.data.tbBillList.startTime;
that.$refs.barcode.focus();
diff --git a/H5/Js/Sctl.js b/H5/Js/Sctl.js
index f798b1f..002a44f 100644
--- a/H5/Js/Sctl.js
+++ b/H5/Js/Sctl.js
@@ -82,12 +82,12 @@
var json = res;
if (json.status == 0) {
that.ItemDetail = json.data.tbBillList;
- that.$refs.sectionCode.focus();
+ //that.$refs.sectionCode.focus();
}
else {
that.$toast.fail(json.message);
that.$refs.billNo.focus();
- that.ItemDetail = null;
+ that.ItemDetail = [];
that.billNo = null;
}
that.isLoading = false;
@@ -96,7 +96,7 @@
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
that.$refs.billNo.focus();
- that.ItemDetail = null;
+ that.ItemDetail = [];
that.billNo = null;
console.log(error);
});
@@ -186,12 +186,16 @@
}
else {
that.$toast.fail(json.message);
+ that.$refs.barcode.focus();
+ that.barcode = null;
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$refs.barcode.focus();
+ that.barcode = null;
console.log(error);
});
},
diff --git a/H5/Js/Xcsl.js b/H5/Js/Xcsl.js
index 0e183cf..fa0a600 100644
--- a/H5/Js/Xcsl.js
+++ b/H5/Js/Xcsl.js
@@ -23,6 +23,7 @@
selectKey: "",//鏌ヨ鍏抽敭瀛�
actions: [],//鍒楄〃鐨勫��
show: false,//鍒楄〃灞曠ず
+ DaaInfo: { },
}
},
@@ -39,6 +40,7 @@
if (!that.DAA001 || that.DAA001.length <= 0) {
that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
that.$refs.DAA001.focus();
return;
}
@@ -50,8 +52,9 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.DAANum = json.data.tbBillList.gD_Num;
- that.DAA021 = json.data.tbBillList.workNo;
+ //that.DAANum = json.data.tbBillList.gD_Num;
+ //that.DAA021 = json.data.tbBillList.workNo;
+ that.DaaInfo = json.data.tbBillList.daaInfoList[0];
that.xcslItemList = json.data.tbBillList.xcslItemList;
that.xcslWjsBarList = json.data.tbBillList.xcslWjsBarList;
that.xcslYjsBarList = json.data.tbBillList.xcslYjsBarList;
@@ -59,6 +62,7 @@
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.DAA001.focus();
that.DAA001 = "";
}
@@ -67,6 +71,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
});
},
ScanXcsl() {
@@ -78,6 +83,7 @@
var that = this;
if (!that.Bar ||that.Bar.length <= 0) {
that.$toast.fail("鐗╂枡鏉＄爜涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
that.$refs.Bar.focus();
return;
}
@@ -85,6 +91,7 @@
if (!that.DAA001 ||that.DAA001.length <= 0) {
that.$toast.fail("宸ュ崟鍗曞彿涓嶈兘涓虹┖锛�");
+ that.$playSound('error');
that.$refs.DAA001.focus();
return;
}
@@ -100,10 +107,12 @@
if (json.status == 0) {
// that.scanInfo = json.data.tbBillList;
that.$notify({ type: 'success', message: json.message });
+ that.$playSound('success');
that.GetItemsXcsl();
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
that.$refs.Bar.focus();
@@ -112,6 +121,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
});
},
//鑾峰彇宸ュ崟淇℃伅
@@ -122,6 +132,7 @@
that.isLoading = true;
that.AxiosHttp("post", 'Womdaa/GetXcslDaa', {
selectKey: that.selectKey,
+ selDaaType: "1",
}, false)
.then(function (res) {
var json = res;
@@ -134,7 +145,8 @@
that.itemInfo = json.data.tbBillList;
that.actions = json.data.tbBillList.map(item => {
return {
- name: item.daaInfo // 鎷兼帴瀛楁
+ name: item.daaInfo, // 鎷兼帴瀛楁
+ subname: item.startTime
};
});
@@ -167,6 +179,7 @@
console.log('鎻愬彇鐨凞AA001:', this.DAA001);
} else {
this.$toast.fail('宸ュ崟鍙锋牸寮忓紓甯�');
+ that.$playSound('error');
this.DAA001 = '';
}
this.GetItemsXcsl();
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 09ffcb0..92ce845 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -53,7 +53,7 @@
</van-field>
<van-field
- v-model="modeInfo.planNo"
+ v-model="DaaInfo.workNo"
label="浠诲姟鍗曞彿"
clearable
:right-icon-size="19"
@@ -62,11 +62,20 @@
</van-field>
<van-field
- v-model="modeInfo.startTime"
+ v-model="DaaInfo.startTime"
label="寮�宸ユ椂闂�"
clearable
:right-icon-size="19"
placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
disabled>
</van-field>
@@ -182,5 +191,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scll.js?<%=1233361591 %>"></script>
+ <script src="Js/Scll.js?<%=1233361592 %>"></script>
</asp:Content>
\ No newline at end of file
diff --git a/H5/Sctl.aspx b/H5/Sctl.aspx
index d5c7308..d06f5e8 100644
--- a/H5/Sctl.aspx
+++ b/H5/Sctl.aspx
@@ -8,6 +8,12 @@
</style>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+ <van-notice-bar
+ :scrollable="false"
+ :text="'褰撳墠缁勭粐锛�' + (Cookies.get('orgName') || '鏆傛棤缁勭粐淇℃伅')"
+ class="org-info"
+/></van-notice-bar>
+
<van-nav-bar
title="鐢熶骇閫�鏂�"
left-text="杩斿洖"
@@ -131,6 +137,6 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Sctl.js?<%=16211 %>"></script>
+ <script src="Js/Sctl.js?<%=16214 %>"></script>
</asp:Content>
diff --git a/H5/Xcsl.aspx b/H5/Xcsl.aspx
index a3a45e8..6db0d46 100644
--- a/H5/Xcsl.aspx
+++ b/H5/Xcsl.aspx
@@ -87,14 +87,32 @@
>
</van-field>
<van-field
- ref="DAA021"
- v-model="DAA021"
+ v-model="DaaInfo.workNo"
label="浠诲姟鍗曞彿"
+ clearable
+ :right-icon-size="19"
placeholder="浠诲姟鍗曞彿"
- autofocus="true"
- readonly
- >
+ disabled>
</van-field>
+
+ <van-field
+ v-model="DaaInfo.startTime"
+ label="寮�宸ユ椂闂�"
+ clearable
+ :right-icon-size="19"
+ placeholder="寮�宸ユ椂闂�"
+ disabled>
+ </van-field>
+
+ <van-field
+ v-model="DaaInfo.lineName"
+ label="绾夸綋鍚嶇О"
+ clearable
+ :right-icon-size="19"
+ placeholder="绾夸綋鍚嶇О"
+ disabled>
+ </van-field>
+
<van-field
v-model="DAANum"
label="宸ュ崟鏁伴噺"
@@ -133,8 +151,8 @@
<van-col span="8" class="text-left padding-left">
<div>{{itm.item_model}}</div>
</van-col>
- <van-col span="4" class="blue-text">{{itm.bL_Num}}</van-col>
- <van-col span="4" class="blue-text">{{itm.jS_Num}}</van-col
+ <van-col span="4" class="blue-text">{{itm.BL_Num}}</van-col>
+ <van-col span="4" class="blue-text">{{itm.JS_Num}}</van-col
</van-row>
</van-tab>
<van-tab title="鏈帴鏀跺垪琛�" class="mySolid font">
@@ -148,16 +166,16 @@
<van-row
v-for="(itm,index) in xcslWjsBarList"
:key="index">
- <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
+ <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
<van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
<div>{{itm.item_name}}</div>
</van-col>
<van-col span="3" class="text-left padding-left">
- <div>{{itm.quantity}}</div>
+ <div>{{itm.QUANTITY}}</div>
</van-col>
<van-col span="3">
- <div>{{itm.useR_NAME}}</div>
+ <div>{{itm.USER_NAME}}</div>
</van-col>
<van-col span="5">
<div>{{itm.create_date}}</div>
@@ -176,19 +194,19 @@
<van-row
v-for="(itm,index) in xcslYjsBarList"
:key="index">
- <van-col span="5" class="text-left padding-left">{{itm.iteM_BARCODE}}</van-col>
+ <van-col span="5" class="text-left padding-left">{{itm.ITEM_BARCODE}}</van-col>
<van-col span="8" class="text-left padding-left">
<div class="blue-text">{{itm.item_no}}</div>
<div>{{itm.item_name}}</div>
</van-col>
<van-col span="3" class="text-left padding-left">
- <div>{{itm.quantity}}</div>
+ <div>{{itm.QUANTITY}}</div>
</van-col>
<van-col span="3">
- <div>{{itm.useR_NAME}}</div>
+ <div>{{itm.USER_NAME}}</div>
</van-col>
<van-col span="5">
- <div>{{itm.xcsL_CREATE_DATE}}</div>
+ <div>{{itm.XCSL_CREATE_DATE}}</div>
</van-col>
</van-row>
</van-tab>
@@ -201,5 +219,5 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Xcsl.js?<%=11111111 %>"></script>
+ <script src="Js/Xcsl.js?<%=11111115 %>"></script>
</asp:Content>
\ No newline at end of file
--
Gitblit v1.9.3