scorpio 2 лет назад
Родитель
Сommit
f9e9f1c96a

+ 1 - 0
src/views/home/component/authorize.vue

@@ -81,6 +81,7 @@
         <vue-qr :currentLevel='3' :logoCornerRadius='4' :logoScale='0.25' :text='qrCodeText'
                 size='340'/>
         <span>右键复制二维码,通过微信进行分享</span>
+        {{qrCodeText}}
       </div>
     </el-dialog>
   </div>

+ 1 - 1
src/views/home/component/item1.vue

@@ -1,7 +1,7 @@
 <template>
   <div class='full-width flex flex-center text-center border-bottom padding-top padding-bottom'>
     <div class='flex-child-average flex flex-align-center'>
-      <div class=' text-left'>{{item.title}}{{item.check}}</div>
+      <div class=' text-left'>{{item.title}}</div>
     </div>
     <div class='flex-child-average'>{{item.createTime}}</div>
     <div >

+ 7 - 3
src/views/task/detail.vue

@@ -1,6 +1,5 @@
 <template>
   <basic-container class='mt-10'>
-    {{view}}
     <div class='flex flex-align-start flex flex-col'>
       <span class='bold'>任务基本信息:</span>
       <el-divider/>
@@ -131,6 +130,10 @@ export default {
           {
             label: '更新时间',
             prop: 'updateTime'
+          },
+          {
+            label: '创建人',
+            prop: 'createUserName'
           }
         ]
       }
@@ -261,6 +264,7 @@ export default {
       this.$api.task.completeTask({ taskId: this.taskId }).then(res => {
         if (res.code === 200) {
           this.$message.success(res.msg)
+          this.taskInfo.isCompleted = 1
         } else {
           this.$message.error(res.msg)
         }
@@ -309,7 +313,7 @@ export default {
         sub.url = sub.filePath
         return sub
       })
-      const data = { dispatcherUser: this.currentFolder.dispatcherUser, folderId: this.currentFolder.folderId, files: this.fileList }
+      const data = { taskId: this.taskId, dispatcherUser: this.currentFolder.dispatcherUser, folderId: this.currentFolder.folderId, files: this.fileList }
       this.$api.task.uploadFile(data).then(res => {
         if (res.code === 200) {
           this.show = false
@@ -327,7 +331,7 @@ export default {
         this.$api.task.taskConfirm({ taskId: this.taskId }).then(res => {
           if (res.code === 200) {
             this.$message.success(res.msg)
-            this.onLoad()
+            this.taskInfo.isConfirmed = 1
           } else {
             this.$message.error(res.msg)
           }