zhuangyunsheng преди 1 година
родител
ревизия
261cb4425d

+ 9 - 8
src/components/scChengTou/approveIframe.vue

@@ -60,20 +60,21 @@
 				return this;
 			},
 
-			async setData() {
-				try {
-					const res = await this.$API.auth.gldMaster.getToken();
-					this.params.formId = await this.$API.auth.gldMaster.getFormId({ busType: this.mode });
-					
+			setData() {
+				Promise.all([
+					this.$API.auth.gldMaster.getToken(),
+					this.$API.auth.gldMaster.getFormId({ busType: this.mode }).catch(() => this.params.formId)
+				]).then(([res, formId]) => {
 					this.host = res.host;
+					
+					this.params.formId = formId;
 					for (const key in this.params) {
 						if (res[key]) this.params[key] = res[key];
 					}
-				} catch (error) {
+				}).catch(() => {
 					this.visible = false;
 					this.host = "";
-					this.params.formId = "";
-				}
+				});
 			}
 		}
 	}

+ 15 - 15
src/views/procurement/ledger/index.vue

@@ -109,11 +109,11 @@
                                         </template>
                                     </el-table-column>
                                 </template>
-                                <el-table-column label="合同附件" align="center" show-overflow-tooltip>
+                                <!-- <el-table-column label="合同附件" align="center" show-overflow-tooltip>
                                     <template #default="scope_c">
                                         <el-button :loading="downloadLoading" text @click="downloadFile(scope_c.row)">{{ scope_c.row.fileName }}</el-button>
                                     </template>
-                                </el-table-column>
+                                </el-table-column> -->
                             </el-table>
                         </template>
                     </el-table-column>
@@ -295,19 +295,19 @@ export default {
             exportExcel(header, data, merges, "招标台账.xlsx");
         },
 
-        async downloadFile({ objectId, fileName }) {
-            try {
-                this.downloadLoading = true;
-                const res = await this.$API.procurement.contract.download({ objectId, fileName });
-                this.downloadLoading = false;
-                const a = document.createElement("a");
-                a.href = URL.createObjectURL(res);
-                a.download = fileName;
-                a.click();
-            } catch (error) {
-                this.downloadLoading = false;
-            }
-        }
+        // async downloadFile({ objectId, fileName }) {
+        //     try {
+        //         this.downloadLoading = true;
+        //         const res = await this.$API.procurement.contract.download({ objectId, fileName });
+        //         this.downloadLoading = false;
+        //         const a = document.createElement("a");
+        //         a.href = URL.createObjectURL(res);
+        //         a.download = fileName;
+        //         a.click();
+        //     } catch (error) {
+        //         this.downloadLoading = false;
+        //     }
+        // }
     }
 }
 </script>

+ 2 - 2
src/views/supplier/evaluation/components/add.vue

@@ -131,7 +131,7 @@
 			submit() {
 				this.$refs.dialogForm.validate(valid => {
 					if (valid) {
-						this.form.evaluateDetailList = this.form.person.map(item => ({ evaluatorId: item.id, evaluatorName: item.nickName }))
+						this.form.evaluateDetailList = this.form.person.map(item => ({ evaluatorId: item.id, evaluatorName: item.nickName }));
 						this.isSaveing = true;
 						this.$API.supplier.evaluate[this.mode](this.form).then(() => {
 							this.isSaveing = false;
@@ -142,7 +142,7 @@
 					} else {
 						return false;
 					}
-				})
+				});
 			}
 		}
 	}

+ 1 - 1
src/views/supplier/evaluation/components/detail.vue

@@ -16,7 +16,7 @@
 						<template #status="scope">{{ formatStatus(scope.row) }}</template>
 						<el-table-column label="操作" fixed="right" align="center" width="140">
 							<template #default="scope">
-								<template v-if="isEvaluator &&  scope.row.status == 'evaluate'">
+								<template v-if="isEvaluator && scope.row.status == 'evaluate'">
 									<el-button text @click="table_add(scope.row)">评价</el-button>
 									<el-divider v-if="scope.row.status == 'done'" v-auth="'eval.back'" direction="vertical" />
 								</template>