Merge branch 'uat' into uat_us

src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue

@@ -17,21 +17,6 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
-      <el-form-item
-        :label="$t('common:title:languageType')"
-        prop="LanguageType"
-      >
-        <el-select
-          v-model="form.LanguageType"
-        >
-          <el-option
-            v-for="item of $d.LanguageType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
       <!-- 类型 -->
       <el-form-item
         :label="$t('trials:qcCfg:table:type')"

src/views/trials/trials-panel/setting/medical-audit/index.vue

@@ -326,7 +326,7 @@
   </box-content>
 </template>
 <script>
-import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
+import { addDefaultQuestions , batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
 import DefaultQS from './components/DefaultQsLang'
@@ -334,7 +334,7 @@ import QSForm from './components/QSForm'
 import Pagination from '@/components/Pagination'
 import QuestionsPreview from './components/QuestionsPreview'
 import SignForm from '@/views/trials/components/newSignForm'
-import const_ from '@/const/sign-code'
+import const_ from '@/const/sign-code';
 const searchDataDefault = () => {
   return {
     QuestionName: '',
@@ -382,7 +382,6 @@ export default {
       this.CurrentCriterionType = this.trialCriterionList.find(v => {
         return v.TrialReadingCriterionId === this.trialReadingCriterionId
       }).CriterionType
-      console.log(this.CurrentCriterionType)
     }
   },
   mounted() {
@@ -390,6 +389,23 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
+    // 添加默认问题
+    addDefaultQuestions(){
+      let data = {
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.trialReadingCriterionId,
+        LanguageType: 0
+      }
+      if( this.otherInfo.LanguageType === null ){
+        data.LanguageType = this.$i18n.locale === 'zh' ? 0 : 1
+      } else {
+        data.LanguageType = this.otherInfo.LanguageType
+      }
+      addDefaultQuestions(data).then(res => {
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.getList();
+      })
+    },
     handleSelectionChange(value) {
       this.selectedList = value
     },
@@ -433,7 +449,8 @@ export default {
     },
     // 打开系统模板配置项
     handleAdd() {
-      this.addVisible = true
+      // this.addVisible = true
+      this.addDefaultQuestions();
     },
     handleEdit(row) {
       this.currentRow = { ...row }

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -1272,7 +1272,9 @@ export default {
       //   ",",
       //   " | "
       // );
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split("|");
+      let BodyPartTypes = res.BodyPartTypes;
+      this.form.BodyPartTypes = "";
+      this.form.BodyPartTypeList = BodyPartTypes.split("|");
       let r = await this.getTrialBodyPartList();
       if (r) {
         var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {