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

build/check-versions.js

@@ -39,16 +39,11 @@ module.exports = function () {
   }
 
   if (warnings.length) {
-    console.log('')
     console.log(chalk.yellow('To use this template, you must update following to modules:'))
-    console.log()
-
     for (let i = 0; i < warnings.length; i++) {
       const warning = warnings[i]
       console.log('  ' + warning)
     }
-
-    console.log()
     process.exit(1)
   }
 }

src/components/Buying/BuyingType.vue

@@ -314,7 +314,6 @@ export default {
     getGoodsTypeManager() {
       this.apipost("Shop_post_GetCommodityCategoryList",{Name: "", ParentId: 0},res => {
           if (res.data.resultCode === 1) {
-            console.log(res.data.data)
             this.GoodsTypeList = res.data.data; 
           } else {
             this.Error(res.data.message);

src/components/FinancialModule/addFinancialProcess.vue

@@ -314,6 +314,17 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
+				<el-form-item v-if="xingzhenState" label="审批类型">
+					<el-select filterable v-model='addMsg.PropertyType' class="w200">
+						<el-option v-for='item in PropertyTypeList'
+							:label='item.Name'
+							:value='item.ID'
+							:key='item.ID'>
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<!-- 判断行政流程修改还是 -->
+				<div v-show="!xingzhenState">
 					<el-form-item :label="$t('fnc.lcleixing')">
 						<el-radio v-model="radio" v-if="addMsg.TemplateType!=8" disabled="disabled"  :label="1">{{$t('restaurant.res_income')}}</el-radio>
 						<el-radio v-model="radio" v-else @change="getCostTypeList(1),CostIdS=[],accListShow=true" :label="1">{{$t('restaurant.res_income')}}</el-radio>
@@ -383,6 +394,11 @@
 							<el-checkbox  :value="4" :label="4" :key="4">{{$t('fnc.zjinchi')}}</el-checkbox>
 						</el-checkbox-group>
 					</el-form-item>
+
+				</div>
+				
+
+
 		<el-form-item label="排序">
 					<el-input v-model="addMsg.Sort" class="w250"  maxlength="60"></el-input>
 				</el-form-item>
@@ -550,6 +566,8 @@ export default {
 	components: { Treeselect },
 	data(){
 		return{
+			PropertyTypeList:[],
+			xingzhenState:false,
 			DepartmentList:[],
 			EmployeeList:[],
 			Auditshow:false,
@@ -574,6 +592,7 @@ export default {
 				IsShow: 1,
 				ShowEmployeeList:[],
 				ShowDepartmentList:[],
+				PropertyType:'',
 			},
 			AuditUserList:{
 				EmName:'',
@@ -738,7 +757,13 @@ export default {
 		}
 	},
 	mounted(){
-
+		if(this.$route.query.xingzhen){
+			this.xingzhenState=true;
+			this.addMsg.TemplateSorce=2;
+			this.CostIdS.push('0')
+			// this.addMsg.PropertyType="";
+			this.getPropertyType();
+		}
 		this.getCompanyList();
 		this.getMaxDepartmentTierList();
 		if(this.TemplateId!=0){
@@ -752,6 +777,18 @@ export default {
 		this.getDepartment();
 	},
 	methods:{
+		getPropertyType(){
+			this.apipost(
+				"FinancialFlowTemplate_post_GetPropertyTypeList",
+				{},
+				res => {
+				if (res.data.resultCode == 1) {
+					this.PropertyTypeList=res.data.data;
+				}
+				},
+				err => {}
+			);
+		},
 		  //根据多公司获取部门
     getDepartment() {
 		let  msg= {
@@ -846,6 +883,7 @@ export default {
 					this.addMsg.IsShow = data.IsShow;
 					this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
 					this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
+					this.addMsg.PropertyType= data.PropertyType;
 					
 					
 					if (data.list && data.list[0] !== -1) {
@@ -934,6 +972,12 @@ export default {
 			}
 		},
 		saveApproval(){  // 保存数据
+			if(this.xingzhenState){
+				if(!this.addMsg.PropertyType || this.addMsg.PropertyType=='' ){
+					this.Error("请选择审批类型！");
+					return;
+				}
+			}
       if (this.accListMsg.length === 0) {
         this.addMsg.list = [-1]
       } else {
@@ -1001,10 +1045,20 @@ export default {
 				if(res.data.resultCode==1){
 					this.loading=false;
 					this.$message.success(this.$t('tips.czchenggong'))
+					if(this.xingzhenState){
+						this.$router.push({ name: 'XProcessmanagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
+						
+					}else{
 						this.$router.push({ name: 'FProcessManagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
+
+					}
 				}else{
 					this.loading=false;
+					if(this.xingzhenState){
+						this.addMsg.TemplateSorce=2;
+					}
 					this.addMsg = {
+						PropertyType:'',
 						Id:this.addMsg.Id,
 						Name:this.addMsg.Name,
 						DescribeInfo:this.addMsg.DescribeInfo,

src/components/Hotel/HotelContract.vue

@@ -350,7 +350,6 @@
                 })
               });
               this.list = list;
-              console.log(this.list,'list');
               this.$forceUpdate();
             }
           } else {

src/components/Hotel/roomReservationsDetails.vue

@@ -627,7 +627,7 @@
                this.list[this.findex].HotelOrderList[this.childIndex].OrderDetailsList.forEach((subItem,
                 subIndex) => {
                 //判断是否有库存价格
-                if (subIndex == 1 && ckedObj.CostPrice > 0) {
+                if (subIndex == 1 && ckedObj.CostPrice > 0 && ckedObj.Inventory>0) {
                   subItem.IsHaveStockPrice = 1;
                 } else {
                   subItem.IsHaveStockPrice = 0;

src/components/LeaderManagement/leaderTotalTable.vue

@@ -304,7 +304,7 @@ export default {
 .leaderTotalTable tr td .pHouseStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px;}
 .leaderTotalTable tr td .pHouseStyle:last-child{border-bottom: none;}
 .leaderTotalTable tr td .pDateStyle{border-bottom: 1px solid #ccc; height: 20px; line-height: 20px; margin-top: 0;}
-.leaderTotalTable tr td .pMsgStyle{; padding: 0 10px; line-height: 20px;}
+.leaderTotalTable tr td .pMsgStyle{padding: 0 10px; line-height: 20px;}
 .leaderTotalTable tr td .link p:hover{text-decoration: underline; cursor: pointer;}
 .leaderTotalTable tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;}
 .dmcTotalTable_tripDetails {padding: 0; box-shadow: 0px 1px 3px 0px #dedede; max-height: 400px;overflow-y: auto;}

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -127,6 +127,7 @@
                 {{(childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice}}
               </td>
               <td>
+                <!--返佣-->
                 <el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice'
                   @keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>%
               </td>

src/components/SalesModule/ActivityStatistics.vue

@@ -127,13 +127,10 @@ export default {
         res => {
             this.loading = false;
           if (res.data.resultCode == 1) {
-            console.log("res",res);
             this.Actitylist = res.data.data;
             if(this.Actitylist.length>0){
               this.msg.CouponId=this.Actitylist[0].Id;
-
             }
-            
           } else {
             this.$message.error(res.data.message);
           }
@@ -149,7 +146,6 @@ export default {
         res => {
             this.loading = false;
           if (res.data.resultCode == 1) {
-           
             this.list = res.data.data.pageData;
             this.total=res.data.data.count;
           } else {
@@ -167,9 +163,7 @@ export default {
       this.msg.pageIndex = 1;
       this.currentPage = 1;
     },
-    
   },
-
   mounted() {
     this.GetActity();
     let userInfo = this.getLocalStorage();

src/components/dmc/manager/dmcTotalTable.vue

@@ -406,7 +406,7 @@
                               {{$t('ground.cituanhuidai')}}
                             </td>
                           </tr>
-                          <tr>
+                          <tr style="display:none;">
                             <td style="text-align:right;width:80px;">{{$t('ground.dingfangstatus')}}:</td>
                             <td>
                               <el-select v-model="NumObj.IsBookTeam">
@@ -416,7 +416,6 @@
                               </el-select>
                             </td>
                           </tr>
-
                           <tr>
                             <td style="text-align:right;">{{$t('pub.pubRemark')}}：</td>
                             <td>
@@ -428,13 +427,13 @@
                               {{$t('ground.cibeizhu')}}.
                             </td>
                           </tr>
-                          <tr>
+                          <tr style="display:none;">
                             <td style="text-align:right;">{{$t('ground.gysbeizhu')}}：</td>
                             <td>
                               <el-input class='mt10' v-model='NumObj.SupplierRemarks' type='textarea'></el-input>
                             </td>
                           </tr>
-                          <tr>
+                          <tr style="display:none;">
                             <td colspan="2">
                               {{$t('ground.cibeizhuchaxun')}}.
                             </td>
@@ -503,23 +502,23 @@
               <td colspan="23" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
-                  <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
-                    class="colorE95252" style="padding-top:5px;">{{$t('op.DJBZTH')}}:{{outItem.PriceCommonList[index].DMCNum}}
+                  <div
+                    class="colorE95252" style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('op.DJBZTH')}}：<span style="font-weight:bold">{{outItem.PriceCommonList[index].DMCNum}}</span>
                   </div>
                   <div v-show="outItem.PriceCommonList[index].OPInnerRemark!=''" class="colorE95252"
-                    style="padding-top:5px;">{{$t('Operation.Op_remark')}}:{{outItem.PriceCommonList[index].OPInnerRemark}}</div>
+                    style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('Operation.Op_remark')}}：{{outItem.PriceCommonList[index].OPInnerRemark}}</div>
                   <div v-show="outItem.PriceCommonList[index].OPRemark!=''" class="colorE95252"
-                    style="padding-top:5px;">{{$t('Operation.Op_duiwaiRemark')}}:{{outItem.PriceCommonList[index].OPRemark}}</div>
-                  <div v-show="outItem.PriceCommonList[0].DMCRemark!=''" class="colorE95252"
-                    style="padding-top:5px;padding-bottom:4px;">{{$t('Operation.Op_dijieRemark')}}:{{outItem.PriceCommonList[index].DMCRemark}}
+                    style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('Operation.Op_duiwaiRemark')}}：{{outItem.PriceCommonList[index].OPRemark}}</div>
+                  <div v-show="outItem.PriceCommonList[index].DMCRemark!=''" class="colorE95252"
+                    style="padding-top:5px;padding-bottom:4px;font-size:13px;">{{$t('Operation.Op_dijieRemark')}}：{{outItem.PriceCommonList[index].DMCRemark}}
                   </div>
-                  <div v-show="outItem.PriceCommonList[0].SupplierRemarks!=''" class="colorE95252"
-                    style="padding-top:5px;padding-bottom:4px;">
-                    {{$t('ground.gysbeizhu')}}:{{outItem.PriceCommonList[index].SupplierRemarks}}
+                  <div v-show="outItem.PriceCommonList[index].SupplierRemarks!=''" class="colorE95252"
+                    style="padding-top:5px;padding-bottom:4px;font-size:13px;">
+                    {{$t('ground.gysbeizhu')}}：{{outItem.PriceCommonList[index].SupplierRemarks}}
                   </div>
-                  <div v-show="outItem.PriceCommonList[0].SupplierToDmcRemarks!=''" class="colorE95252"
-                    style="padding-top:5px;padding-bottom:4px;">
-                   {{$t('ground.gysduindibeizhu')}} :{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}
+                  <div v-show="outItem.PriceCommonList[index].SupplierToDmcRemarks!=''" class="colorE95252"
+                    style="padding-top:5px;padding-bottom:4px;font-size:13px;">
+                   {{$t('ground.gysduindibeizhu')}}：{{outItem.PriceCommonList[index].SupplierToDmcRemarks}}
                   </div>
                 </div>
               </td>

src/router/config.js

@@ -641,6 +641,14 @@ export default {
                                 title: '联盟管理'
                             },
                         },
+                        {
+                            path: '/XProcessmanagement', //联盟管理
+                            name: 'XProcessmanagement',
+                            component: resolve => require(['@/components/administrative/XProcessmanagement'], resolve),
+                            meta: {
+                                title: '流程管理'
+                            },
+                        },
                         {
                             path: '/custumerXzCertification', //客户实名认证
                             name: 'custumerXzCertification',
@@ -3727,6 +3735,11 @@ export default {
                             name: 'groundOperation',
                             component: resolve => require(['@/components/dmc/manager/groundOperation'], resolve),
                         },
+                        {
+                            path: '/groundOperation2',
+                            name: 'groundOperation2',
+                            component: resolve => require(['@/components/dmc/manager/groundOperation2'], resolve),
+                        },
                         {
                             path: '/newFeature',
                             name: 'newFeature',

src/store/actions/team.js

@@ -209,7 +209,7 @@ export function addTeamMembers({ state }, teamId, accounts) {
     teamId: teamId,
     accounts:accounts,
     done: (err, obj) => {
-      console.log(obj)
+      
     }
   })
 }
@@ -227,7 +227,7 @@ export function removeTeamMembers({ state }, teamId, accounts) {
     teamId: teamId,
     accounts:accounts,
     done: (err, obj) => {
-      console.log(obj)
+     
     }
   })
 }