diff --git a/src/api/dictionary/dictionary.js b/src/api/dictionary/dictionary.js
index e4d9c162..cb2aaec8 100644
--- a/src/api/dictionary/dictionary.js
+++ b/src/api/dictionary/dictionary.js
@@ -22,9 +22,9 @@ export function getBasicDataSelects(param) {
   })
 }
 
-export function getBasicDataAllSelect(params) {
+export function getBasicDataAllSelect(params, isSystem) {
   return request({
-    url: params ? `/Dictionary/getBasicDataAllSelect?TrialReadingCriterionId=${params}` : `/Dictionary/getBasicDataAllSelect`,
+    url: params ? (isSystem ? `/Dictionary/getBasicDataAllSelect?SystemReadingCriterionId=${params}` : `/Dictionary/getBasicDataAllSelect?TrialReadingCriterionId=${params}`) : `/Dictionary/getBasicDataAllSelect`,
     method: 'get'
   })
 }
diff --git a/src/main.js b/src/main.js
index 06d74021..d5e5d04e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -160,10 +160,16 @@ Vue.prototype.fileToBlob = (file) => {
 var _vm
 async function VueInit () {
   var params
+  var res
   if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
     params = $q('TrialReadingCriterionId')
+    res = await getBasicDataAllSelect(params)
+  } else if (~window.location.href.indexOf('/ecrfPreview')) {
+    params = $q('SystemReadingCriterionId')
+    res = await getBasicDataAllSelect(params, true)
+  } else {
+    res = await getBasicDataAllSelect(params)
   }
-  var res = await getBasicDataAllSelect(params)
   var Internationalization = await getFrontInternationalizationList()
   Vue.prototype.$tl = Internationalization.Result
   let zhMessages = {}, enMessages = {}
diff --git a/src/router/index.js b/src/router/index.js
index bcc946a3..fdaaae06 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -242,6 +242,11 @@ export const constantRoutes = [
     component: () => import('@/views/404'),
     hidden: true
   },
+  {
+    path: '/ecrfPreview',
+    component: () => import('@/views/dictionary/template/components/ECRF'),
+    hidden: true
+  },
   {
     path: '/editUser',
     component: Layout,
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 8bec7ff2..37267972 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -19,6 +19,52 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'group'"
+        label="分组名称"
+        prop="GroupName"
+      >
+        <el-input v-model="form.GroupName" />
+      </el-form-item>
+      <el-form-item
+        label="分组标识"
+        v-if="form.Type === 'group'"
+        prop="GroupClassify"
+      >
+        <el-select
+          v-model="form.GroupClassify"
+          clearable
+        >
+          <el-option
+            v-for="item of groupClassifyList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'group'"
+        label="分组名称（EN）"
+        prop="GroupEnName"
+      >
+        <el-input v-model="form.GroupEnName" />
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        label="问题名称"
+        prop="QuestionName"
+      >
+        <el-input v-model="form.QuestionName" />
+      </el-form-item>
+
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        label="问题名称（EN）"
+        prop="QuestionEnName"
+      >
+        <el-input v-model="form.QuestionEnName" />
+      </el-form-item>
       <!-- 数值类型 -->
       <el-form-item
         v-if="form.Type === 'number' || form.Type === 'calculation'"
@@ -75,52 +121,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'group'"
-        label="分组名称"
-        prop="GroupName"
-      >
-        <el-input v-model="form.GroupName" />
-      </el-form-item>
-      <el-form-item
-        label="分组标识"
-        prop="GroupClassify"
-      >
-        <el-select
-          v-model="form.GroupClassify"
-          clearable
-        >
-          <el-option
-            v-for="item of groupClassifyList"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="item.ValueCN"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'group'"
-        label="分组名称（EN）"
-        prop="GroupEnName"
-      >
-        <el-input v-model="form.GroupEnName" />
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称"
-        prop="QuestionName"
-      >
-        <el-input v-model="form.QuestionName" />
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称（EN）"
-        prop="QuestionEnName"
-      >
-        <el-input v-model="form.QuestionEnName" />
-      </el-form-item>
-
       <!-- <el-form-item
         v-if="form.Type === 'select' || form.Type === 'radio'"
         label="选项"
@@ -170,7 +170,7 @@
           placeholder="选项请用‘|’分割多个选项"
         />
       </el-form-item>
-      <el-form-item label="问题分类">
+      <el-form-item label="问题分类" v-if="form.Type !== 'group'">
         <!-- <el-radio-group v-model="form.QuestionClassify">
           <el-radio v-for="item of $d.QuestionClassify" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group> -->
@@ -406,6 +406,7 @@
       </el-form-item>
       <el-form-item
         label="问题标识"
+        v-if="form.Type !== 'group'"
         prop="QuestionType"
       >
         <el-select
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index a374005b..d4d31ade 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="criterion-config">
     <el-tabs v-model="activeName">
-      <el-tab-pane label="访视阅片" name="0">
+      <el-tab-pane :label="'访视阅片'" name="0">
         <div class="search-form" style="display:flex;justify-content: space-between;">
           <el-form :inline="true" size="mini" class="base-search-form">
             <el-form-item label="名称">
@@ -18,7 +18,7 @@
               :disabled="list.length === 0"
               size="mini"
               type="primary"
-              @click="preview.visible = true"
+              @click="handlePreview"
             >
               预览
             </el-button>
@@ -200,7 +200,7 @@
       v-if="addOrEdit.visible"
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
-      :title="addOrEdit.title"
+      :title="`${addOrEdit.title}`"
       width="600px"
       append-to-body
       custom-class="base-dialog-wrapper"
@@ -303,6 +303,9 @@ export default {
     this.getList()
   },
   methods: {
+    handlePreview() {
+      window.open(`/ecrfPreview?SystemReadingCriterionId=${this.criterionId}&lang=${this.$i18n.locale}`)
+    },
     getList() {
       this.loading = true
       this.searchData.ReadingQuestionCriterionSystemId = this.criterionId
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index 966b1130..e4324074 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -83,6 +83,7 @@
           <el-button
             type="primary"
             size="mini"
+            :disabled="scope.row.IsCompleteConfig"
             @click="handleEdit(scope.row)"
           >
             编辑
@@ -104,6 +105,7 @@
           <el-button
             type="danger"
             size="mini"
+            :disabled="scope.row.IsCompleteConfig"
             @click="handleDelete(scope.row)"
           >
             删除
@@ -133,7 +135,7 @@
 
     <el-dialog
       v-if="configVisible"
-      title="eCRF"
+      :title="'eCRF' + `(${rowData.CriterionName})`"
       :visible.sync="configVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
@@ -145,7 +147,7 @@
 
     <el-dialog
       v-if="configBaseDataVisible"
-      title="基础数据配置"
+      :title="'基础数据配置' + `(${rowData.CriterionName})`"
       :visible.sync="configBaseDataVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
diff --git a/src/views/dictionary/template/components/ECRF.vue b/src/views/dictionary/template/components/ECRF.vue
index 97b05b31..913fa765 100644
--- a/src/views/dictionary/template/components/ECRF.vue
+++ b/src/views/dictionary/template/components/ECRF.vue
@@ -1,109 +1,109 @@
-<template>
-  <div v-loading="loading" style="min-height:400px;">
-    <el-form
-      v-if="isRender"
-      ref="questions"
-      size="small"
-      :model="questionForm"
-    >
-      <CriterionFormItem
-        v-for="question of questions"
-        :key="question.Id"
-        :question="question"
-        :question-form="questionForm"
-        :reading-task-state="readingTaskState"
-        :criterion-id="criterionId"
-        @resetFormItemData="resetFormItemData"
-        @setFormItemData="setFormItemData"
-      />
-    </el-form>
-  </div>
-
-</template>
-
-<script>
-
-import { getSystemReadingQuestion } from '@/api/dictionary'
-import CriterionFormItem from './CriterionFormItem'
-
-export default {
-  name: 'EcrfPreview',
-  components: {
-    CriterionFormItem
-  },
-  props: {
-    criterionId: {
-      type: String,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      questions: [],
-      questionForm: {},
-      publicQuestions: [],
-      isRender: false,
-      readingTaskState: 0,
-      activeName: 0
-    }
-  },
-  mounted() {
-    this.getQuestions()
-  },
-  methods: {
-    getQuestions() {
-      this.loading = true
-      var param = {
-        id: this.criterionId
-      }
-      getSystemReadingQuestion(param).then(res => {
-        res.Result.SinglePage.map((v) => {
-          if (v.Type === 'group' && v.Childrens.length === 0) return
-          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-            this.$set(this.questionForm, v.Id, v.DefaultValue)
-          }
-          if (v.Childrens && v.Childrens.length > 0) {
-            this.setChild(v.Childrens)
-          }
-        })
-        this.questions = res.Result.SinglePage
-
-        this.isRender = true
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    },
-    setChild(obj) {
-      obj.forEach(i => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
-          this.$set(this.questionForm, i.Id, '')
-        }
-        if (i.Childrens && i.Childrens.length > 0) {
-          this.setChild(i.Childrens)
-        }
-      })
-    },
-    resetFormItemData(v) {
-      this.questionForm[v] = ''
-    },
-    setFormItemData(obj) {
-      this.$set(this.questionForm, obj.key, obj.val)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
-  }
-  ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #d0d0d0;
-  }
-.tabContent{
-  height:300px;
-  overflow-y: auto;
-
-}
-</style>
+<template>
+  <div v-loading="loading" style="min-height:400px;">
+    <el-form
+      v-if="isRender"
+      ref="questions"
+      size="small"
+      :model="questionForm"
+    >
+      <CriterionFormItem
+        v-for="question of questions"
+        :key="question.Id"
+        :question="question"
+        :question-form="questionForm"
+        :reading-task-state="readingTaskState"
+        :criterion-id="criterionId"
+        @resetFormItemData="resetFormItemData"
+        @setFormItemData="setFormItemData"
+      />
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+
+import { getSystemReadingQuestion } from '@/api/dictionary'
+import CriterionFormItem from './CriterionFormItem'
+import {mapMutations} from "vuex";
+
+export default {
+  name: 'EcrfPreview',
+  components: {
+    CriterionFormItem
+  },
+  data() {
+    return {
+      loading: false,
+      questions: [],
+      questionForm: {},
+      publicQuestions: [],
+      isRender: false,
+      readingTaskState: 0,
+      activeName: 0
+    }
+  },
+  mounted() {
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+    this.$updateDictionary()
+    this.criterionId = this.$route.query.SystemReadingCriterionId
+    this.getQuestions()
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    getQuestions() {
+      this.loading = true
+      var param = {
+        id: this.criterionId
+      }
+      getSystemReadingQuestion(param).then(res => {
+        res.Result.SinglePage.map((v) => {
+          if (v.Type === 'group' && v.Childrens.length === 0) return
+          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+            this.$set(this.questionForm, v.Id, v.DefaultValue)
+          }
+          if (v.Childrens && v.Childrens.length > 0) {
+            this.setChild(v.Childrens)
+          }
+        })
+        this.questions = res.Result.SinglePage
+
+        this.isRender = true
+        this.loading = false
+      }).catch(() => { this.loading = false })
+    },
+    setChild(obj) {
+      obj.forEach(i => {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
+          this.$set(this.questionForm, i.Id, '')
+        }
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.setChild(i.Childrens)
+        }
+      })
+    },
+    resetFormItemData(v) {
+      this.questionForm[v] = ''
+    },
+    setFormItemData(obj) {
+      this.$set(this.questionForm, obj.key, obj.val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+.tabContent{
+  height:300px;
+  overflow-y: auto;
+
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 522793bd..c25c05cb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -63,7 +63,8 @@ module.exports = {
         // target: 'http://123.56.181.144:8000/api', // 国内测试环境
         // target: 'http://123.56.94.154:8079', // 国内测试环境2
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
-        target: 'http://123.56.94.154:30668',
+        // target: 'http://123.56.94.154:30668',
+        target: 'http://123.56.94.154:30000',
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,