Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into lingxiao

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

@@ -84,7 +84,11 @@
 					</el-row>
       </el-form>
 			<!-- 上传 -->
-			<uploadTemplate v-if="isShowDialog === 'upload'" :item="item" v-model:isShowDialog="isShowDialog" @editCallBack="completeCallBack" />
+			<uploadTemplate
+				v-if="isShowDialog === 'upload'"
+				:item="item"
+				v-model:isShowDialog="isShowDialog"
+				@editCallBack="completeCallBack" />
 		</ContentContainer>
 	</div>
 </template>
@@ -100,6 +104,7 @@ export default {
 		return {
 			item: this.$route.query,
 			isShowDialog: '',
+			importSuccess: false,
 			title: "",
 			headers: [],
 			formData: {},
@@ -198,7 +203,6 @@ export default {
         .then(() => {
           this.msgSuccess("删除成功");
 					this.$router.push({path:'/plan/workbench/homePage',query: {CustomerId: this.item.CustomerId}})
-          // this.$router.push({path:'/plan/workbench/homePage'})
         })
         .catch(() => { });
     },
@@ -226,8 +230,12 @@ export default {
 		handleUpload() {
 			this.isShowDialog = 'upload'
 		},
-		completeCallBack() {
+		completeCallBack(data) {
 			this.isShowDialog = ''
+			console.log(data)
+			if (data) {
+				this.handleUpdate(this.item.CustomerId, this.item.VersionId)
+			}
 		},
 	},
 }

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

@@ -61,6 +61,7 @@ export default {
               message: '导入成功',
               type: 'success'
             })
+						this.$emit('editCallBack', true)
           } else {
             this.$message({
               showClose: true,

src/views/plan/workbench/homePage/customer/index.vue

@@ -83,9 +83,10 @@ import { get } from "@/server/api.js";
 	height: calc(100% - 50px);
 	.customer-tree-wrapper-tree {
 		padding-left: 10px;
+		height: 100%;
 		.customer-filter-tree {
 			background: #F1F1F1;
-			height: calc(100% - 50px);
+			height: calc(100% - 10px);
 			overflow-y: auto;
 		}
 		.el-tree-node__content {

src/views/plan/workbench/materialAnalysis/filter/index.vue

@@ -17,8 +17,8 @@
 				</el-form-item>
 				<div class="mt20">
 					<el-radio-group v-model="queryParams.withTheRingRadio" @change="ringRadioChange">
-						<el-radio label="same">同比</el-radio>
-						<el-radio label="ring">环比</el-radio>
+						<el-radio label="ring">同比</el-radio>
+						<el-radio label="same">还比</el-radio>
 					</el-radio-group>
 				</div>
 				<div class="mt20">