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

@@ -51,8 +51,8 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-form ref="revenusForm" size="small" label-width="400px" :label-position="'top'" :rules="rules" :model="form"
-          v-if="false">
+        <el-form ref="revenusForm" size="small" label-width="400px" :label-position="'top'" :rules="rules"
+          :model="form">
           <!-- IRC与实际情况影像检查不一致的原因为： -->
           <el-form-item v-if="isLackOf" :label="$t('trials:consistencyCheck:title:title1')" prop="reason">
             <el-checkbox-group v-model="form.reason" style="display: flex;flex-direction: column">
@@ -204,8 +204,8 @@ export default {
           this.$alert(this.$t('trials:consistencyCheck:title:title4'))
           return
         }
-        // let valid = await this.$refs.revenusForm.validate()
-        // if (!valid) return
+        let valid = await this.$refs.revenusForm.validate()
+        if (!valid) return
         let confirm = true
         if (this.msgList.every(item => !item.IsCheck)) {
           confirm = await this.$confirm(this.$t('trials:consistencyCheck:title:confirm'), '', {
@@ -231,7 +231,6 @@ export default {
           TalkContent += message
         })
         if (this.isLackOf) {
-          TalkContent += `<br>${this.$t('trials:consistencyCheck:title:title13')}`
           // TalkContent += '<br>'
           // // 'IRC与实际情况不一致影像检查如下：<br>'
           // TalkContent += `${this.$t('trials:consistencyCheck:title:title7')}<br>`
@@ -240,23 +239,21 @@ export default {
           //   msg = msg.replace('xxx', v.Modality)
           //   TalkContent += `${i + 1}.${msg}（${v.IsJoin && !v.IsCheck ? this.$t('trials:consistencyCheck:title:title8') : this.$t('trials:consistencyCheck:title:title9')}）<br>`
           // })
+          if (this.form.reason.length > 0) {
+            TalkContent += '<br>'
+            // 'IRC与实际情况影像检查不一致的原因为：<br>'
+            TalkContent += `${this.$t('trials:consistencyCheck:title:title10')}<br>`
 
-
-          // if (this.form.reason.length > 0) {
-          //   TalkContent += '<br>'
-          //   // 'IRC与实际情况影像检查不一致的原因为：<br>'
-          //   TalkContent += `${this.$t('trials:consistencyCheck:title:title10')}<br>`
-
-          //   this.form.reason.forEach((v, i) => {
-          //     TalkContent += `${i + 1}.${v}<br>`
-          //   })
-          // }
+            this.form.reason.forEach((v, i) => {
+              TalkContent += `${i + 1}.${v}<br>`
+            })
+          }
         } else {
           // `<br>IRC与实际情况影像检查一致`
-          TalkContent += `<br>${this.$t('trials:consistencyCheck:title:title11')}`
-          // TalkContent += '<br>'
-          // TalkContent += `${this.$t('trials:consistencyCheck:title:title10')}<br>`
-          // TalkContent += `1.${this.$t('trials:consistencyCheck:title:message10')}<br>`
+          TalkContent += `<br>${this.$t('trials:consistencyCheck:title:title11')}<br>`
+          TalkContent += '<br>'
+          TalkContent += `${this.$t('trials:consistencyCheck:title:title10')}<br>`
+          TalkContent += `1.${this.$t('trials:consistencyCheck:title:message10')}<br>`
         }
         console.log(TalkContent)
         this.$emit('sendMessage', TalkContent, this.closeLoading)

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -320,7 +320,7 @@
               scope.row.IsLostVisit
               " circle :title="$t('trials:crcUpload:action:submit')" @click="handleSubmit(scope.row)" />
             <!-- 退回 -->
-            <el-button :disabled="scope.row.SubmitState * 1 < 2 || scope.row.IsImageBackApplying || scope.row.ChallengeState * 1 === 2
+            <el-button :disabled="scope.row.SubmitState * 1 < 2 || scope.row.IsImageBackApplying
               " v-hasPermi="['trials:trials-panel:visit:crc-upload:back']" icon="el-icon-back" circle
               :title="$t('trials:crcUpload:action:back')" @click="imageBack(scope.row)" />
             <!-- 编辑 -->

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -393,8 +393,7 @@
                   scope.row.CurrentActionUserId !== userId
                   || scope.row.IsImageBackApplying" @click="handleSecondaryQC(scope.row)" />
               <!-- 退回 -->
-              <el-button
-                :disabled="scope.row.SubmitState * 1 < 2 || scope.row.IsImageBackApplying || scope.row.ChallengeState * 1 === 2"
+              <el-button :disabled="scope.row.SubmitState * 1 < 2 || scope.row.IsImageBackApplying"
                 v-hasPermi="['trials:trials-panel:visit:qc-check:back']" icon="el-icon-back" circle
                 :title="$t('trials:qcCheck:button:back')" @click="imageBack(scope.row)" />
             </div>