From 9a869077432d87d586bb58b5e9d3f6b9139a53e5 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 08 二月 2025 08:25:11 +0800
Subject: [PATCH] 1.来料检验不合格描述和按钮显示优化
---
Scripts/config.js | 4 ++--
H5/Js/LLJ/Add.js | 44 +++++++++++++++++++++++++++++++++-----------
H5/LLJ/Add.aspx | 4 ++--
3 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index 4eb07d3..02d550e 100644
--- a/H5/Js/LLJ/Add.js
+++ b/H5/Js/LLJ/Add.js
@@ -71,9 +71,9 @@
}
});
that.tableData = tableData;
- if (that.tableData.length === 0) {
- that.isShowTable = true;
- }
+ //if (that.tableData.length === 0) {
+ // that.isShowTable = true;
+ //}
}).catch(function (error) {
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
@@ -88,17 +88,39 @@
submit() {
var that = this;
+ //if (that.formdata.remarks == undefined && that.formdata.fcheckresu == "涓嶅悎鏍�") {
+ // that.$toast.fail("妫�楠岀粨鏋滀负涓嶅悎鏍兼椂锛岄渶瑕佸～鍐欎笉鍚堟牸鎻忚堪锛�");
+ // return;
+ //}
+
+
+
that.ttrre = true;
- that.AxiosHttp("post", 'LLJ/IqcQaSubmit', {
- userNo: this.userInfo.loginAccount,
- releaseNo: this.formData.releaseNo
- }, false).then(function (res1) {
- if (res1.status == 1) {
- that.$toast.fail(res1.message);
- } else {
+ //that.AxiosHttp("post", 'LLJ/IqcQaSubmit', {
+ // userNo: this.userInfo.loginAccount,
+ // releaseNo: this.formData.releaseNo
+ //}, false).then(function (res1) {
+ // if (res1.status == 1) {
+ // that.$toast.fail(res1.message);
+ // } else {
+ // that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
+ // that.init();
+ // }
+ // that.ttrre = false
+ //}).catch(function (error) {
+ // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ // that.ttrre = false
+ // console.log(error);
+ //});
+ that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditModelSubmit', {
+ guid: that.formData.guid
+ }, true, 1).then(function (res1) {
+ if (res1.rtnCode == 1) {
that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
that.init();
+ } else {
+ that.$toast.fail(res1.rtnMsg);
}
that.ttrre = false
}).catch(function (error) {
@@ -116,7 +138,7 @@
guid: that.formData.guid
}, true, 1).then(function (res1) {
if (res1.rtnCode == 1) {
- that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
+ that.$notify({ type: 'success', message: '閲嶆柊鍔犺浇鎴愬姛' });
that.init();
} else {
that.$toast.fail(res1.rtnMsg);
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index 412db4c..eb8466f 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -30,7 +30,7 @@
<van-field label="鐗╂枡鍚嶇О" colon="true" v-model="formData.itemName" readonly ></van-field>
<van-field label="瑙勬牸鍨嬪彿" colon="true" v-model="formData.itemModel" readonly ></van-field>
<van-field label="鏁伴噺" colon="true" v-model="formData.fcovertQty" readonly ></van-field>
- <van-field label="涓嶅悎鏍兼弿杩�" colon="true" v-model="formData.remarks" readonly ></van-field>
+ <van-field label="涓嶅悎鏍兼弿杩�" v-if='formData.fcheckResu == "涓嶅悎鏍�"' colon="true" v-model="formData.remarks" ></van-field>
<van-field label="妫�娴嬬粨鏋�" colon="true" v-model="formData.fcheckResu" readonly ></van-field>
</van-cell-group>
</div>
@@ -74,5 +74,5 @@
<comback ></comback>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=1124322 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=11243123 %>"></script>
</asp:Content>
diff --git a/Scripts/config.js b/Scripts/config.js
index e613481..6dc82ab 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,5 +1,5 @@
-锘縱ar APIURL = "http://192.168.1.145:83/api/";
-//var APIURL = "http://localhost:5204/api/";
+锘�//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 ISNEEDLOGIN = true;
String.prototype.trim = function () {
--
Gitblit v1.9.3