소스 검색

素材库bug

wangguangping 3 년 전
부모
커밋
68507f9e03
2개의 변경된 파일73개의 추가작업 그리고 7개의 파일을 삭제
  1. 72 6
      src/pages/main/memberFamily/empInfoFilling.vue
  2. 1 1
      src/pages/main/terminal/advertmaterial.vue

+ 72 - 6
src/pages/main/memberFamily/empInfoFilling.vue

@@ -470,11 +470,43 @@
                     this.infolist = {};
                     this.dialogStatus = false;
                 }else{
+
+                    let _this = this;
                     let infodata1 = JSON.parse(JSON.stringify(this.infodata))
                     let infodataLast = infodata1[infodata1.length-1]
-
+                    
                     if(Object.keys(infodataLast).length >= 2){
-                        if(!infodataLast.memberRelation){
+                        if(!infodataLast.memberRelation && !infodataLast.memberName && !infodataLast.memberSex && !infodataLast.idCard){
+                            this.loadinged = true;
+                        this.$http({
+                            url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
+                            method: "post",
+                            headers: {
+                                "Content-Type": "application/json",
+                                "page": '{"pageNo":"' + 1 + '","pageSize":"100"}'
+                            },
+                            data: infodata1,
+                        }).then((res) => {
+                            // this.infolist = {};
+                            // this.dialogStatus = false;
+                            this.loadinged = false;
+                            if (res.data.result === 1) {
+                                _this.$message({
+                                    message: res.data.desc,
+                                    type: 'error'
+                                });
+                            } else {
+                                _this.$message({
+                                    message: '成功',
+                                    type: 'success'
+                                });
+                                _this.infolist = {};
+                                _this.dialogStatus = false;
+                                _this.getList({}, _this.pageSize);
+                            }
+                        });
+                        }else if(!infodataLast.memberRelation || !infodataLast.memberName || !infodataLast.memberSex || !infodataLast.idCard){
+                            if(!infodataLast.memberRelation){
                             this.$message({
                                 message: '请填写成员关系',
                                 type: 'error'
@@ -504,6 +536,7 @@
                             });
                             return false
                         }
+                        this.loadinged = true;
                         this.$http({
                             url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
                             method: "post",
@@ -513,10 +546,28 @@
                             },
                             data: infodata1,
                         }).then((res) => {
-                            this.infolist = {};
-                            this.dialogStatus = false;
+                            // this.infolist = {};
+                            // this.dialogStatus = false;
+                            this.loadinged = false;
+                            if (res.data.result === 1) {
+                                _this.$message({
+                                    message: res.data.desc,
+                                    type: 'error'
+                                });
+                            } else {
+                                _this.$message({
+                                    message: '成功',
+                                    type: 'success'
+                                });
+                                _this.infolist = {};
+                                _this.dialogStatus = false;
+                                _this.getList({}, _this.pageSize);
+                            }
                         });
+                        }
+                        
                     }else if(Object.keys(infodataLast).length == 1){
+                        this.loadinged = true;
                         this.$http({
                             url: "/market/cMemberFillDetail/saveFillDetailSummaryNew",
                             method: "post",
@@ -526,8 +577,23 @@
                             },
                             data: infodata1,
                         }).then((res) => {
-                            this.infolist = {};
-                            this.dialogStatus = false;
+                            // this.infolist = {};
+                            // this.dialogStatus = false;
+                            this.loadinged = false;
+                            if (res.data.result === 1) {
+                                _this.$message({
+                                    message: res.data.desc,
+                                    type: 'error'
+                                });
+                            } else {
+                                _this.$message({
+                                    message: '成功',
+                                    type: 'success'
+                                });
+                                _this.infolist = {};
+                                _this.dialogStatus = false;
+                                _this.getList({}, _this.pageSize);
+                            }
                         });
                     }
 

+ 1 - 1
src/pages/main/terminal/advertmaterial.vue

@@ -390,7 +390,7 @@
         }
 
         .img-box {
-            height: 100%;
+            height: 90%;
 
             .boximg {
                 height: calc(100% - 190px);