Compare commits
No commits in common. "0634df6e333a7f8bc1eab9bdda8e8e6197e6468f" and "ae808679a0a44946158316184e9d51737b6b495c" have entirely different histories.
0634df6e33
...
ae808679a0
|
@ -188,8 +188,8 @@
|
||||||
sortable="custom" show-overflow-tooltip>
|
sortable="custom" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-input-number v-model="scope.row.RandomOrder"
|
<el-input-number v-model="scope.row.RandomOrder"
|
||||||
@change="(value, old) => handleChange(scope.row, value, old)" :min="1" style="width: 150px;"
|
@change="(value, old) => handleChange(scope.row, value, old)" :min="1"
|
||||||
:disabled="scope.row.ReadingTaskState === 1"></el-input-number>
|
style="width: 150px;"></el-input-number>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
@ -215,7 +215,7 @@ const searchDataDefault = () => {
|
||||||
PageIndex: 1,
|
PageIndex: 1,
|
||||||
PageSize: 20,
|
PageSize: 20,
|
||||||
Asc: true,
|
Asc: true,
|
||||||
SortField: 'RandomOrder',
|
SortField: '',
|
||||||
TrialId: null,
|
TrialId: null,
|
||||||
TrialSiteId: null,
|
TrialSiteId: null,
|
||||||
SubjectId: null,
|
SubjectId: null,
|
||||||
|
|
|
@ -914,17 +914,14 @@ export default {
|
||||||
}
|
}
|
||||||
if (v.DataType === 'Router') {
|
if (v.DataType === 'Router') {
|
||||||
item = {
|
item = {
|
||||||
// oldValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
|
oldValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
|
||||||
// v.UrlConfig.ParameterList.map((v) => {
|
v.UrlConfig.ParameterList.map((v) => {
|
||||||
// let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
|
let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
|
||||||
// if (v.UrlParameterValueName === 'token') {
|
if (v.UrlParameterValueName === 'token') {
|
||||||
// a = getToken()
|
a = getToken()
|
||||||
// }
|
}
|
||||||
// return v.UrlParameterName + '=' + a + '&'
|
return v.UrlParameterName + '=' + a + '&'
|
||||||
// }).toString().replaceAll(',', '')+'&'+'lang='+this.$i18n.locale +'&'+ 'zh='+this.$i18n.locale : v.UrlConfig.RoutePath,
|
}).toString().replaceAll(',', '') + '&' + 'lang=' + this.$i18n.locale + '&' + 'zh=' + this.$i18n.locale : v.UrlConfig.RoutePath,
|
||||||
|
|
||||||
// 后端已确定旧数据不会有跳转 25/06/13
|
|
||||||
oldValue: '--',
|
|
||||||
newValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
|
newValue: v.UrlConfig.IsHaveParameters ? v.UrlConfig.RoutePath + '?' +
|
||||||
v.UrlConfig.ParameterList.map((v) => {
|
v.UrlConfig.ParameterList.map((v) => {
|
||||||
let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
|
let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
|
||||||
|
|
Loading…
Reference in New Issue