Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/components/sale/backflow-form.vue

@@ -174,13 +174,13 @@
     },
     mounted() {
       this.getStuBaclFlow();
-      console.log("setingObj", this.setingObj);
     },
     methods: {
       getStuBaclFlow() {
         queryBackBillAduitInfo(this.qMsg).then(res => {
-          console.log("res", res);
-          this.DataList = res.Data;
+          if (res.Code == 1) {
+            this.DataList = res.Data;
+          }
         })
       }
     },

src/components/sale/backinfo-form.vue

@@ -45,35 +45,41 @@
     font-weight: bold;
     color: #111111;
   }
-  .backinfoContent .chaosong_Peo{
+
+  .backinfoContent .chaosong_Peo {
     display: inline-block;
-    padding:2px 3px;
-    color:#fff;
+    padding: 2px 3px;
+    color: #fff;
     border-radius: 3px;
-    margin:0 5px 5px 0;
+    margin: 0 5px 5px 0;
     background-color: #9cf;
   }
-  .backinfoContent .topBaseInfo{
+
+  .backinfoContent .topBaseInfo {
     height: 300px;
     overflow: auto;
   }
+
   .topBaseInfo::-webkit-scrollbar {
     width: 3px;
     height: 3px;
     background-color: #F5F5F5;
   }
+
   /*!*定义滚动条轨道 内阴影+圆角*!*/
   .topBaseInfo::-webkit-scrollbar-track {
     -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
     border-radius: 10px;
     background-color: #F5F5F5;
   }
+
   /*!*定义滑块 内阴影+圆角*!*/
   .topBaseInfo::-webkit-scrollbar-thumb {
     border-radius: 10px;
     -webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
     background-color: #0ae;
   }
+
 </style>
 <template>
   <div class="backinfoContent">
@@ -210,9 +216,9 @@
                 <q-banner>
                   <div style="width:350px;">
                     <div style="margin:10px 0 15px 0;">抄送</div>
-                    <q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input option-value="Id"
-                      option-label="EmployeeName" v-model="tempPeople" ref="ManagerId" :options="EmployeeList"
-                      label="选择人员" :dense="false" emit-value map-options @filter="filterFn">
+                    <q-select class="col-6 q-pb-lg q-pr-lg" multiple clearable filled stack-label use-input
+                      option-value="Id" option-label="EmployeeName" v-model="tempPeople" ref="ManagerId"
+                      :options="EmployeeList" label="选择人员" :dense="false" emit-value map-options @filter="filterFn">
                       <template v-slot:no-option>
                         <q-item>
                           <q-item-section class="text-grey">
@@ -273,7 +279,6 @@
     created() {},
     mounted() {
       this.backBillMsg.BackId = this.setingObj.BackId;
-      console.log("setingObj", this.setingObj);
       this.getEmployee();
     },
     methods: {
@@ -284,7 +289,18 @@
       //退课单据审核
       saveBackClassInfo() {
         saveBackBillAduit(this.backBillMsg).then(res => {
-          console.log("res", res);
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '审核成功!',
+              position: 'top'
+            })
+            //调用父页面成功方法
+            this.$emit('success');
+            this.$emit('close');
+          }
         })
       },
       //获取员工列表
@@ -313,12 +329,12 @@
           }
         })
       },
-      getName(id){
-        let str=''
-        this.EmployeeList.forEach(x=>{
-          if(id==x.Id){
-            console.log(x,'x');
-            str =  x.EmployeeName;
+      //获取员工姓名
+      getName(id) {
+        let str = ''
+        this.EmployeeList.forEach(x => {
+          if (id == x.Id) {
+            str = x.EmployeeName;
           }
         })
         return str;

src/components/sale/myOrder-form.vue

@@ -505,7 +505,6 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let data = res.data.data;
-            console.log(res,'名单数据');
             data.forEach(x => {
               x.UpdateDate = this.$commonUtils.formatMsgTime(x.UpdateDate)
             })
@@ -520,7 +519,6 @@
         }).then(res => {
           this.Detail = res.Data;
           this.getfinanciaALLPageList(1,this.Detail.ClassId,this.Detail.OrderId) //财务单据
-          console.log(res, '数据来了');
         }).catch(() => {
 
         })

src/pages/course/socialclass.vue

@@ -279,7 +279,6 @@ export default {
                     if (this.dataList.FullClassRateList.length > 0) {
                         this.FullClassRateList = this.dataList.FullClassRateList;
                     }
-                    console.log(this.dataList, 'datalist');
                 }
             })
         },

src/pages/financial/empBankAccount.vue

@@ -243,9 +243,7 @@
       },
       addData(){  //添加角色
         let userInfo=this.getLocalStorage();
-
         this.addMsg.ObjID=this.$route.query.id?this.$route.query.id:userInfo.Id;
-        console.log(this.addMsg.ObjID)
         if(this.addMsg.AccountClassify!='3' && this.addMsg.AccountClassify!='4'){
           if(this.addMsg.OpenBankName==''){
             this.$message.error(this.$t('visaT.Pleasefillin')+this.nameA)

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -928,7 +928,6 @@
     },
     methods: {
       deleteRow(i, obj) {
-        console.log(2)
         obj.show = false;
         this.msg.Description = this.Description;
         this.msg.detailList.splice(i, 1);

src/pages/user/backbill.vue

@@ -80,7 +80,8 @@
           </q-td>
         </template>
       </q-table>
-      <backbill-form v-if="isShowBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm" @success="refreshPage">
+      <backbill-form v-if="isShowBillForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
+        @success="refreshPage">
       </backbill-form>
     </div>
   </div>
@@ -198,7 +199,7 @@
         pageCount: 0,
         isShowBillForm: false, //是否显示单据表单
         billObj: {}, //单据信息
-        showType:1,//1-查看，2-审核
+        showType: 1, //1-查看，2-审核
       }
     },
     created() {
@@ -215,9 +216,9 @@
         this.billObj = {};
       },
       //显示表单
-      showBillForm(item,type) {
+      showBillForm(item, type) {
         this.isShowBillForm = true;
-        this.showType=type;
+        this.showType = type;
         this.billObj = item;
       },
       //重新查询
@@ -253,6 +254,8 @@
       },
       //刷新页面
       refreshPage() {
+        this.isShowBillForm = false;
+        this.billObj = {};
         this.getStuBackBill();
       },
     },