Browse Source

feat: [试验管理] 锁定增加表单判断

feat: [稽查轨迹] 用户名用中文
lkf
memorylkf 3 months ago
parent
commit
44edebcf52
13 changed files with 62 additions and 24 deletions
  1. +2
    -1
      src/views/business/comps/common/JcgjList.vue
  2. +3
    -2
      src/views/business/comps/select/SelectDeptUser.vue
  3. +8
    -4
      src/views/business/comps/select/SelectDeptUserDialog.vue
  4. +8
    -5
      src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
  5. +8
    -2
      src/views/business/form/drug/comp/sign.vue
  6. +5
    -1
      src/views/business/form/drug/comp/ytbdList.vue
  7. +2
    -1
      src/views/business/form/drug/list.vue
  8. +8
    -2
      src/views/business/form/nonTrial/comp/sign.vue
  9. +5
    -1
      src/views/business/form/nonTrial/comp/ytbdList.vue
  10. +2
    -1
      src/views/business/form/nonTrial/list.vue
  11. +8
    -2
      src/views/business/study/comp/sign.vue
  12. +1
    -1
      src/views/business/study/comp/syxx.vue
  13. +2
    -1
      src/views/business/study/list.vue

+ 2
- 1
src/views/business/comps/common/JcgjList.vue View File

@ -39,7 +39,8 @@
{{$t('form.qmyy')}}{{ $i18n.locale === 'zh_CN'?item.jcmc:item.jcmcEn }}
</div>
<div v-if="item.qmrId&&item.qmrId>0">
{{$t('form.signer')}}{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn }}
<!-- {{$t('form.signer')}}{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn }} -->
{{$t('form.signer')}}{{ item.qmrMc }}
</div>
</div>
</el-timeline-item>

+ 3
- 2
src/views/business/comps/select/SelectDeptUser.vue View File

@ -2,8 +2,9 @@
<template>
<div>
<el-input v-if="$i18n.locale === 'zh_CN'" v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
<el-input v-else v-model="selected.nameEn" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
<el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
<!-- <el-input v-if="$i18n.locale === 'zh_CN'" v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
<el-input v-else v-model="selected.nameEn" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" /> -->
<SelectDeptUserDialog ref="selectDeptUserDialog" @change="handleChange" />
</div>
</template>

+ 8
- 4
src/views/business/comps/select/SelectDeptUserDialog.vue View File

@ -21,8 +21,10 @@
node-key="id"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-radio>
<span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span>
<!-- <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-radio> -->
<el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{data.name }}</el-radio>
<!-- <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span> -->
<span v-else>{{ data.name }}</span>
</span>
</el-tree>
</el-col>
@ -30,7 +32,8 @@
<div>已选</div>
<div class="select-user-selected" v-if="selected.id!=''">
<div class="select-user-selected-item">
<div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}</div>
<!-- <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}</div> -->
<div class="select-user-selected-name">{{selected.name}}</div>
<div class="select-user-selected-del"><i class="el-icon-delete" @click="delSelected"></i></div>
</div>
</div>
@ -90,7 +93,8 @@ export default {
},
filterNode(value, data) {
if (!value) return true;
return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
// return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
return data.name.indexOf(value) !== -1;
},
getList() {
this.listData = []

+ 8
- 5
src/views/business/comps/select/SelectDeptUserMultipleDialog.vue View File

@ -21,9 +21,10 @@
node-key="id"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-checkbox>
<!-- <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id">{{ data.name }}</el-radio> -->
<span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span>
<!-- <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-checkbox> -->
<el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ data.name }}</el-checkbox>
<!-- <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span> -->
<span v-else>{{ data.name }}</span>
</span>
</el-tree>
</el-col>
@ -31,7 +32,8 @@
<div>已选</div>
<div class="select-user-selected" v-if="selected.length>0">
<div class="select-user-selected-item" v-for="(item,index) in selected" :key="index">
<div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}</div>
<!-- <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}</div> -->
<div class="select-user-selected-name">{{item.name}}</div>
<div class="select-user-selected-del"><i class="el-icon-delete" @click="delSelected(item)"></i></div>
</div>
</div>
@ -99,7 +101,8 @@ export default {
},
filterNode(value, data) {
if (!value) return true;
return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
// return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
return data.name.indexOf(value) !== -1;
},
getList() {
this.listData = []

+ 8
- 2
src/views/business/form/drug/comp/sign.vue View File

@ -24,7 +24,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
<el-col :span="24">
<el-form-item :label="$t('form.signer')">
<el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
<!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
<el-form-item :label="$t('form.signer')">
<el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
@ -35,7 +41,7 @@
<el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item :label="$t('form.password')" prop="qmrmm">
<el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />

+ 5
- 1
src/views/business/form/drug/comp/ytbdList.vue View File

@ -54,7 +54,7 @@
v-hasPermi="['business:drugFormPre:xz']">{{
$t('page.business.study.studyFormPre.xzbd') }}</el-button>
<el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5">{{ $t('page.business.study.drug.sdsy') }}</el-button>
<el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.drug.sdsy') }}</el-button>
</el-col>
</el-row>
@ -207,6 +207,8 @@ export default {
this.searchForm.studyId = newVal.id
this.leader = newVal.leader
this.studyStatus = newVal.status
this.formCount = newVal.formCount
this.formFinishCount = newVal.formFinishCount
this.search()
},
immediate: true,
@ -216,6 +218,8 @@ export default {
components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
data() {
return {
formCount:0,
formFinishCount:0,
formPreview: {
templateSn: null
},

+ 2
- 1
src/views/business/form/drug/list.vue View File

@ -74,7 +74,8 @@
<el-table-column :label="$t('page.business.study.drug.formCount')" align="center" prop="formCount" width="100" />
<el-table-column :label="$t('page.business.study.drug.formFinishCount')" align="center" prop="formFinishCount" width="120" />
<el-table-column :label="$t('page.business.study.drug.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" />
<!-- <el-table-column :label="$t('page.business.study.drug.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
<el-table-column :label="$t('page.business.study.drug.leader')" align="center" prop="leaderName" width="100" />
<el-table-column :label="$t('page.business.study.drug.dept')" align="center" prop="deptName" width="120" />
<el-table-column :label="$t('page.business.study.drug.createDate')" align="center" prop="createTime" width="140" />

+ 8
- 2
src/views/business/form/nonTrial/comp/sign.vue View File

@ -24,7 +24,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
<el-col :span="24">
<el-form-item :label="$t('form.signer')">
<el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
<!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
<el-form-item :label="$t('form.signer')">
<el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
@ -35,7 +41,7 @@
<el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item :label="$t('form.password')" prop="qmrmm">
<el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />

+ 5
- 1
src/views/business/form/nonTrial/comp/ytbdList.vue View File

@ -54,7 +54,7 @@
v-hasPermi="['business:nonTrialFormPre:xz']">{{
$t('page.business.study.studyFormPre.xzbd') }}</el-button>
<el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5">{{ $t('page.business.study.nonTrial.sdsy') }}</el-button>
<el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.nonTrial.sdsy') }}</el-button>
</el-col>
</el-row>
@ -207,6 +207,8 @@ export default {
this.searchForm.studyId = newVal.id
this.leader = newVal.leader
this.studyStatus = newVal.status
this.formCount = newVal.formCount
this.formFinishCount = newVal.formFinishCount
this.search()
},
immediate: true,
@ -216,6 +218,8 @@ export default {
components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
data() {
return {
formCount:0,
formFinishCount:0,
formPreview: {
templateSn: null
},

+ 2
- 1
src/views/business/form/nonTrial/list.vue View File

@ -74,7 +74,8 @@
<el-table-column :label="$t('page.business.study.nonTrial.formCount')" align="center" prop="formCount" width="100" />
<el-table-column :label="$t('page.business.study.nonTrial.formFinishCount')" align="center" prop="formFinishCount" width="120" />
<el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" />
<!-- <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
<el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center" prop="leaderName" width="100" />
<el-table-column :label="$t('page.business.study.nonTrial.dept')" align="center" prop="deptName" width="120" />
<el-table-column :label="$t('page.business.study.nonTrial.createDate')" align="center" prop="createTime" width="140" />

+ 8
- 2
src/views/business/study/comp/sign.vue View File

@ -24,7 +24,13 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
<el-col :span="24">
<el-form-item :label="$t('form.signer')">
<el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
<!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
<el-form-item :label="$t('form.signer')">
<el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
@ -35,7 +41,7 @@
<el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
:placeholder="$t('form.placeholderInput')" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="24">
<el-form-item :label="$t('form.password')" prop="qmrmm">
<el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />

+ 1
- 1
src/views/business/study/comp/syxx.vue View File

@ -35,7 +35,7 @@
</el-form-item>
</el-col>
<el-col>
<el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
<el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5 && studyInfo.formCount===studyInfo.formFinishCount">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
</el-col>
</el-row>
</el-form>

+ 2
- 1
src/views/business/study/list.vue View File

@ -74,7 +74,8 @@
<el-table-column :label="$t('page.business.study.study.formCount')" align="center" prop="formCount" width="100" />
<el-table-column :label="$t('page.business.study.study.formFinishCount')" align="center" prop="formFinishCount" width="120" />
<el-table-column :label="$t('page.business.study.study.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" />
<!-- <el-table-column :label="$t('page.business.study.study.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
<el-table-column :label="$t('page.business.study.study.leader')" align="center" prop="leaderName" width="100" />
<el-table-column :label="$t('page.business.study.study.createDate')" align="center" prop="createTime" width="140" />
<el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">

Loading…
Cancel
Save