Merge branch 'zcwy-0306' into dev0223

src/views/evaluation/evaluationUpload.vue

@@ -512,7 +512,7 @@
                   <a-button type="link" @click="powerSetting(record)">
                     <span>权限配置</span>
                   </a-button>
-                  <a-button type="link" :disabled="record.status==0" @click="textEnableAdd(record)">
+                  <a-button type="link" :disabled="record.status==0||record.statusList == 0" @click="textEnableAdd(record)">
                     <span>启用</span>
                   </a-button>
                   <a-button type="link" @click="textDeleteAdd(record,index)">
@@ -967,7 +967,7 @@ import { message } from "ant-design-vue";
       }
       const downloadAll = async (record) => {
         console.log(record,'record')
-        // window.open(`${process.env.VUE_APP_BASE_API}/activityApi/evaluation/detaildownload?id=${record.id}`);
+        window.open(`/activityApi/evaluation/detaildownload?id=${record.id}`);
       }
       const of_exit = () => {
         state.bg_check = false;
@@ -1009,8 +1009,7 @@ import { message } from "ant-design-vue";
           })
         }
         if(state.valueAll.length != 0){
-          console.log(state.valueAll,'valueAll')
-          await saveEvaluationDetail({evaluationDetailListlist:state.valueAll}).then((res)=>{
+          await saveEvaluationDetail({evaluationDetailListlist:state.valueAll,pid:state.uploadId}).then((res)=>{
             console.log(res.data,'json')
           })
         }
@@ -1118,7 +1117,8 @@ import { message } from "ant-design-vue";
           content: '请您确认是否要清空全部报告？',
           ok: () => {
             clear({
-              creatId:record.id
+              createId:record.id,
+              id:record.id
             }).then((res)=>{
               console.log(res,'data')
               message.success('清空成功')
@@ -1222,6 +1222,7 @@ import { message } from "ant-design-vue";
       }
       //添加权限确定
       const addSettingUp = async () => {
+        console.log(state.saveList,'state.saveList')
         await savePermission({userList:state.saveList,pid:state.saveListPid})
         saveListItem()
         of_addsetting()
@@ -1239,6 +1240,7 @@ import { message } from "ant-design-vue";
           if(res.code === 200){
             console.log(res,'res')
             message.success('启用成功')
+            record.statusList = 0
             state.saveList.push(record)
           }
         })