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

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

@@ -4354,6 +4354,7 @@ export const obj = {
       feiyongkm: 'Expense Subjects ',
       yuanbizh: 'original currency ',
       yonglecl: 'Yongle Vehicle ',
+      KimonoRFinance: 'Kimono related list',
       chanyuxs: 'Get involved in sales ',
       chanyurq: 'Participation date ',
       qingxzcyxs: 'Please choose to participate in the sale ',

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

@@ -4354,6 +4354,7 @@ export const obj = {
       feiyongkm: '費用科目',
       yuanbizh: '元の通貨',
       yonglecl: '永楽車両',
+      KimonoRFinance: '和服関連シート',
       chanyuxs: '販売に参加する',
       chanyurq: '参加日',
       qingxzcyxs: '販売に参加するを選択してください。',

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

@@ -4354,6 +4354,7 @@ export const obj = {
       feiyongkm: '费用科目',
       yuanbizh: '原币种',
       yonglecl: '永乐车辆',
+      KimonoRFinance: '和服关联单',
       chanyuxs: '参与销售',
       chanyurq: '参与日期',
       qingxzcyxs: '请选择参与销售',

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

@@ -4354,6 +4354,7 @@ export const obj = {
       feiyongkm: '費用科目',
       yuanbizh: '原幣種',
       yonglecl: '永樂車輛',
+      KimonoRFinance: '和服关联单',
       chanyuxs: '參與銷售',
       chanyurq: '參與日期',
       qingxzcyxs: '請選擇參與銷售',

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -180,7 +180,7 @@
               <el-input placeholder="" class="" v-model="msg.RemitterName"></el-input>
             </el-form-item>
           </el-col>
-            <el-col :span="4">
+          <!--  <el-col :span="4">
               <el-form-item :label="$t('fnc.fybumen')">
                 <el-select filterable v-model='msg.RB_Depart_Id'
                   @change="employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(),msg.UpdateBy=''" class="">
@@ -190,7 +190,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="4">
               <el-form-item :label="$t('system.table_rank')">
                 <el-select filterable v-model='msg.Sort'>
@@ -225,7 +225,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
+            <el-col :span="4">
+              <el-form-item :label="$t('objFill.v101.FinancialModule.KimonoRFinance')">
+                <el-checkbox v-model="msg.IsAirTicketSelect" true-label="1" false-label="0"></el-checkbox>
+              </el-form-item>
+            </el-col>
           </template>
         </el-row>
       </el-form>
@@ -474,6 +478,13 @@
             <template v-else>-</template>
           </template>
         </el-table-column>
+        <el-table-column v-if="msg.IsAirTicketSelect==1" prop="" :label="$t('objFill.v101.FinancialModule.KimonoRFinance')" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <span v-if="scope.row.HandFeeFrId" style="cursor: pointer;color: #00C6FF;"
+              @click="openDetails(scope.row.HandFeeFrId)">{{ scope.row.HandFeeFrId }}</span>
+            <template v-else>-</template>
+          </template>
+        </el-table-column>
       </el-table>
       <div style="padding-bottom:15px">
         <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChanges"
@@ -551,6 +562,7 @@
           Sort: '2',
           EmployeeId: '',
           IsSelectAduiting: '0',
+          IsAirTicketSelect: '0'
         },
         getCompanyMsg: { // 公司
           RB_Group_Id: '0',
@@ -643,7 +655,7 @@
       if (this.typeSystem == 1) this.msg.OtherType = '80'
       let userInfo = this.getLocalStorage();
       let ActionMenuCode = userInfo.ActionMenuCode;
-      if (ActionMenuCode.indexOf("F_Query_AllIncomPay") != -1) {
+      if (ActionMenuCode.indexOf("F_Query_AllIncomPay") != -1 || userInfo.RB_Branch_id==1218) {
         this.FinanceCreate = true;
       }
       this.getCompanyMsg.RB_Group_Id = this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo