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

.env.prod

@@ -6,7 +6,7 @@ NODE_ENV = 'prod'
 VUE_APP_BASE_PATH = '/'
 
 # onlyoffice地址
-VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
+VUE_APP_ONLYOFFICE_URL = "https://office.extimaging.com"
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = true

.env.production

@@ -4,7 +4,7 @@ NODE_ENV = 'production'
 # base public path
 VUE_APP_BASE_PATH = '/'
 # onlyoffice地址
-VUE_APP_ONLYOFFICE_URL = "https://onlyoffice.test.extimaging.com"
+VUE_APP_ONLYOFFICE_URL = "https://office.extimaging.com"
 
 VUE_APP_IS_TEST = true
 

src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue

@@ -36,10 +36,10 @@
         <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
       </el-form-item>
       <el-form-item :label="$t('dictionary:signature:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
-        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="1" :max="1000" />
+        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="0" :max="1000" />
       </el-form-item>
       <el-form-item :label="$t('dictionary:signature:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
-        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="1" :max="1000" />
+        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="0" :max="1000" />
       </el-form-item>
       <!-- <el-form-item v-if="form.Id !== ''" label="是否废除: ">
         <el-radio-group v-model="form.IsDeleted">
@@ -77,11 +77,11 @@ export default {
         FileTypeId: '',
         Name: '',
         Path: '',
-        IsPublish: null,
+        IsPublish: false,
         IsDeleted: true,
         SignViewMinimumMinutes: null,
         DocUserSignType: 0,
-        CurrentStaffTrainDays: null,
+        CurrentStaffTrainDays: 1,
         NewStaffTrainDays: 14,
       },
       rules: {

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

@@ -287,7 +287,7 @@
         <el-table-column
           v-if="hasPermi(['trials:trials-panel:visit:crc-question:send'])"
           :label="$t('common:action:action')"
-          width="100"
+          min-width="100"
           fixed="right"
         >
           <template slot-scope="scope">

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

@@ -1007,15 +1007,30 @@ export default {
     // 申请影像退回
     async imageBack(row) {
       try {
-        let confirm = await this.$confirm(this.$t("trials:crcUpload:confirmMessage:imageBack"))
+        this.$prompt(`<span style="color:#F56C6C">*</span><span>${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}</span>`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
-        if (!confirm) return false
+          confirmButtonText: this.$t("common:button:save"),
-        let params = {
+          cancelButtonText: this.$t("common:button:cancel"),
-          SubjectVisitId: row.Id
+          dangerouslyUseHTMLString: true,
-        }
+          inputValidator: (val) => {
-        let res = await requestImageBack(params)
+            if (!val) return this.$t("common:ruleMessage:specify")
-        if (res.IsSuccess) {
+          },
-          this.getList()
+          inputErrorMessage: this.$t("common:ruleMessage:specify")
-        }
+        }).then(async ({ value }) => {
+          let params = {
+            SubjectVisitId: row.Id,
+            ApplyReason: value
+          }
+          // return console.log(params)
+          let res = await requestImageBack(params)
+
+          if (res.IsSuccess) {
+            this.getList()
+          }
+        }).catch(() => {
+
+        });
+        // let confirm = await this.$confirm(this.$t("trials:crcUpload:confirmMessage:imageBack"))
+        // if (!confirm) return false
       } catch (err) {
         console.log(err)
       }

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

@@ -697,15 +697,30 @@ export default {
     // 申请影像退回
     async imageBack(row) {
       try {
-        let confirm = await this.$confirm(this.$t("trials:qcCheck:confirmMessage:imageBack"))
+        this.$prompt(`<span style="color:#F56C6C">*</span><span>${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}</span>`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
-        if (!confirm) return false
+          confirmButtonText: this.$t("common:button:save"),
-        let params = {
+          cancelButtonText: this.$t("common:button:cancel"),
-          SubjectVisitId: row.Id
+          dangerouslyUseHTMLString: true,
-        }
+          inputValidator: (val) => {
-        let res = await requestImageBack(params)
+            if (!val) return this.$t("common:ruleMessage:specify")
-        if (res.IsSuccess) {
+          },
-          this.getList()
+          inputErrorMessage: this.$t("common:ruleMessage:specify")
-        }
+        }).then(async ({ value }) => {
+          let params = {
+            SubjectVisitId: row.Id,
+            ApplyReason: value
+          }
+          // return console.log(params)
+          let res = await requestImageBack(params)
+
+          if (res.IsSuccess) {
+            this.getList()
+          }
+        }).catch(() => {
+
+        });
+        // let confirm = await this.$confirm(this.$t("trials:crcUpload:confirmMessage:imageBack"))
+        // if (!confirm) return false
       } catch (err) {
         console.log(err)
       }

src/views/trials/trials-panel/visit/reupload-audit/index.vue

@@ -108,17 +108,17 @@
                 </el-table-column>
                 <!-- 中心编号 -->
                 <el-table-column prop="TrialSiteCode" :label="$t('trials:reuploadAudit:table:siteId')"
-                    show-overflow-tooltip sortable="custom" />
+                    show-overflow-tooltip sortable="custom" min-width="120px" />
                 <!-- 受试者编号 -->
                 <el-table-column prop="SubjectCode" :label="$t('trials:reuploadAudit:table:subjectId')"
-                    show-overflow-tooltip sortable="custom" width="120px" />
+                    show-overflow-tooltip sortable="custom" min-width="120px" />
                 <!-- 访视名称 -->
                 <el-table-column prop="VisitName" :label="$t('trials:reuploadAudit:table:visitName')"
-                    show-overflow-tooltip sortable="custom">
+                    show-overflow-tooltip sortable="custom" min-width="120px">
                 </el-table-column>
                 <!-- 最晚拍片日期 -->
                 <el-table-column prop="LatestScanDate" :label="$t('trials:reuploadAudit:table:lScanDate')"
-                    show-overflow-tooltip width="170" sortable="custom">
+                    show-overflow-tooltip min-width="170" sortable="custom">
                     <template slot-scope="scope">
                         <el-tooltip class="item" effect="dark" :content="`${scope.row.EarliestScanDate
                             ? moment(scope.row.EarliestScanDate).format('YYYY-MM-DD')
@@ -139,34 +139,41 @@
                 </el-table-column>
                 <!-- 提交时间 -->
                 <el-table-column prop="SubmitTime" :label="$t('trials:reuploadAudit:table:SubmitTime')"
-                    show-overflow-tooltip sortable="custom" width="150px" />
+                    show-overflow-tooltip sortable="custom" min-width="150px" />
                 <!-- 申请人 -->
                 <el-table-column prop="CreateUserFullName" :label="$t('trials:reuploadAudit:table:createUserFullName')"
-                    show-overflow-tooltip sortable="custom" />
+                    show-overflow-tooltip sortable="custom" min-width="120px" />
                 <!-- 申请人角色 -->
                 <el-table-column prop="ApplyUserRole" :label="$t('trials:reuploadAudit:table:applyUserRole')"
-                    show-overflow-tooltip sortable="custom" width="120px">
+                    show-overflow-tooltip sortable="custom" min-width="120px">
                     <template slot-scope="scope">
                         <span>{{ $fd('ImageBackApplyEnum',
                             scope.row.ApplyUserRole) }}</span>
                     </template>
                 </el-table-column>
+                <!-- 申请原因 -->
+                <el-table-column prop="ApplyReason" :label="$t('trials:reuploadAudit:table:ApplyReason')"
+                    show-overflow-tooltip sortable="custom" min-width="120px" />
                 <!-- 申请时间 -->
                 <el-table-column prop="CreateTime" :label="$t('trials:reuploadAudit:table:createTime')"
-                    show-overflow-tooltip sortable="custom" width="150px" />
+                    show-overflow-tooltip sortable="custom" min-width="150px" />
                 <!-- 审核状态 -->
                 <el-table-column prop="ImageBackState" :label="$t('trials:reuploadAudit:table:imageBackState')"
-                    show-overflow-tooltip sortable="custom">
+                    show-overflow-tooltip sortable="custom" min-width="120px">
                     <template slot-scope="scope">
                         <el-tag :type="['warning', '', 'danger'][scope.row.ImageBackState]">{{ $fd('ImageBackstateEnum',
                             scope.row.ImageBackState) }}</el-tag>
                     </template>
                 </el-table-column>
+                <!-- 备注 -->
+                <el-table-column prop="ResultRemark" :label="$t('trials:reuploadAudit:table:ResultRemark')"
+                    show-overflow-tooltip sortable="custom" min-width="120px" />
                 <!-- 审核时间 -->
                 <el-table-column prop="AuditTime" :label="$t('trials:reuploadAudit:table:auditTime')"
-                    show-overflow-tooltip sortable="custom" width="150px" />
+                    show-overflow-tooltip sortable="custom" min-width="150px" />
                 <el-table-column :label="$t('common:action:action')" fixed="right"
-                    v-if="hasPermi(['trials:trials-panel:visit:reupload-audit:agree', 'trials:trials-panel:visit:reupload-audit:refuse'])">
+                    v-if="hasPermi(['trials:trials-panel:visit:reupload-audit:agree', 'trials:trials-panel:visit:reupload-audit:refuse'])"
+                    min-width="120px">
                     <template slot-scope="scope">
                         <el-button :title="$t('trials:reuploadAudit:button:auditYes')"
                             v-hasPermi="['trials:trials-panel:visit:reupload-audit:agree']" circle
@@ -255,18 +262,39 @@ export default {
         async audit(row, state) {
             try {
                 let message = this.$t("trials:reuploadAudit:confirmMessage:imageBack").replace("xxx", this.$fd("ImageBackstateEnum", state))
-                let confirm = await this.$confirm(message)
+                this.$prompt(this.$t("trials:reuploadAudit:confirmMessage:ResultRemark"), message, {
-                if (!confirm) return false
+                    confirmButtonText: this.$t("common:button:save"),
-                let params = {
+                    cancelButtonText: this.$t("common:button:cancel"),
-                    IamgeBackRecordId: row.Id,
+                }).then(async ({ value }) => {
-                    IsAgree: state === 1 ? true : false
+                    let params = {
-                }
+                        IamgeBackRecordId: row.Id,
-                this.loading = true
+                        IsAgree: state === 1 ? true : false,
-                let res = await auditImageBack(params)
+                        ResultRemark: value
-                this.loading = false
+                    }
-                if (res.IsSuccess) {
+                    // return console.log(params)
-                    this.getList()
+                    this.loading = true
-                }
+                    let res = await auditImageBack(params)
+                    this.loading = false
+                    if (res.IsSuccess) {
+                        this.getList()
+                    }
+                }).catch(() => {
+
+                });
+
+                // let confirm = await this.$confirm(message)
+                // if (!confirm) return false
+                // let params = {
+                //     IamgeBackRecordId: row.Id,
+                //     IsAgree: state === 1 ? true : false,
+                //     ResultRemark
+                // }
+                // this.loading = true
+                // let res = await auditImageBack(params)
+                // this.loading = false
+                // if (res.IsSuccess) {
+                //     this.getList()
+                // }
             } catch (err) {
                 console.log(err)
                 this.loading = false