Compare commits

..

No commits in common. "0634df6e333a7f8bc1eab9bdda8e8e6197e6468f" and "ae808679a0a44946158316184e9d51737b6b495c" have entirely different histories.

2 changed files with 12 additions and 15 deletions

View File

@ -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;"
:disabled="scope.row.ReadingTaskState === 1"></el-input-number>
@change="(value, old) => handleChange(scope.row, value, old)" :min="1"
style="width: 150px;"></el-input-number>
</template>
</el-table-column>
</el-table>
@ -215,7 +215,7 @@ const searchDataDefault = () => {
PageIndex: 1,
PageSize: 20,
Asc: true,
SortField: 'RandomOrder',
SortField: '',
TrialId: null,
TrialSiteId: null,
SubjectId: null,

View File

@ -914,18 +914,15 @@ 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,
// 25/06/13
oldValue: '--',
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,
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') {