Merge branch 'uat'

# Conflicts:
#	src/views/trials/trials-panel/trial-summary/audit-record/index.vue

src/views/trials/trials-panel/reading/read-order/index.vue

@@ -188,8 +188,8 @@
                     sortable="custom" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <el-input-number v-model="scope.row.RandomOrder"
-                            @change="(value, old) => handleChange(scope.row, value, old)" :min="1"
-                            style="width: 150px;"></el-input-number>
+                            @change="(value, old) => handleChange(scope.row, value, old)" :min="1" style="width: 150px;"
+                            :disabled="scope.row.ReadingTaskState === 1"></el-input-number>
                     </template>
                 </el-table-column>
             </el-table>
@@ -215,7 +215,7 @@ const searchDataDefault = () => {
         PageIndex: 1,
         PageSize: 20,
         Asc: true,
-        SortField: '',
+        SortField: 'RandomOrder',
         TrialId: null,
         TrialSiteId: null,
         SubjectId: null,

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -914,15 +914,18 @@ export default {
         }
         if (v.DataType === 'Router') {
           item = {
-            oldValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
-              v.UrlConfig.ParameterList.map((v) => {
-                let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
-                if (v.UrlParameterValueName === 'token') {
-                  a = getToken()
-                }
-                return v.UrlParameterName + '=' + a + '&'
-              }).toString().replaceAll(',', '') + '&' + 'lang=' + this.$i18n.locale + '&' + 'zh=' + this.$i18n.locale : v.UrlConfig.RoutePath,
-            newValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
+            // oldValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
+            //   v.UrlConfig.ParameterList.map((v) => {
+            //     let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
+            //     if (v.UrlParameterValueName === 'token') {
+            //       a = getToken()
+            //     }
+            //     return v.UrlParameterName + '=' + a + '&'
+            //   }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
+            
+            // 后端已确定旧数据不会有跳转 25/06/13
+            oldValue: '--',
+            newValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
               v.UrlConfig.ParameterList.map((v) => {
                 let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
                 if (v.UrlParameterValueName === 'token') {