zhuangyunsheng hai 1 ano
pai
achega
ec35d95cb6

+ 1 - 1
src/components/scChengTou/purchase/apply.vue

@@ -131,7 +131,7 @@
 		</el-row>
 	</el-form>
 
-    <el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
+    <el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" :model="form" :rules="rules" label-width="120px">
 		<el-row>
 			<el-col :xs="24">
                 <el-form-item label="初稿:">

+ 3 - 3
src/components/scChengTou/purchase/handler.vue

@@ -150,7 +150,7 @@
 	</el-form>
 
     <template v-if="mode == 'purchase_bid_sign' || mode == 'purchase_answer_sign'">
-        <el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" ref="dialogForm" :model="form" :rules="rules" label-width="140px">
+        <el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" :model="form" :rules="rules" label-width="140px">
             <el-row>
                 <el-col :xs="24">
                     <el-form-item :class="!updateFolder && 'no-upload-btn'" label="初稿:">
@@ -177,7 +177,7 @@
                     <el-form-item class="iframe-item__btn" label-width="0">
                         <template v-if="updateFolder">
                             <el-button @click="updateFolder = !updateFolder">取 消</el-button>
-                            <el-button type="primary" :loading="isSaveing" @click="submit">确 定</el-button>
+                            <el-button type="primary" :loading="isSaveing" @click="updateFile">确 定</el-button>
                         </template>
                         <template v-else>
                             <el-button type="primary" @click="updateFolder = !updateFolder">编 辑</el-button>
@@ -363,7 +363,7 @@
 				this.form.bidCompanyName = e && e.map(id => this.suppliers.find(s => s.id == id) && this.suppliers.find(s => s.id == id).supplierName || null).join() || null;
 			},
 
-            submit() {
+            updateFile() {
                 const data = {};
 				for (const key in this.form) {
 					if (key == "folders") {

+ 1 - 1
src/components/scChengTou/purchase/plan.vue

@@ -114,7 +114,7 @@
 		</el-row>
 	</el-form>
 
-	<el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" ref="dialogForm" :model="form" :rules="rules" label-width="120px">
+	<el-form v-loading="loading" :class="['dialog-form', !updateFolder && 'dialog-form-disabled']" :model="form" :rules="rules" label-width="120px">
 		<el-row>
 			<el-col :xs="24">
                 <el-form-item label="初稿:">

+ 9 - 15
src/router/index.js

@@ -1,5 +1,5 @@
 import { createRouter, createWebHashHistory } from "vue-router";
-import { ElMessageBox } from "element-plus";//ElNotification, 
+import { ElNotification, ElMessageBox } from "element-plus";
 import config from "@/config";
 import NProgress from "nprogress";
 import "nprogress/nprogress.css";
@@ -170,24 +170,18 @@ router.afterEach((to, from) => {
 });
 
 router.onError((error) => {
-    ElMessageBox.confirm(`routerError:message: ${error.message}`, 'Warning', {
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel',
-        type: 'warning',
-        center: true,
-    })
-    ElMessageBox.confirm(`routerError:targetPath: ${router.history.pending.fullPath}`, 'Warning', {
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel',
-        type: 'warning',
-        center: true,
-    })
     NProgress.done();
+    ElNotification.error({
+        title: "路由错误",
+        message: error.message
+    });
+
     // const pattern = /Loading chunk (\d)+ failed/g;
     // const isChunkLoadFailed = error.message.match(pattern);
     // const targetPath = router.history.pending.fullPath;
-    // if (isChunkLoadFailed) router.replace(targetPath);
-    // else ElNotification.error({ title: "路由错误", message: error.message });
+    // if (isChunkLoadFailed) {
+    //     router.replace(targetPath);
+    // }
 });
 
 // 生成路由对象