From 8f6a1e8a01a518a384d22f0f773459be744a2a4d Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期一, 09 六月 2025 19:31:20 +0800
Subject: [PATCH] 合并
---
Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx | 65 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx
index 84dc9cc..372279c 100644
--- a/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx
+++ b/Code Management/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx
@@ -23,33 +23,68 @@
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
+
+ this.columns.forEach(x => {
+ if (x.field == "errorMessage") {
+ x.cellStyle = (row, rowIndex, columnIndex) => {
+ if (row.errorMessage == null||row.errorMessage=="") {
+ return { background: "White", color: "Black" }
+ }
+ else{
+ return { background: "#FF4500", color: "Black" }
+ }
+ }
+ }
+ })
+
//妗嗘灦鍒濆鍖栭厤缃墠锛�
- //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
- this.buttons.unshift({
- //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
- name: '浠诲姟瀹屾垚', //鎸夐挳鍚嶇О
- icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
- type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
- onClick: function () {
- // this.$Message.success('鐐瑰嚮浜嗘寜閽�');
+ let TaskHandCompleteBtn=this.buttons.find(x=>x.value=='TaskHandComplete');
+ if(TaskHandCompleteBtn){
+ TaskHandCompleteBtn.onClick=function(){
let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
if (row <= 0) {
//濡傛灉娌℃湁閫変腑琛�
this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
return
}
- debugger;
let taskNum = row[0].taskNum
- this.http.get(`/api/Task/CompleteTaskAsync?taskNum=${taskNum}`, {}).then((res) => {
+ this.http.get(`/api/Task/CompleteTaskAsync?taskNum=${taskNum}`, {}, "姝ｅ湪瀹屾垚浠诲姟").then((res) => {
//绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
- if (res.data.code === 200) {
- this.$Message.success('浠诲姟瀹屾垚')
+ if (res.status) {
+ this.$Message.success('浠诲姟瀹屾垚');
+ this.refresh();
} else {
- this.$Message.error(res.data.msg) //閿欒鎻愮ず
+ this.$Message.error(res.message) //閿欒鎻愮ず
+ this.refresh();
}
})
}
- })
+ }
+ //绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
+ // this.buttons.unshift({
+ // //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
+ // name: '浠诲姟瀹屾垚', //鎸夐挳鍚嶇О
+ // icon: 'el-icon-document', //鎸夐挳鍥炬爣vue2鐗堟湰瑙乮view鏂囨。icon锛寁ue3鐗堟湰瑙乪lement ui鏂囨。icon(娉ㄦ剰涓嶆槸element puls鏂囨。)
+ // type: 'primary', //鎸夐挳鏍峰紡vue2鐗堟湰瑙乮view鏂囨。button锛寁ue3鐗堟湰瑙乪lement ui鏂囨。button
+ // onClick: function () {
+ // // this.$Message.success('鐐瑰嚮浜嗘寜閽�');
+ // let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
+ // if (row <= 0) {
+ // //濡傛灉娌℃湁閫変腑琛�
+ // this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
+ // return
+ // }
+ // let taskNum = row[0].taskNum
+ // this.http.get(`/api/Task/CompleteTaskAsync?taskNum=${taskNum}`, {}, "姝ｅ湪瀹屾垚浠诲姟").then((res) => {
+ // //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
+ // if (res.status) {
+ // this.$Message.success('浠诲姟瀹屾垚')
+ // } else {
+ // this.$Message.error(res.message) //閿欒鎻愮ず
+ // }
+ // })
+ // }
+ // })
//绀轰緥锛氳缃慨鏀规柊寤恒�佺紪杈戝脊鍑烘瀛楁鏍囩鐨勯暱搴�
this.boxOptions.labelWidth = 150
@@ -114,7 +149,7 @@
},
rowClick({ row, column, event }) {
//鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
- this.$refs.table.$refs.table.toggleRowSelection(row) //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ // this.$refs.table.$refs.table.toggleRowSelection(row) //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
},
modelOpenAfter(row) {
//鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
--
Gitblit v1.9.3