diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue
index 1549a28..c2ae879 100644
--- a/src/views/business/comps/common/JcgjList.vue
+++ b/src/views/business/comps/common/JcgjList.vue
@@ -39,7 +39,8 @@
{{$t('form.qmyy')}}:{{ $i18n.locale === 'zh_CN'?item.jcmc:item.jcmcEn }}
- {{$t('form.signer')}}:{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn }}
+
+ {{$t('form.signer')}}:{{ item.qmrMc }}
diff --git a/src/views/business/comps/select/SelectDeptUser.vue b/src/views/business/comps/select/SelectDeptUser.vue
index e13e8d6..269fcfe 100644
--- a/src/views/business/comps/select/SelectDeptUser.vue
+++ b/src/views/business/comps/select/SelectDeptUser.vue
@@ -2,8 +2,9 @@
-
-
+
+
diff --git a/src/views/business/comps/select/SelectDeptUserDialog.vue b/src/views/business/comps/select/SelectDeptUserDialog.vue
index 57c5cc9..0dcca26 100644
--- a/src/views/business/comps/select/SelectDeptUserDialog.vue
+++ b/src/views/business/comps/select/SelectDeptUserDialog.vue
@@ -21,8 +21,10 @@
node-key="id"
>
- {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}
- {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}
+
+ {{data.name }}
+
+ {{ data.name }}
@@ -30,7 +32,8 @@
已选
-
{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}
+
+
{{selected.name}}
@@ -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 = []
diff --git a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
index 7ee111f..d081152 100644
--- a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
+++ b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
@@ -21,9 +21,10 @@
node-key="id"
>
- {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}
-
- {{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}
+
+ {{ data.name }}
+
+ {{ data.name }}
@@ -31,7 +32,8 @@
已选
-
{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}
+
+
{{item.name}}
@@ -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 = []
diff --git a/src/views/business/form/drug/comp/sign.vue b/src/views/business/form/drug/comp/sign.vue
index 95cacc5..338bc25 100644
--- a/src/views/business/form/drug/comp/sign.vue
+++ b/src/views/business/form/drug/comp/sign.vue
@@ -24,7 +24,13 @@
-
+
+
+
+
+
+
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 8f6e3b0..7034bd7 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -54,7 +54,7 @@
v-hasPermi="['business:drugFormPre:xz']">{{
$t('page.business.study.studyFormPre.xzbd') }}
- {{ $t('page.business.study.drug.sdsy') }}
+ {{ $t('page.business.study.drug.sdsy') }}
@@ -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
},
diff --git a/src/views/business/form/drug/list.vue b/src/views/business/form/drug/list.vue
index 7cd84ad..c95cd12 100644
--- a/src/views/business/form/drug/list.vue
+++ b/src/views/business/form/drug/list.vue
@@ -74,7 +74,8 @@
-
+
+
diff --git a/src/views/business/form/nonTrial/comp/sign.vue b/src/views/business/form/nonTrial/comp/sign.vue
index 46c0473..13a40e8 100644
--- a/src/views/business/form/nonTrial/comp/sign.vue
+++ b/src/views/business/form/nonTrial/comp/sign.vue
@@ -24,7 +24,13 @@
-
+
+
+
+
+
+
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index 2601378..1fd5d01 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -54,7 +54,7 @@
v-hasPermi="['business:nonTrialFormPre:xz']">{{
$t('page.business.study.studyFormPre.xzbd') }}
- {{ $t('page.business.study.nonTrial.sdsy') }}
+ {{ $t('page.business.study.nonTrial.sdsy') }}
@@ -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
},
diff --git a/src/views/business/form/nonTrial/list.vue b/src/views/business/form/nonTrial/list.vue
index 0b79e90..3fe872e 100644
--- a/src/views/business/form/nonTrial/list.vue
+++ b/src/views/business/form/nonTrial/list.vue
@@ -74,7 +74,8 @@
-
+
+
diff --git a/src/views/business/study/comp/sign.vue b/src/views/business/study/comp/sign.vue
index 78ba767..ebe96aa 100644
--- a/src/views/business/study/comp/sign.vue
+++ b/src/views/business/study/comp/sign.vue
@@ -24,7 +24,13 @@
-
+
+
+
+
+
+
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index da0977e..88ad6ef 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -35,7 +35,7 @@
- {{ $t('page.business.study.studyFormPlan.sdsy') }}
+ {{ $t('page.business.study.studyFormPlan.sdsy') }}
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index a8d1dbc..f928fae 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -74,7 +74,8 @@
-
+
+