Merge branch 'develop' into xuxiaoming

package.json

@@ -15,9 +15,9 @@
     "core-js": "^3.6.5",
     "echarts": "^5.2.0",
     "element-china-area-data": "^5.0.2",
-    "element-plus": "^1.0.2-beta.48",
+    "element-plus": "^1.2.0-beta.6",
     "moment": "^2.29.1",
-    "vue": "^3.2.0",
+    "vue": "^3.2.26",
     "vue-picture-cropper": "^0.1.11",
     "vue-router": "^4.0.0-0",
     "vuex": "^4.0.0-0"

src/main.js

@@ -5,7 +5,7 @@ import Vuex from 'vuex'
 import { modules } from "./store";
 import ElementPlus from "element-plus";
 import './icons'
-import "element-plus/lib/theme-chalk/index.css";
+import "element-plus/dist/index.css";
 import "dayjs/locale/zh-cn";
 import "./assets/css/base.css";
 import locale from "element-plus/lib/locale/lang/zh-cn";

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -79,7 +79,7 @@
 							<el-table
 								:data="formData['AP_CustDemandVerHead-CustomerItem']"
 								size="mini"
-								height="460px"
+								height="560px"
 								style="width: 100%; margin-top: 20px;"
 								border>
 								<el-table-column label="零件" width="180">