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

src/components/FinancialModule/BasicDocuments.vue

@@ -1843,6 +1843,12 @@ export default {
                     AuditSteps.forEach(item=>{
                         if(item.NextStep==1 && item.SpecialNode==2 && item.Status==1){
                             this.Ststus=1;
+                            item.AuditRecordList.forEach(audit=>{
+                                if(audit.AuditStatus==2){
+                                    this.Ststus=0;
+                                }
+                            })
+                            
                         }
                     })
                     this.OrderID = this.GetDetail.OrderID;

src/components/FinancialModule/ReportForm/ChangeRevenueReport.vue

@@ -1550,7 +1550,7 @@ export default {
       delete msg.pageSize;
       msg.EmployeeId = this.userId;
       this.GetLocalFile(
-        "financestatistics_post_OutToExcelRevenueReportList",
+        "financestatistics_post_OutToExcelChangeRevenueReportList",
         msg,
         "营收报表.xls"
       );

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -525,6 +525,10 @@ tr._item_list td:last-child {
           <el-col  :span="4">
             <p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
             <p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
+            </el-col>  
+            <el-col :span="6">
+              <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
+              <el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
             </el-col>     
           
         </el-row>
@@ -746,10 +750,12 @@ Vue.component("TCIDJumpWang", {
 export default {
   data() {
     return {
+      btnloading:false,
       showID: false,
       active: 1,
       userId: 0,
       msg: {
+        Is_Open:-1,
         pageIndex: 1,
         pageSize: 16,
         OutBranchId:-1,
@@ -1457,6 +1463,22 @@ export default {
     this.getPageList();
   },
   methods: {
+    SetTravelClose(){
+      this.btnloading=true;
+      this.apipost(
+        "financestatistics_post_SetTravelCloseReceipts",
+        this.msg,
+        res => {
+          this.btnloading=false;
+          if (res.data.resultCode == 1) {
+            this.$message.success(res.data.message);
+          } else {
+            this.AALloading = false;
+            this.Error(res.data.message);
+          }
+        }
+      );
+    },
     goEasyReport: function() {
       let year = this.productionDate[0]
         ? this.productionDate[0].substring(0, 4)

src/components/TravelManager/TravelList/SalesTravelCoupomList.vue

@@ -53,14 +53,13 @@
                     value-format="yyyy-MM-dd" placeholder></el-date-picker> 
                 </el-form-item>
                 <el-form-item label="需要提供"> 
-                   <el-input
-                            type="text"
-                            placeholder="请输入内容"
-                            v-model="form.provideItem"
-                            maxlength="10"
-                            show-word-limit
-                            >
-                            </el-input>
+                   <el-select @change="ProvideChange" multiple collapse-tags v-model="provideItem" placeholder="请选择内容">
+                        <el-option label="线路设计" value="线路设计"></el-option>
+                        <el-option label="机票" value="机票"></el-option>
+                        <el-option label="酒店" value="酒店"></el-option>
+                        <el-option label="用车" value="用车"></el-option>
+                        <el-option label="用餐" value="用餐"></el-option>
+                    </el-select>
                 </el-form-item>
                 
             </el-form>
@@ -151,6 +150,7 @@ import moment from "moment"
 	export default {
 		data() {
 			return {
+                provideItem:[],
                 form:{
                     orderStatus:-1,
                     searchStartDate:"",
@@ -205,8 +205,10 @@ import moment from "moment"
         },
 		
 		methods: {
+            ProvideChange(val){
+                this.form.provideItem=val.join(',');
+            },
             Gourl(path,item){
-                console.log(item);
                 this.$router.push({
                     name: path,
                     query: { 

src/components/activity/TravelInfoList.vue

@@ -55,15 +55,14 @@
                     <el-date-picker class="w150" type="date" v-model="form.backDate"
                     value-format="yyyy-MM-dd" placeholder></el-date-picker> 
                 </el-form-item>
-                <el-form-item label="需要提供"> 
-                   <el-input
-                            type="text"
-                            placeholder="请输入内容"
-                            v-model="form.provideItem"
-                            maxlength="10"
-                            show-word-limit
-                            >
-                            </el-input>
+                <el-form-item label="需要提供">
+                    <el-select @change="ProvideChange" multiple collapse-tags v-model="provideItem" placeholder="请选择内容">
+                        <el-option label="线路设计" value="线路设计"></el-option>
+                        <el-option label="机票" value="机票"></el-option>
+                        <el-option label="酒店" value="酒店"></el-option>
+                        <el-option label="用车" value="用车"></el-option>
+                        <el-option label="用餐" value="用餐"></el-option>
+                    </el-select>
                 </el-form-item>
                 
             </el-form>
@@ -195,6 +194,7 @@ import moment from "moment"
 	export default {
 		data() {
 			return {
+                provideItem:[],
                 travelLoading:false,
                 total:0,
                 ruleForm:{},
@@ -256,6 +256,9 @@ import moment from "moment"
         },
 		
 		methods: {
+            ProvideChange(val){
+                this.form.provideItem=val.join(',');
+            },
             Gourl(path,item){
                 this.$router.push({
                     name:path,