Merge remote-tracking branch 'origin/dev' into dev

pages/soil-sample-manage/sample-preparation/Preparation.vue

@@ -564,12 +564,20 @@ export default {
         /\$sampleCode\$/g,
         undefined !== row.sampleCode ? row.sampleCode : ''
       )
-      result = result.replace(/\$num\$/g, undefined !== row.num ? row.num : '')
-      result = result.replace(/\$resultDateTemp\$/g, row.resultDateTemp)
+      result = result.replace(
+        /\$groupId\$/g,
+        undefined !== row.groupId ? row.groupId : ''
+      )
       result = result.replace(
         /\$groupName\$/g,
         undefined !== row.groupName ? row.groupName : ''
       )
+      result = result.replace(
+        /\$prepareDate\$/g,
+        undefined !== row.prepareDate ? this._formatDate(row.prepareDate) : ''
+      )
+      result = result.replace(/\$num\$/g, undefined !== row.num ? row.num : '')
+      result = result.replace(/\$resultDateTemp\$/g, row.resultDateTemp)
       // 检测项目
       result = result.replace(
         /\$items\$/g,