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

src/components/FinancialModule/BasicDocuments.vue

@@ -3113,6 +3113,7 @@ else if (Type==2) {
               name: path,
               query: {
                 id: res.data.data.TCIDs,
+                lineId:res.data.data.LineId,
                 isUpdate: false,
                 blank: 'y'
               }

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -2402,6 +2402,7 @@
               name: path,
               query: {
                 id: res.data.data.TCIDs,
+                lineId:res.data.data.LineId,
                 isUpdate: false,
                 blank: 'y'
               }

src/components/FinancialModule/Kingdee/currency.vue

@@ -245,7 +245,7 @@
         }).then(() => {
           this.apipost('Financial_post_DelKingdeeCurrency',msg, res => {
             if(res.data.resultCode == 1) {
-              this.success(this.$t('tips.czchenggong'))
+              this.Success(this.$t('tips.czchenggong'))
               this.getList();
             } else {
               this.Error(res.data.message);

src/components/FinancialModule/Kingdee/project.vue

@@ -265,7 +265,7 @@
           this.addShow = false
           this.apipost('Financial_post_DelKingdeeItemForHP',msg, res => {
             if(res.data.resultCode == 1) {
-              this.success(this.$t('tips.czchenggong'))
+              this.Success(this.$t('tips.czchenggong'))
               this.getList();
             } else {
               this.Error(res.data.message);

src/components/FinancialModule/Kingdee/suject/bank.vue

@@ -111,7 +111,7 @@
         }).then(() => {
           this.apipost('Financial_post_DelCostTypeKingdeeRelation',msg, res => {
             if(res.data.resultCode == 1) {
-              this.success(this.$t('tips.czchenggong'))
+              this.Success(this.$t('tips.czchenggong'))
               this.$emit('success');
             } else {
 

src/components/FinancialModule/Kingdee/suject/cash.vue

@@ -111,7 +111,7 @@
         }).then(() => {
           this.apipost('Financial_post_DelCostTypeKingdeeRelation',msg, res => {
             if(res.data.resultCode == 1) {
-              this.success(this.$t('tips.czchenggong'))
+              this.Success(this.$t('tips.czchenggong'))
               this.$emit('success');
             } else {
 

src/components/FinancialModule/Kingdee/suject/cost.vue

@@ -329,7 +329,7 @@
             }).then(() => {
               this.apipost('Financial_post_DelCostTypeKingdeeRelation',msg, res => {
                 if(res.data.resultCode == 1) {
-                  this.success(this.$t('tips.czchenggong'))
+                  this.Success(this.$t('tips.czchenggong'))
                   this.$emit('success');
                 } else {
 

src/components/FinancialModule/Kingdee/suject/payobject.vue

@@ -113,7 +113,7 @@
         }).then(() => {
           this.apipost('Financial_post_DelCostTypeKingdeeRelation',msg, res => {
             if(res.data.resultCode == 1) {
-              this.success(this.$t('tips.czchenggong'))
+              this.Success(this.$t('tips.czchenggong'))
               this.$emit('success');
             } else {
 

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -1182,7 +1182,7 @@ export default {
                     Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
                 this.addMsg.vorcherInos = this.saveMsg;
-                this.success(this.$t('tips.scchenggong'));
+                this.Success(this.$t('tips.scchenggong'));
             });
         },
     },mounted(){

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -1178,7 +1178,7 @@ export default {
                     Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
                 this.addMsg.vorcherInos = this.saveMsg;
-                this.success(this.$t('tips.scchenggong'));
+                this.Success(this.$t('tips.scchenggong'));
             });
         },
     },mounted(){

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -1306,11 +1306,11 @@
         if(i!=12){
           this.msg.CourseId = 1
           this.AccountPrompt = this.$t('objFill.shuruchanjiahdyhk')
-          this.msg.Course_Name = this.$t('objFill.yinhangkai')
+          this.msg.Course_Name = '银行卡'//this.$t('objFill.yinhangkai')
         }if(i==12){
           this.msg.CourseId = 12
           this.AccountPrompt = this.$t('objFill.shuruchanjiahdptname')
-          this.msg.Course_Name = this.$t('fnc.pingtai')
+          this.msg.Course_Name = '平台'//this.$t('fnc.pingtai')
         }
 
         if (!t) {

src/components/Hotel/HotelManagement.vue

@@ -500,7 +500,7 @@
         </el-table-column>
         <el-table-column prop="CreateTime" :label="$t('visa.v_creatDate')">
         </el-table-column>
-        <el-table-column prop="DateStr" :label="$t('system.table_operation')"> width="120">
+        <el-table-column prop="DateStr" :label="$t('system.table_operation')" width="120">
           <template slot-scope="scope">
             <el-popconfirm @confirm="deleteFile(scope.row, scope.$index)" :title="$t('objFill.quedinscm')">
               <el-button slot="reference" class="editInfo" type="danger">{{$t('system.table_delete')}}</el-button>
@@ -884,6 +884,7 @@
         this.userInfo.EmployeeId == 2773) {
         this.msg.QCountry = 651;
         this.isDisableCountry = true;
+        this.getProvinceList(this.msg.QCountry, 1);
       }
       this.selectResource();
     },

src/components/Hotel/RecentlyAlsoRoom.vue

@@ -390,7 +390,7 @@ export default {
         this.withdraw,
         res => {
           if (res.data.resultCode == 1) {
-            this.success(this.$t('tips.saveYes'));
+            this.Success(this.$t('tips.saveYes'));
             this.outerVisible = false;
             this.initRoomList();
           }

src/components/LeaderManagement/leaderSelf.vue

@@ -785,7 +785,7 @@
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.getList();
               this.outerVisible = false;
               this.initAddMsg();

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -967,7 +967,7 @@
             Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
           })
           this.nMsg.VoucherList = this.saveMsg;
-          this.success(this.$t('tips.scchenggong'));
+          this.Success(this.$t('tips.scchenggong'));
         });
       },
       financeinfo_post_GetClientAccountList(ObjID, type) { //获取付款 对象类型  新增用

src/components/Supplier/HotelInfo.vue

@@ -514,7 +514,7 @@
           response => {
             //修改添加接口
             if (response.data.resultCode == 1) {
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.goUrl("HotelManagement2");
             } else {
               this.Error(response.data.message);

src/components/TravelManager/TravelLeader/Leader.vue

@@ -806,7 +806,7 @@ export default {
         this.addMsg,
         res => {
           if (res.data.resultCode == 1) {
-            this.success(this.$t('tips.saveYes'));
+            this.Success(this.$t('tips.saveYes'));
             this.getList();
             this.outerVisible = false;
             this.initAddMsg();

src/components/TravelManager/TravelList/TravelpassengerList.vue

@@ -352,7 +352,7 @@
             res => {
               this.isSubmit = true;
               if (res.data.resultCode == 1) {
-                this.success(this.$t('tips.czchenggong'))
+                this.Success(this.$t('tips.czchenggong'))
                 this.getList()
               } else {
                 this.Error('操作失败')

src/components/TravelManager/customizedcar/carmanageList.vue

@@ -59,7 +59,7 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column fixed="right" :label="$t('system.table_operation')"> width="120" >
+            <el-table-column fixed="right" :label="$t('system.table_operation')" width="120" >
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top" >
                     <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">

src/components/TravelManager/customizedcar/dzlineList.vue

@@ -194,7 +194,7 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column fixed="right" :label="$t('system.table_operation')"> width="150" >
+            <el-table-column fixed="right" :label="$t('system.table_operation')" width="150" >
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top" >
                     <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">

src/components/TravelManager/customizedcar/dzscenicspotList.vue

@@ -32,7 +32,7 @@
 			<el-table-column prop="UpdateDate" label="操作时间" ></el-table-column>
 
 
-			<el-table-column fixed="right" :label="$t('system.table_operation')"> width="180" >
+			<el-table-column fixed="right" :label="$t('system.table_operation')" width="180" >
 			  <template slot-scope="scope">
 				<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top" >
 				  <img src="../../../assets/img/setup/edit.png" alt="" class="imgstyle" @click="Edit(scope.row)">

src/components/TravelManager/customizedcar/lineoffer.vue

@@ -336,7 +336,7 @@
 			<el-table-column  prop="BrandName" label="品牌"> </el-table-column>
 			<el-table-column  prop="CarNo" label="车牌号"> </el-table-column>
 			<el-table-column  prop="GuestNum" label="荷载人数"> </el-table-column>
-             <el-table-column  :label="$t('system.table_operation')"> width="100" >
+             <el-table-column  :label="$t('system.table_operation')" width="100" >
                 <template slot-scope="scope">
                       <div class="btn_check" style="display: inline-block;
                                 margin: 0 0 0 10px;

src/components/administrative/Diplomaticplat.vue

@@ -441,7 +441,7 @@ export default {
                 Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
             })
             this.addMsg.ImageList.push(this.domainManager().ViittoFileUrl + x.data.FilePath);
-            this.success(this.$t('tips.scchenggong'));
+            this.Success(this.$t('tips.scchenggong'));
         });
     },
 

src/components/busManagement/BookAcar/addEditVehicle.vue

@@ -407,7 +407,7 @@
 
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('system.table_operation')"> width="100">
+                <el-table-column :label="$t('system.table_operation')" width="100">
                   <template slot-scope="scope">
                     <el-button size="small" type="primary" @click="deleteLine(scope.$index)">{{$t('system.table_delete')}}</el-button>
                   </template>
@@ -836,4 +836,3 @@
       };
 
     </script>
-    
\ No newline at end of file

src/components/busManagement/BusApportionManagement.vue

@@ -1014,7 +1014,7 @@ export default {
                     Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
                 })
                 this.addMsg.VorList = this.saveMsg;
-                this.success(this.$t('tips.scchenggong'));
+                this.Success(this.$t('tips.scchenggong'));
             });
         },
 

src/components/busManagement/BusInfo.vue

@@ -766,7 +766,7 @@
           this.apipost('bus_get_SetPlan_V2', this.PostData, res => {
             this.isSubmit = true;
             if (res.data.resultCode == 1) {
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.MsgBus.$emit('msg');
               this.createTableData();
             } else {

src/components/dmc/manager/GroundSupplier/index.vue

@@ -139,7 +139,7 @@
             <p>{{scope.row.CreateDate}}</p>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('system.table_operation')"> width="165">
+        <el-table-column prop="" :label="$t('system.table_operation')" width="165">
           <template slot-scope="scope">
             <template v-if="(scope.row.IsSeeAll==1&&userInfo.EmployeeId==scope.row.CreateBy)||scope.row.IsSeeAll==0">
               <el-tooltip class="item" effect="dark" :content="$t('visaT.Accountmanagement')" placement="top">

src/components/scenicSpot/domesticScenicSpotPackagePrice.vue

@@ -731,7 +731,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.initDataTable();
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.isShowDIv = false;
               this.clearInfo();
 

src/components/scenicSpot/scenicSpotPackagePrice.vue

@@ -780,7 +780,7 @@
           res => {
             if (res.data.resultCode == 1) {
               this.initDataTable();
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.isShowDIv = false;
               this.resetForm("addMsg");
             } else {

src/components/systemManagement/IPManager.vue

@@ -184,7 +184,7 @@
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.getList();
               this.outerVisible = false;
               this.resetForm("addMsg");

src/components/systemManagement/lineManagement.vue

@@ -966,7 +966,7 @@ import getters from '../../store/getters';
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.getList();
               this.resetForm("addMsg");
               this.lineCountryArr = [];

src/components/systemManagement/seriesManagement.vue

@@ -382,7 +382,7 @@
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {
-              this.success(this.$t('tips.saveYes'));
+              this.Success(this.$t('tips.saveYes'));
               this.getList();
               this.outerVisible = false;
               this.initAddMsg();

src/components/systemManagement/startCityManagement.vue

@@ -337,7 +337,7 @@ export default {
         this.addMsg,
         res => {
           if (res.data.resultCode == 1) {
-            this.success(this.$t('tips.saveYes'));
+            this.Success(this.$t('tips.saveYes'));
             this.getList();
             this.outerVisible = false;
             this.resetForm("addMsg");