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

src/assets/common/lang/EN/fill.js

@@ -3548,6 +3548,7 @@ export const obj = {
       kehubeiz: 'Customer Remarks ',
       dijitian: 'What day ',
       sijizhusf: 'Drivers accommodation fee ',
+      sijizhusfsr: 'Driver accommodation income',
       zancunbaoj: 'Temporary offer ',
       baocunbqd: 'Save and confirm ',
       shezhibaoj: 'Set quote ',
@@ -4992,6 +4993,7 @@ export const obj = {
       tingcfzc: 'Parking Expenses ',
       caidaisr: 'Tea income ',
       caidaizc: 'Tea spending ',
+      guzhangzc: 'Fault expenses',
       qitachengb: 'Other costs ',
       yugucezi: 'Estimated fare ',
       yugufangf: 'Estimated room Rates ',

src/assets/common/lang/Japan/fill.js

@@ -3547,6 +3547,7 @@ export const obj = {
       kehubeiz: '顧客コメント',
       dijitian: '何日目か',
       sijizhusf: '運転手の宿泊費',
+      sijizhusfsr: '運転手の宿泊収入',
       zancunbaoj: '見積もりを一時保存します',
       baocunbqd: '保存して確定します',
       shezhibaoj: '見積を設定します',
@@ -4991,6 +4992,7 @@ export const obj = {
       tingcfzc: '駐車料金支出',
       caidaisr: '茶代収入',
       caidaizc: '茶代支出',
+      guzhangzc: '障害支出',
       qitachengb: 'その他のコスト',
       yugucezi: '運賃を見積もる',
       yugufangf: '部屋代を見積もる',

src/assets/common/lang/zhCN/fill.js

@@ -3547,6 +3547,7 @@ export const obj = {
       kehubeiz: '客户备注',
       dijitian: '第几天',
       sijizhusf: '司机住宿费',
+      sijizhusfsr: '司机住宿收入',
       zancunbaoj: '暂存报价',
       baocunbqd: '保存并确定',
       shezhibaoj: '设置报价',
@@ -4991,6 +4992,7 @@ export const obj = {
       tingcfzc: '停车费支出',
       caidaisr: '茶代收入',
       caidaizc: '茶代支出',
+      guzhangzc: '故障支出',
       qitachengb: '其他成本',
       yugucezi: '预估车资',
       yugufangf: '预估房费',

src/assets/common/lang/zhTW/fill.js

@@ -3547,6 +3547,7 @@ export const obj = {
       kehubeiz: '客戶備註',
       dijitian: '第幾天',
       sijizhusf: '司機住宿費',
+      sijizhusfsr: '司機住宿收入',
       zancunbaoj: '暫存報價',
       baocunbqd: '保存並確定',
       shezhibaoj: '設置報價',
@@ -4991,6 +4992,7 @@ export const obj = {
       tingcfzc: '停車費支出',
       caidaisr: '茶代收入',
       caidaizc: '茶代支出',
+      guzhangzc: '故障支出',
       qitachengb: '其他成本',
       yugucezi: '預估車資',
       yugufangf: '預估房費',

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2422,9 +2422,9 @@ export default {
           componentName: "TCIDJumpWang"
         },
         {
-          field: "RoomFee",
+          field: "MealFee",
           formatter: this.moneyFormat,
-          title: this.$t('objFill.v101.busManagement.sijizhusf'),
+          title: this.$t('objFill.v101.FinancialModule.youfei'),
           width: 90,
           titleAlign: "left",
           columnAlign: "right",
@@ -2432,9 +2432,19 @@ export default {
           componentName: "TCIDJumpWang"
         },
         {
-          field: "MealFee",
+          field: "ZiFei",
           formatter: this.moneyFormat,
-          title: this.$t('objFill.v101.FinancialModule.youfei'),
+          title: this.$t('objFill.v101.busManagement.sijizhusfsr'),
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
+        {
+          field: "RoomFee",
+          formatter: this.moneyFormat,
+          title: this.$t('objFill.v101.busManagement.sijizhusf'),
           width: 90,
           titleAlign: "left",
           columnAlign: "right",
@@ -2501,6 +2511,36 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "XiaoFeiShouRu",
+          formatter: this.moneyFormat,
+          title: this.$t('objFill.v101.FinancialModule.baoxiansr'),
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
+        {
+          field: "GuoNeiLianYunJiPiao",
+          formatter: this.moneyFormat,
+          title: this.$t('objFill.v101.FinancialModule.guzhangzc'),
+          width: 100,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
+        {
+          field: "YaoQingHan",
+          formatter: this.moneyFormat,
+          title: this.$t('objFill.chezi'),
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "CheZi",
           formatter: this.moneyFormat,

src/components/myOrdersAllType/components/OrderList.vue

@@ -529,9 +529,10 @@
               <span>{{ changePriceMsg.ApplyForMoney }}</span>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="4" v-if="false">
             <el-form-item :label="$t('objFill.yinshouzje')" prop="Money">
               <!-- :disabled="userInfo.EmployeeId!=1" -->
+              <!-- :readonly="changePriceMsg.DialogType == 1||userInfo.EmployeeId!=ExamineBy||titleType == 3 ? true : false" -->
               <el-input type="number"
                 :readonly="changePriceMsg.DialogType == 1||userInfo.EmployeeId!=ExamineBy||titleType == 3 ? true : false"
                 v-model="changePriceMsg.Money" rows="6"></el-input>

src/plug/index.js

@@ -122,11 +122,11 @@ export default {
         let locationName = window.location.hostname;
         let isOnline = 0; //0-本地测试，1-线上
         let ocrUrl = "http://192.168.5.46:8888";
-        // domainUrl = "http://192.168.5.214";
-        domainUrl = "http://192.168.5.39:8083"
-        // domainUrl = "http://192.168.5.204:8030"
-        domainUrl = "http://192.168.5.46"
-        // domainUrl = "http://reborn.oytour.com";
+        domainUrl = "http://192.168.5.214";
+        //domainUrl = "http://192.168.5.39:8083"
+        //domainUrl = "http://192.168.5.204:8030"
+        //domainUrl = "http://192.168.5.46"
+ 
         let crmLocalFileStreamDownLoadUrl = "";
         crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
         let javaUrldo = "";