From 789a9818b0f3d6cdcdc84ed4c252c294fcee9bef Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 25 三月 2025 08:37:21 +0800
Subject: [PATCH] 1.来料检优化
---
H5/LLJ/List.aspx | 5 ++
H5/Js/LLJ/Add.js | 39 +++++++++++++++----
H5/LLJ/Add.aspx | 19 +++++++--
3 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/H5/Js/LLJ/Add.js b/H5/Js/LLJ/Add.js
index 6e8c5be..50eea2a 100644
--- a/H5/Js/LLJ/Add.js
+++ b/H5/Js/LLJ/Add.js
@@ -299,13 +299,13 @@
var that = this;
that.ttrre = true;
that.AxiosHttp("post", 'MesQaItemsDetect01Manager/EditModelSubmit', {
- id13: that.formData.guid
+ guid: that.formData.guid
}, true, 1).then(function (res1) {
- if (res1.rtnCode == 1) {
+ if (res1.rtnData.outSum == 1) {
that.$notify({ type: 'success', message: '鎻愪氦鎴愬姛' });
that.init();
} else {
- that.$toast.fail(res1.rtnMsg);
+ that.$toast.fail(res1.rtnData.outMsg);
}
that.ttrre = false
}).catch(function (error) {
@@ -316,13 +316,13 @@
},
removeXJ() {
const that = this;
- that.isLoading = true;
// 娣诲姞纭寮圭獥
that.$dialog.confirm({
message: '纭瑕侀噸鏂板姞杞芥楠岄」鐩悧锛�',
confirmButtonText: '纭',
cancelButtonText: '鍙栨秷'
}).then(() => { // 纭鍥炶皟
+ that.isLoading = true;
that.AxiosHttp("post", 'MesQaItemsDetect01Manager/ReloadModel5', {
guid: that.formData.guid
}, true, 1).then(res1 => {
@@ -340,7 +340,6 @@
}).catch(() => { // 鍙栨秷鍥炶皟
that.$toast('宸插彇娑堟搷浣�');
- that.isLoading = false;
});
},
GetBack1() {
@@ -461,9 +460,8 @@
//鑾峰彇鍥剧墖淇℃伅
GetImageFileByGid() {
const that = this;
- that.AxiosHttp("post", 'Llj/getImage', {
- gid: that.formData.guid,
- Remarks: that.remarks
+ that.AxiosHttp("post", 'MesImage/getImage', {
+ parentId: that.formData.guid,
}, true, 0).then(res1 => {
if (res1.status === 0) {
// 鍏抽敭杞崲锛氬皢鍚庣鏁版嵁杞崲涓� van-uploader 闇�瑕佺殑鏍煎紡
@@ -482,5 +480,30 @@
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
});
},
+ handleDelete(file, { index }) {
+ var that = this;
+ that.$dialog.confirm({
+ title: '纭鍒犻櫎',
+ message: '纭畾瑕佸垹闄よ繖寮犲浘鐗囧悧锛�'
+ }).then(() => {
+ // 纭鍒犻櫎閫昏緫
+ console.log(file);
+ that.AxiosHttp("post", 'MesImage/deleteImage', {
+ id: file.id,
+ }, true, 0).then(res1 => {
+ if (res1.status === 0) {
+ that.$notify({ type: 'success', message: '鍒犻櫎鎴愬姛' });
+ that.init();//鍒锋柊妫�楠岄」鐩�
+ } else {
+ that.$toast.fail(res1.rtnMsg);
+ }
+ }).catch(error => {
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ });
+
+ }).catch(() => {
+ // 鍙栨秷鎿嶄綔
+ })
+ },
}
})
\ No newline at end of file
diff --git a/H5/LLJ/Add.aspx b/H5/LLJ/Add.aspx
index 59f5f82..549cc9f 100644
--- a/H5/LLJ/Add.aspx
+++ b/H5/LLJ/Add.aspx
@@ -30,13 +30,21 @@
<template #title>
<div class="inline-title">
<span class="release-no">{{ formData.releaseNo }}</span>
- <van-tag round plain
+ <van-tag round plain v-if="formData.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</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="warning">鍚堟牸</van-tag>
+ <van-tag round plain v-else type="danger">寮傚父鐘舵��</van-tag>
+<%-- <van-tag round plain
:type="formData.fcheckResu === '涓嶅悎鏍�' ? 'danger' :
- formData.fcheckResu === '妫�楠屼腑' ? 'warning' : 'success'"
+ formData.fcheckResu === '妫�楠屼腑' ? 'warning' :
+ formData.fcheckResu === '鏈楠�' ? 'warning' :
+ formData.fcheckResu === '鍚堟牸' ? 'success' :'danger'"
class="status-tag"
>
- {{ formData.fcheckResu || '鍚堟牸' }}
- </van-tag>
+ {{ formData.fcheckResu }}
+ </van-tag>--%>
</div>
</template>
<template #right>
@@ -121,6 +129,7 @@
v-model="fileList"
:after-read="afterRead"
style="padding: 8px 0"
+ @delete="handleDelete"
/>
</div>
</div>
@@ -379,5 +388,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="../Js/LLJ/Add.js?<%=119993 %>"></script>
+ <script src="../Js/LLJ/Add.js?<%=119996 %>"></script>
</asp:Content>
diff --git a/H5/LLJ/List.aspx b/H5/LLJ/List.aspx
index 1740280..72b4919 100644
--- a/H5/LLJ/List.aspx
+++ b/H5/LLJ/List.aspx
@@ -76,7 +76,10 @@
<template #input>
<van-tag round plain v-if="item.fcheckResu === '涓嶅悎鏍�'" type="danger">涓嶅悎鏍�</van-tag>
<van-tag round plain v-else-if="item.fcheckResu === '妫�楠屼腑'" type="warning">妫�楠屼腑</van-tag>
- <van-tag round plain v-else type="success">鍚堟牸</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 type="danger">寮傚父鐘舵��</van-tag>
</template>
</van-field>
</van-cell-group>
--
Gitblit v1.9.3