From b1f20a79e8c5635e0f8aeea42df1d5804fd6dc1f Mon Sep 17 00:00:00 2001
From: cuiqian2004 <cuiqian2004@163.com>
Date: 星期一, 17 六月 2024 18:01:29 +0800
Subject: [PATCH] delete event

---
 pages/modal/3201.vue |  252 +++++++++++++++++++++++++------------------------
 1 files changed, 128 insertions(+), 124 deletions(-)

diff --git a/pages/modal/3201.vue b/pages/modal/3201.vue
index 1d9547e..9ba4c24 100644
--- a/pages/modal/3201.vue
+++ b/pages/modal/3201.vue
@@ -132,7 +132,7 @@
   },
   data() {
     return {
-	  title:'鏂板',
+	  title:'3201棣栭〉',
       param: {},
 	  show: true,
 	  duration:0,
@@ -319,9 +319,9 @@
 				if(ret.result){
 					$this.$data.param.catalog[index].taskQty=ret.result.obj_list.length;
 					// console.log($this.$data.param.catalog[index]);
-					var param = JSON.parse(JSON.stringify($this.$data.param));
-					$this.$data.param=[];
-					$this.$data.param = param;
+					var catalog = JSON.parse(JSON.stringify($this.$data.param.catalog));
+					$this.$data.param.catalog=[];
+					$this.$data.param.catalog=catalog;
 				}
 			}else{
 				uni.showModal({title:"閿欒2",content:ret.err_msg,showCancel:false,confirmText:"鍙栨秷"});
@@ -351,8 +351,12 @@
 				    console.log(data);
 					//鍒锋柊褰撳墠椤甸潰
 					// location.reload();
-					uni.redirectTo({
-						url:'../modal/3201?param='+JSON.stringify($this.$data.param)+"&titlename="+$this.$data.title
+					// uni.redirectTo({
+					// 	url:'../modal/3201?param='+JSON.stringify($this.$data.param)+"&titlename="+$this.$data.title
+					// });
+					$this.$data.param.catalog.forEach(async (ele,index) => {
+						ele.taskQty=0;
+						await $this.appGetInfo(ele.function_def_id,index);
 					});
 				}
 			},
@@ -386,124 +390,124 @@
 	 * }
 	 */
 	toWhereBase64String(list) {
-	    if (typeof list == 'string') list = [list]
-	    var sql = []
-	    var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
-	    list.forEach(ls => {
-	        var where = ls.trim().toLowerCase()
-	        if (where.startsWith('(') && where.endsWith(')')) where = where.replace(/^\(/, '').replace(/\)$/, '')
-	        if (where.includes(' and ')) {
-	            // 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
-	            where.split(' and ').forEach(li => {
-	                var l = li.trim()
-	                if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
-	                var sep = ''
-	                for (var i = 0; i < seps.length; i++) {
-	                    if (l.includes(seps[i])) {
-	                        sep = seps[i]
-	                        break
-	                    }
-	                }
-	                if (sep) {
-	                    var values = l.split(sep)
-	                    var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
-	                    var value = ''
-	                    var op = sep.trim()
-	
-	                    if ([' in', ' not in'].includes(sep) && values[1].includes('select ') && values[1].includes(' from ')) {
-	                        value = l.replace(field, '').replace(/^\s*(in|not in)\s*/, '').trim()
-	                        if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
-	                    }
-	                    else {
-	                        value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
-	
-	                        if (['in', 'not in'].includes(op)) {
-	                            value = value.replace(/^\(/, '').replace(/\)$/, '')
-	                            value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
-	                        }
-	                    }
-	                    sql.push([{ field, value, op }])
-	                }
-	            })
-	        }
-	        else if (where.includes(' or ')) {
-	            // 浜岀骇or鏀惧湪绗簩绾у悓涓�粍鏁扮粍涓�-	            var s = []
-	            where.split(' or ').forEach(li => {
-	                var l = li.trim()
-	                if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
-	                var sep = ''
-	                for (var i = 0; i < seps.length; i++) {
-	                    if (l.includes(seps[i])) {
-	                        sep = seps[i]
-	                        break
-	                    }
-	                }
-	                if (sep) {
-	                    var values = l.split(sep)
-	                    var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
-	                    var value = ''
-	                    var op = sep.trim()
-	
-	                    if ([' in', ' not in'].includes(sep) && values[1].includes('select ') && values[1].includes(' from ')) {
-	                        value = l.replace(field, '').replace(/^\s*(in|not in)\s*/, '').trim()
-	                        if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
-	                    }
-	                    else {
-	                        value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
-	
-	                        if (['in', 'not in'].includes(op)) {
-	                            value = value.replace(/^\(/, '').replace(/\)$/, '')
-	                            value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
-	                        }
-	                    }
-	                    sql.push([{ field, value, op }])
-	                }
-	            })
-	            sql.push(s)
-	        }
-	        else {
-	            var li = where
-	            // 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
-	            var l = li.trim()
-	            if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
-	            var sep = ''
-	            for (var i = 0; i < seps.length; i++) {
-	                if (l.includes(seps[i])) {
-	                    sep = seps[i]
-	                    break
-	                }
-	            }
-	            if (sep) {
-	                var values = l.split(sep)
-	                var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
-	                var value = ''
-	                var op = sep.trim()
-	
-	                if ([' in', ' not in'].includes(sep) && values[1].includes('select ') && values[1].includes(' from ')) {
-	                    value = l.replace(field, '').replace(/^\s*(in|not in)\s*/, '').trim()
-	                    if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
-	                }
-	                else {
-	                    value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
-	
-	                    if (['in', 'not in'].includes(op)) {
-	                        value = value.replace(/^\(/, '').replace(/\)$/, '')
-	                        value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
-	                    }
-	                }
-	                sql.push([{ field, value, op }])
-	            }
-	        }
-	    })
-	
-	    if (sql.length > 0)
-	        return Base64.encode(JSON.stringify({
-	            model: 1,
-	            condition: sql
-	        }))
-	    else
-	    return ''
+		if (typeof list == 'string') list = [list]
+		var sql = []
+		var seps = [' not in', ' in', '<>', '!=', '<=', '>=', '<', '=', '>', ' like']
+		list.forEach(ls => {
+			var where = ls.trim()
+			if (where.startsWith('(') && where.endsWith(')')) where = where.replace(/^\(/, '').replace(/\)$/, '')
+			if (where.toLowerCase().includes(' and ')) {
+				// 浜岀骇and鏀惧湪绗竴绾ф暟缁勪腑
+				where.split(/ and /i).forEach(li => {
+					var l = li.trim()
+					if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
+					var sep = ''
+					for (var i = 0; i < seps.length; i++) {
+						if (l.toLowerCase().includes(seps[i])) {
+							sep = seps[i]
+							break
+						}
+					}
+					if (sep) {
+						var values = l.split(new RegExp(sep, 'i'))
+						var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+						var value = ''
+						var op = sep.trim()
+
+						if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') && values[1]?.toLowerCase().includes(' from ')) {
+							value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
+							if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
+						}
+						else {
+							value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+
+							if (['in', 'not in'].includes(op)) {
+								value = value.replace(/^\(/, '').replace(/\)$/, '')
+								value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
+							}
+						}
+						sql.push([{ field, value, op }])
+					}
+				})
+			}
+			else if (where.toLowerCase().includes(' or ')) {
+				// 浜岀骇or鏀惧湪绗簩绾у悓涓�粍鏁扮粍涓�+				var s = []
+				where.split(/ or /i).forEach(li => {
+					var l = li.trim()
+					if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
+					var sep = ''
+					for (var i = 0; i < seps.length; i++) {
+						if (l.toLowerCase().includes(seps[i])) {
+							sep = seps[i]
+							break
+						}
+					}
+					if (sep) {
+						var values = l.split(new RegExp(sep, 'i'))
+						var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+						var value = ''
+						var op = sep.trim()
+
+						if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') && values[1]?.toLowerCase().includes(' from ')) {
+							value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
+							if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
+						}
+						else {
+							value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+
+							if (['in', 'not in'].includes(op)) {
+								value = value.replace(/^\(/, '').replace(/\)$/, '')
+								value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
+							}
+						}
+						sql.push([{ field, value, op }])
+					}
+				})
+				sql.push(s)
+			}
+			else {
+				var li = where
+				// 鍗曚竴鏌ヨ鏉′欢鐩存帴鏀惧湪绗竴绾ф暟缁勪腑
+				var l = li.trim()
+				if (l.startsWith('(') && l.endsWith(')')) l = l.replace(/^\(/, '').replace(/\)$/, '')
+				var sep = ''
+				for (var i = 0; i < seps.length; i++) {
+					if (l.toLowerCase().includes(seps[i])) {
+						sep = seps[i]
+						break
+					}
+				}
+				if (sep) {
+					var values = l.split(new RegExp(sep,'i'))
+					var field = values[0]?.trim().replace(/^\[/, '').replace(/\]$/, '')
+					var value = ''
+					var op = sep.trim()
+
+					if ([' in', ' not in'].includes(sep) && values[1]?.toLowerCase().includes('select ') && values[1]?.toLowerCase().includes(' from ')) {
+						value = l.replace(field, '').replace(/^\s*(in|not in)\s*/i, '').trim()
+						if (value.startsWith('(') && value.endsWith(')')) value = value.replace(/^\(/, '').replace(/\)$/, '').trim()
+					}
+					else {
+						value = values[1]?.trim().replace(/^\'/, '').replace(/\'$/, '')
+
+						if (['in', 'not in'].includes(op)) {
+							value = value.replace(/^\(/, '').replace(/\)$/, '')
+							value = value.split(',').map(v => v.trim().replace(/^\'/, '').replace(/\'$/, ''))
+						}
+					}
+					sql.push([{ field, value, op }])
+				}
+			}
+		})
+
+		if (sql.length > 0)
+			return Base64.encode(JSON.stringify({
+				model: 1,
+				condition: sql
+			}))
+		else
+		return ''
 	},
 	
   },

--
Gitblit v1.9.1