Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

# Conflicts:
#	src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

src/views/trials/trials-panel/reading/medical-feedback/components/FeedbackForm.vue

@@ -486,9 +486,13 @@ export default {
 }
 /deep/  .el-upload-list__item {
     transition: none !important;
+    width: 140px;
+    height: 140px;
+    margin: 0 10px 5px 0;
   }
   /deep/  .el-upload-list__item-thumbnail {
       /* 图片在方框内显示长边 */
+      width: 100%;
       object-fit: scale-down !important;
   }
 }

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -347,9 +347,9 @@
                   <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue"  style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue instanceof Array ? scope.row.oldValue[0] : scope.row.oldValue" :images="imagesList">
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="`${scope.row.oldValue instanceof Array ? scope.row.oldValue[0] : scope.row.oldValue}_modelCfg`" :images="imagesList">
                     <!-- 查看图片 -->
-                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue, 'modelCfg')">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
                        <template v-for="item of scope.row.oldValue">
                           <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                        </template>
@@ -378,9 +378,9 @@
                   <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue instanceof Array ? scope.row.newValue[0] : scope.row.newValue" :images="imagesList">
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="`${scope.row.newValue instanceof Array ? scope.row.newValue[0] : scope.row.newValue}_modelcfg`" :images="imagesList">
                     <!-- 查看图片 -->
-                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue, 'modelcfg')">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
                      <template v-for="item of scope.row.newValue">
                         <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                      </template>
@@ -409,9 +409,9 @@
               :key="'tableList' + index"
             >
               <template v-if="!item.IsMerge" slot-scope="scope">
-                <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
+                <viewer v-if="item.IsPicture" :images="imagesList" :ref="`${scope.row[item.ColumnValue]}_modelcfg`">
                   <!-- 查看图片 -->
-                  <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                  <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue],'modelcfg')">{{$t('trials:auditRecord:title:viewImage')}}</span>
                   <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                 </viewer>
                 <span v-else>{{scope.row[item.ColumnValue]}}</span>
@@ -426,9 +426,9 @@
                   :key="'ChildrenList' + index"
                 >
                   <template slot-scope="scope">
-                    <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]">
+                    <viewer v-if="item.IsPicture" :images="imagesList" :ref="`${scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}_modelcfg`">
                       <!-- 查看图片 -->
-                      <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                      <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue], 'modelcfg')">
                         {{$t('trials:auditRecord:title:viewImage')}}
                       </span>
                       <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
@@ -652,9 +652,9 @@
             />
             <!-- OptType === 'Add' ? '值' : OptType === 'Delete' ? '删除前' : '修改前' -->
             <el-table-column
-              v-if="OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'"
+              v-if="OptType2 !== 'Add' && OptType2 !== 'Upload' && OptType2 !== 'Init'"
               prop="oldValue"
-              :label="OptType === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
+              :label="OptType2 === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType2 === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
               show-overflow-tooltip
             >
               <!-- <template slot-scope="scope">
@@ -692,7 +692,7 @@
             <!-- OptType === 'Add' || OptType === 'Init' ? '值' : OptType === 'Delete' ? '删除后' : '修改后' -->
             <el-table-column
               prop="newValue"
-              :label="OptType === 'Add' || OptType === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
+              :label="OptType2 === 'Add' || OptType2 === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType2 === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
               show-overflow-tooltip
             >
               <!-- <template slot-scope="scope">
@@ -876,6 +876,7 @@ export default {
       siteOptions: [],
       visitPlanOptions: [],
       OptType: null,
+      OptType2: null,
       trialId: this.$route.query.trialId,
       configList2: [],
       otherData2: [],
@@ -896,19 +897,21 @@ export default {
     this.getList()
   },
   methods: {
-    openImage(url) {
+    openImage(url, type) {
       console.log(url)
       
       this.$nextTick(()=>{
         if (url instanceof Array) {
           this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
-          this.$refs[url[0]].$viewer.show()
+          let refName = type ? `${url[0]}_${type}` : url[0]
+          this.$refs[refName].$viewer.show()
         } else {
           this.imagesList = [this.OSSclientConfig.basePath + url]
-          if(this.$refs[url] instanceof Array){
+          let refName = type ? `${url}_${type}` : url
-            this.$refs[url][0].$viewer.show()
+          if(this.$refs[refName] instanceof Array){
+            this.$refs[refName][0].$viewer.show()
           }else{
-            this.$refs[url].$viewer.show()
+            this.$refs[refName].$viewer.show()
           }
         }
       })
@@ -1256,7 +1259,7 @@ export default {
       })
     },
     async lookDetails2(row) {
-      this.OptType = row.OptType
+      this.OptType2 = row.OptType
       var Json = await this.getJSON(row)
       var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null
       var ParentJson = Json[1] ? JSON.parse(Json[1]) : null

src/views/trials/trials-panel/visit/consistency-check/components/uploadExcel.vue

@@ -9,7 +9,7 @@
         <el-upload
           class="upload-demo"
           action
-          accept=".xlsx,.xls,.csv"
+          accept=".xlsx,.xls"
           :before-upload="beforeUpload"
           :http-request="handleUploadFile"
           :on-preview="handlePreview"
@@ -72,7 +72,7 @@ export default {
       this.$message.warning(this.$t('trials:consistencyCheck:message:onlyOneFile'))
     },
     checkFileSuffix(fileName) {
-      var typeArr = ['xls', 'xlsx', 'csv']
+      var typeArr = ['xls', 'xlsx']
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -1657,7 +1657,7 @@ export default {
         this.qcForm.qcContent.forEach((item) => {
           if (item.isSelect) {
             types.push(`${item.keyName}`)
-            var str = `${item.keyName} <br>`
+            var str = `${item.keyName}<br>`
             if (item.keyValue) {
               // 问题总结
               str = `${str}${this.$t(
@@ -1667,9 +1667,7 @@ export default {
             if (item.actionContent) {
               // 行动事项
               actions.push(`${item.actionContent}`)
-              str = `${str}${this.$t('trials:audit:form:actionMatters')}：<br>${
+              str = `${str}${this.$t('trials:audit:form:actionMatters')}：<br><div style='margin-left:20px'>${item.actionContent}</div>`
-                item.actionContent
-              }<br>`
             }
             contents.push(str)
           }

vue.config.js

@@ -64,6 +64,7 @@ module.exports = {
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
         // target: 'http://123.56.94.154:30668',
         target: 'http://106.14.89.110:30000',
+		  //target: 'http://localhost:3305',  // 后端测试环境
         // target: 'http://47.117.164.182:7010', // uat
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,