From 104cee8881f03e2d1ab4edc349b866cfd980d573 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 07 二月 2025 13:44:42 +0800
Subject: [PATCH] 1.来料检验”重新加载项目“按钮完成
---
Scripts/config.js | 2 +-
GsPdaApp.sln | 7 ++++---
H5/Js/LLJ/Add.js | 16 +++++++---------
H5/LLJ/Add.aspx | 4 ++--
4 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/GsPdaApp.sln b/GsPdaApp.sln
index 5082048..3e5cbb7 100644
--- a/GsPdaApp.sln
+++ b/GsPdaApp.sln
@@ -3,24 +3,25 @@
# Visual Studio Version 17
VisualStudioVersion = 17.11.35327.3
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "GsPdaApp", ".", "{E44C1573-72F6-4CBB-9C02-FFC26ACC48E9}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "QXPDA", ".", "{E44C1573-72F6-4CBB-9C02-FFC26ACC48E9}"
ProjectSection(WebsiteProperties) = preProject
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8"
Debug.AspNetCompiler.VirtualPath = "/localhost_51933"
- Debug.AspNetCompiler.PhysicalPath = "D:\Workspace\gs\GsPdaApp\"
+ Debug.AspNetCompiler.PhysicalPath = "..\QXPDA\"
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_51933\"
Debug.AspNetCompiler.Updateable = "true"
Debug.AspNetCompiler.ForceOverwrite = "true"
Debug.AspNetCompiler.FixedNames = "false"
Debug.AspNetCompiler.Debug = "True"
Release.AspNetCompiler.VirtualPath = "/localhost_51933"
- Release.AspNetCompiler.PhysicalPath = "D:\Workspace\gs\GsPdaApp\"
+ Release.AspNetCompiler.PhysicalPath = "..\QXPDA\"
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_51933\"
Release.AspNetCompiler.Updateable = "true"
Release.AspNetCompiler.ForceOverwrite = "true"
Release.AspNetCompiler.FixedNames = "false"
Release.AspNetCompiler.Debug = "False"
VWDPort = "51933"
+ SlnRelativePath = "..\QXPDA\"
EndProjectSection
EndProject
Global
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index a67c2d0..4eb07d3 100644
--- a/H5/Js/LLJ/Add.js
+++ b/H5/Js/LLJ/Add.js
@@ -43,9 +43,10 @@
},
methods: {
init() {
+ //alert(this.Request("id"));
var that = this;
that.AxiosHttp("post", 'LLJ/getPage', {
- id: this.formData.id,
+ id: that.Request("id"),
pageIndex: 1,
limit: 1,
}, false)
@@ -55,7 +56,7 @@
that.formData = data;
that.AxiosHttp("post", 'LLJ/getJYItem', {
- id: that.formData.id,
+ //id: that.formData.guid,
releaseNo: that.formData.releaseNo
}, false).then(function (res1) {
let tableData = res1.data.tbBillList
@@ -110,21 +111,18 @@
var that = this;
- that.ttrre = true;
that.AxiosHttp("post", 'MesQaItemsDetect01Manager/ReloadModel5', {
- guid: "158f4324-955e-4a3b-aafa-09babf3c3368"
+ guid: that.formData.guid
}, true, 1).then(function (res1) {
- if (res1.status == 1) {
- that.$toast.fail(res1.message);
- } else {
+ if (res1.rtnCode == 1) {
that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
that.init();
+ } else {
+ that.$toast.fail(res1.rtnMsg);
}
- that.ttrre = false
}).catch(function (error) {
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- that.ttrre = false
console.log(error);
});
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index 1855fce..412db4c 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -35,7 +35,7 @@
</van-cell-group>
</div>
<van-button :loading="ttrre" type="info" loading-text="鍔犺浇涓�..." v-if="!isShowTable && formData.fsubmit == 0" @click="submit">妫�楠屾彁浜�</van-button>
- <van-button type="danger" v-if="!formData.fcheckResu && !isShowTable" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>
+ <van-button type="danger" v-if="!isShowTable && formData.fsubmit == 0" @click="removeXJ">閲嶆柊鍔犺浇椤圭洰</van-button>
<van-tabs color="#000" title-active-color="#0283EF" style="padding-bottom: 120px;">
<van-tab title="妫�楠岄」鐩�" class="mySolid font">
<van-row type="flex" justify="center">
@@ -74,5 +74,5 @@
<comback ></comback>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=1124321 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=1124322 %>"></script>
</asp:Content>
diff --git a/Scripts/config.js b/Scripts/config.js
index 1007cd1..e613481 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,6 +1,6 @@
锘縱ar APIURL = "http://192.168.1.145:83/api/";
//var APIURL = "http://localhost:5204/api/";
-var APIURL_PC = "http://localhost:5263/";
+var APIURL_PC = "http://192.168.1.145:81/";
var ISNEEDLOGIN = true;
String.prototype.trim = function () {
return this.replace(/(^\s*)|(\s*$)/g, "");
--
Gitblit v1.9.3