no message

src/components/template/template-page-1.vue

@@ -527,8 +527,8 @@ export default {
       // 去除首尾的空格和换行符
       let trimmedString = input.trim()
       // 将字符串中的换行符替换为逗号
-      let result = trimmedString.replace(/\n+/g, ',')
-      return result
+      // let result = trimmedString.replace(/\n+/g, ',')
+      return trimmedString
     },
     // 导出
     export() {
@@ -556,17 +556,20 @@ export default {
           item.param = item.param.replace(/<=/g, '')
           if (
             // item.compare === '=' &&
-            typeof item.value === 'string' &&
-            (item.value.includes(',') || item.value.includes('，') || item.value.includes('\n'))
+            typeof item.value == 'string' &&
+            (item.value.includes(',') || item.value.includes('，'))
           ) {
-            // 去除换行
+            //  item.value.replace(/\\n/g, '');
+            // 去除字符串首尾的空格以及换行符号，然后把内容中的换行符号转换成逗号
             var str = this.processString(item.value)
             // 去除空格
             str = str.replace(/[\t\r\f\n\s]*/g, '')
             // 转中文逗号
             str = str.replace(/，/g, ',')
             // 切割为数组
-            item.value = str.split(',')
+            item.value = str.split(',').map(v => this.processString(v))
+          } else if (typeof item.value == 'string') {
+            item.value = this.processString(item.value)
           }
           return item
         })

src/views/workOrder/workOrderPool/index.vue

@@ -500,8 +500,9 @@ export default {
         !row.isThreeOrder &&
         !['YWG', 'GCSZX', 'WDWG', 'YWGO'].includes(orderStatus) &&
         !['YJS', 'LRCD'].includes(orderStatus) &&
-        !['YQX', 'FWZT', 'YCGB', 'FWQX'].includes(orderStatus) &&
-        !row.rpProjectRepairId
+        !['YQX', 'FWZT', 'YCGB', 'FWQX', 'FL'].includes(orderStatus) &&
+        !row.rpProjectRepairId &&
+        !row.isImportExcel
       )
     },