duy 1 rok pred
rodič
commit
c9d9e21352

+ 6 - 1
src/global/components/hc-tasks-user/index.vue

@@ -272,7 +272,12 @@ const setUserDataList = (users) => {
 
 //展开弹窗
 const showModalClick = () => {
-    showModal.value = true
+    if (!disabled.value) {
+        showModal.value = true
+    } else {
+        showModal.value = false
+    }
+   
 }
 
 //获取系统所有角色划分

+ 15 - 4
src/views/patrol/add.vue

@@ -168,7 +168,7 @@
                             <hc-table-input v-model="row.key4" type="textarea" :disabled="type === 'review' || type === 'view'" />
                         </template>
                         <template #key5="{ row }">
-                            <el-link v-if="true" type="primary" :disabled="type === 'review' || type === 'view'" @click="clickUpload">上传</el-link>
+                            <el-link v-if="!row?.ishowImage" type="primary" :disabled="type === 'review' || type === 'view'" @click="clickUpload(row)">上传</el-link>
                        
                             <el-image v-else style="width: 100px; height: 100px" src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg" />
                         </template>
@@ -223,9 +223,12 @@
         <HcUploadFile
             ref="HcUploadFileRef"
             :options="UploadFileOptions"
+            :params="uploadFileParams"
+            :echo-params="uploadFileEchoParams"
             @progress="HcUploadFileProgress"
             @success="HcUploadFileSuccess"
             @change="HcUploadFileChange"
+            @finish="HcUploadFileFinish"
         />
     </div>
 </template>
@@ -340,25 +343,33 @@ onActivated(()=>{
 const HcUploadFileRef = ref(null)
 const clickUpload = ()=>{
     HcUploadFileRef.value?.selectFile()
+    uploadFileEchoParams.value = { type:'image' }
 }
 //上传配置
 const UploadFileOptions = {
     //此处设置header
     headers: getTokenHeader(),
 }
-
+const uploadFileParams = ref({})
+const uploadFileEchoParams = ref({})
 // 文件上传进度
 const HcUploadFileProgress = (res) => {
     console.log('文件上传进度', res)
 }
 // 文件上传成功的回调
-const HcUploadFileSuccess = (res) => {
-    console.log('文件上传成功', res)
+const HcUploadFileSuccess = ({ echoParams, resData }) => {
+   
+    console.log(echoParams, 'echoParams')
+    console.log(resData, 'resData')
 }
 
 // 文件全部上传成功
 const HcUploadFileChange = () => {
     console.log('文件全部上传成功')
+
+}
+const HcUploadFileFinish = ()=>{
+    HcUploadFileRef.value?.setModalShow(false)
 }
 const ishowPeople = ref(false)
 //选择整改人