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

src/components/administrative/empBankAccount.vue

@@ -382,6 +382,7 @@
         this.supplierMsg.Type = this.addMsg.Type
         if(this.addMsg.Type!=10){
           this.addMsg.ObjID = null
+          this.addMsg.ObjIdStr = ''
         }else{
           this.addMsg.ObjID = this.$route.query.id
         }
@@ -581,13 +582,11 @@
 				},err=>{})
 			},
 			addData(){
-          if(!this.addMsg.ObjID&&this.addMsg.Type!=10){
+          if(this.addMsg.ObjID==null&&this.addMsg.Type!=10){
               this.$message.error('请选择客户名称')
               return
           }
-          if(this.addMsg.Type==10){
-            this.addMsg.ObjID = this.$route.query.id
-          }
+          this.addMsg.ObjID = this.addMsg.ObjID!='-1'&&this.addMsg.ObjID!=null?this.addMsg.ObjID:this.$route.query.id
 					if(this.addMsg.AccountClassify!='3' && this.addMsg.AccountClassify!='4'){
 							if(this.addMsg.OpenBankName==''){
 						     this.$message.error(this.$t('visaT.Pleasefillin')+this.nameA)

src/components/administrative/empBankAccountAll.vue

@@ -197,6 +197,7 @@
                 v-model="addMsg.Type"
                 :placeholder="$t('fnc.khleixing')"
                 class="w135 _border_b_1"
+                @change="getType"
               >
                 <el-option
                   v-for="item in ClientTypeList"
@@ -567,6 +568,12 @@ export default {
     this.changeTitle();
   },
   methods: {
+    getType(){
+      this.supplierList = []
+      this.addMsg.ObjID = null
+      this.addMsg.ObjIdStr = ''
+      this.supplierMsg.Type = this.addMsg.Type
+    },
     getObjName(){
       this.supplierList.filter(x=>{
         if(x.ID==this.addMsg.ObjID){
@@ -584,7 +591,6 @@ export default {
         }
     },
     getSupplierGetPageList(){
-
       if(this.supplierMsg.Type==10) {
         this.addMsg.ObjID = this.addMsg.CreateBy
         return

src/components/scenicSpot/reservation/OrderList.vue

@@ -1433,7 +1433,7 @@
       },
       // 制作单据
       makeAdocument(row, index, num, Offset) {
-        if ((num == 2 || num == 3) && (row.Income) <= 0) {
+        if ((num == 2 || num == 3) && (row.Income+row.PlatformMoney) <= 0) {
           this.Info('请先制收款单据，再制成本或退款单据！')
           return
         }