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

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

@@ -3610,7 +3610,11 @@ export const obj = {
       wushuju: 'No data ',
       shezhicg: 'Setup successful! ',
       tianjaigys: 'Add a Supplier ',
-      xiugaigonys: 'Modifying Supplier Information ',
+      xiugaigonys: 'Modifying Supplier Information',
+      driverManager: 'Driver Manager',
+      driverName: 'Driver Name',
+      driverMobile: 'Driver Mobile',
+      driverWeChatName: 'Driver WeChatName',
       xiaoshibaoj: 'hourly quotation',
       gonglibaoj: 'Kilometer quote ',
       qingxzdiqu: 'Please select region ',

src/assets/common/lang/en.js

@@ -1116,6 +1116,13 @@ export const fnc = {
   cjdanjia: 'Unit Price',
   jine: 'Amount',
   dtxjine: 'Amortized balance',
+  qishimonth: 'Starting month',
+  tanxiaomonth: 'Amortization months',
+  monthUnit:'Month',
+  zhidanInfo:'Document preparation information',
+  zhidanDate:'Production time',
+  nowmonthMoney:'Current amortization amount',
+  monthMoney: 'Monthly amortization amount',
   onlyseebalance:'Only look at those with balances',
   yuanbi: 'original currency',
   sfjine: 'Actual amount paid',

src/assets/common/lang/jp.js

@@ -1060,6 +1060,13 @@ export const fnc = {
   cjdanjia:'成約単価',
   jine:'金額',
   dtxjine: '未償却残高',
+  qishimonth: '開始月',
+  tanxiaomonth: '償却月数',
+  monthUnit:'ヶ月',
+  zhidanInfo:'請求情報',
+  zhidanDate:'請求時間',
+  nowmonthMoney:'当期配賦金額',
+  monthMoney: '月償却額',
   onlyseebalance:'残高のあるものだけを見る',
   yuanbi:'原貨',
   sfjine:'実質支払金額',

src/assets/common/lang/zh-tw.js

@@ -1106,6 +1106,13 @@ export const fnc = {
   cjdanjia: '成交單價',
   jine: '金額',
   dtxjine: '待攤銷餘額',
+  qishimonth: '起始月份',
+  tanxiaomonth: '攤銷月數',
+  monthUnit:'個月',
+  monthMoney: '月攤金額',
+  zhidanInfo:'制單資訊',
+  zhidanDate:'制單時間',
+  nowmonthMoney:'當期分攤金額',
   onlyseebalance:'只看有餘額的',
   yuanbi: '原幣',
   sfjine: '實付金額',

src/assets/common/lang/zh.js

@@ -1116,6 +1116,13 @@ export const fnc = {
   cjdanjia: '成交单价',
   jine: '金额',
   dtxjine: '待摊销余额',
+  qishimonth: '起始月份',
+  tanxiaomonth: '摊销月数',
+  monthMoney: '月摊金额',
+  nowmonthMoney:'当期分摊金额',
+  zhidanInfo:'制单信息',
+  zhidanDate:'制单时间',
+  monthUnit:'个月',
   onlyseebalance:'只看有余额的',
   yuanbi: '原币',
   sfjine: '实付金额',

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

@@ -3612,6 +3612,10 @@ export const obj = {
       shezhicg: '设置成功！',
       tianjaigys: '添加供应商',
       xiugaigonys: '修改供应商信息',
+      driverManager: '司机管理',
+      driverName: '司机姓名',
+      driverMobile: '司机电话',
+      driverWeChatName: '司机微信',
       xiaoshibaoj: '小时报价',
       gonglibaoj: '公里报价',
       qingxzdiqu: '请选择地区',
@@ -5625,7 +5629,7 @@ export const obj = {
       huiyongrjje: '回佣人均金额',
       qingwancfentxx: '请完善分摊情况信息',
       tanzhangqk: '摊账情况',
-      fentanqsyf: '分摊起始月份',
+      fentanqsyf: '分摊起始月',
       fentanys: '分摊月数',
       yueshu: '月数',
       shuibjs: '税别计算: 单价 * (预订人数-免减人数) * (1 + 0.10 - 返佣比例 / 100)',

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

@@ -3612,6 +3612,10 @@ export const obj = {
       shezhicg: '設置成功！',
       tianjaigys: '添加供應商',
       xiugaigonys: '修改供應商信息',
+      driverManager: '司機管理',
+      driverName: '司機姓名',
+      driverMobile: '司機電話',
+      driverWeChatName: '司機微信',
       xiaoshibaoj: '小時報價',
       gonglibaoj: '公里報價',
       qingxzdiqu: '請選擇地區',
@@ -5625,7 +5629,7 @@ export const obj = {
       huiyongrjje: '回佣人均金額',
       qingwancfentxx: '請完善分攤情況信息',
       tanzhangqk: '攤賬情況',
-      fentanqsyf: '分攤起始月份',
+      fentanqsyf: '分攤起始月',
       fentanys: '分攤月數',
       yueshu: '月數',
       shuibjs: '稅別計算: 單價 * (預訂人數-免減人數) * (1 + 0.10 - 返傭比例 / 100)',

src/components/FinancialModule/CostSharing.vue

@@ -108,7 +108,7 @@
             <span>{{scope.row.BranchName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('fnc.feiyongleixing')" >
+        <el-table-column prop="" :label="$t('fnc.feiyongleixing')"  width="120">
           <template slot-scope="scope">
             <div>
               <template v-for="(s,si) in scope.row.CostTypeList">
@@ -158,23 +158,20 @@
         </el-table-column>
         <el-table-column prop="" :label="$t('fnc.fkduixiang')">
           <template slot-scope="scope">
-            <span>
-              <span
-                style="color: gray">{{scope.row.Type==2?scope.row.ClientTypeName+'：':$t('fnc.huikuanren')+'：'}}</span><span>{{scope.row.RemitterName}}</span>
-            </span>
+            <span>{{scope.row.RemitterName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('system.table_begTime')" width="100">
+        <el-table-column prop="" :label="$t('fnc.qishimonth')" width="100">
           <template slot-scope="scope">
             <span style="color: gray">{{scope.row.StartDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('objFill.v101.commissonBill.yuefen')" width="100">
+        <el-table-column prop="" :label="$t('fnc.tanxiaomonth')" width="100">
           <template slot-scope="scope">
-            <span style="color: gray">{{scope.row.RelevanceFrId2}}</span>
+            <span style="color: gray">{{scope.row.RelevanceFrId2}}{{ $t('fnc.monthUnit')}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('objFill.v101.FinancialModule.pingjun')+$t('fnc.jine')" width="100">
+        <el-table-column prop="" :label="$t('fnc.monthMoney')" width="100">
           <template slot-scope="scope">
             <span style="color: gray">{{scope.row.ShareMoney}}</span>
           </template>
@@ -184,7 +181,7 @@
             <span style="color: gray">{{scope.row.Remain}}</span>
           </template>
         </el-table-column> 
-        <el-table-column prop="" :label="$t('fnc.beizhu')" >
+        <el-table-column prop="" :label="$t('pub.pubRemark')" >
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" :content="scope.row.Remark" placement="top-start"
                 popper-class="max-w250">
@@ -195,7 +192,14 @@
             <span style="color: gray"></span>
           </template>
         </el-table-column>
-        
+        <el-table-column prop="" :label="$t('fnc.zhidanInfo')" >
+          <template slot-scope="scope">
+          
+                <p style="line-height:20px">{{$t('fnc.zhidanren')}}：<span>{{scope.row.FCreateByName}}</span></p>
+              <p style="line-height:20px">{{$t('fnc.zhidanDate')}}：<span>{{scope.row.FCreateDate}}</span></p>
+             
+          </template>
+        </el-table-column>
         <el-table-column prop="" :label="$t('admin.admin_czPerson')" width="100">
           <template slot-scope="scope">
               <div>{{scope.row.CreateByName}}</div>

src/components/FinancialModule/components/ClientBankAccount.vue

@@ -244,8 +244,8 @@
             prop=""
             label="" width="50" show-overflow-tooltip>
             <template slot="header" slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.feiyongkm')" placement="top">
-                <span class="OrderTitle">{{$t('objFill.v101.FinancialModule.feiyongkm')}}</span>
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.FinancialModule.kemu')" placement="top">
+                <span class="OrderTitle">{{$t('objFill.v101.FinancialModule.kemu')}}</span>
               </el-tooltip>
             </template>
             <template slot-scope="scope">
@@ -273,7 +273,7 @@
           </el-table-column>
           <el-table-column
             prop="CreateDate"
-            label="" width="80" show-overflow-tooltip>
+            label="" width="75" show-overflow-tooltip>
             <template slot="header" slot-scope="scope">
               <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.LeaderManagement.fentanqsyf')" placement="top">
                 <span class="OrderTitle">{{$t('objFill.v101.LeaderManagement.fentanqsyf')}}</span>
@@ -295,8 +295,8 @@
             prop="RelevanceFrId2"
             label="" width="40" show-overflow-tooltip>
             <template slot="header" slot-scope="scope">
-              <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.LeaderManagement.fentanys')" placement="top">
-                <span class="OrderTitle">{{$t('objFill.v101.LeaderManagement.fentanys')}}</span>
+              <el-tooltip class="item" effect="dark" :content="$t('objFill.v101.LeaderManagement.yueshu')" placement="top">
+                <span class="OrderTitle">{{$t('objFill.v101.LeaderManagement.yueshu')}}</span>
               </el-tooltip>
             </template>
             <template slot-scope="scope">

src/components/busManagement/busDriver.vue

@@ -6,41 +6,25 @@
   <div class="flexOne suppierManage">
     <div class="query-box">
       <ul>
+
         <li>
           <span>
-            <em>{{$t('system.quety_area')}}</em>
-            <el-select v-model="msg.CountryStr" clearable class="w150" filterable
-              @change="getProvinceList(msg.CountryStr,1)" :placeholder="$t('hotel.hotel_country')">
-              <el-option v-for='item in countryList' :key="item.ID" :label="item.Name" :value="item.ID">
-              </el-option>
-            </el-select>
-            <el-select v-model="msg.ProvinceStr" class="w150" filterable @change="getProvinceList(msg.ProvinceStr,2)"
-              :placeholder="$t('hotel.hotel_province')">
-              <el-option v-for='item in provinceList' :key="item.ID" :label="item.Name" :value="item.ID">
-              </el-option>
-            </el-select>
-            <el-select v-model="msg.CityStr" class="w150" filterable @change="getProvinceList(msg.CityStr,3)"
-              :placeholder="$t('hotel.hotel_city')">
-              <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
-              </el-option>
-            </el-select>
-            <el-select v-model="msg.DistrictStr" class="w150" filterable :placeholder="$t('hotel.hotel_area')">
-              <el-option v-for='item in district' :key="item.ID" :label="item.Name" :value="item.ID">
-              </el-option>
-            </el-select>
+            <em>{{$t('objFill.v101.busManagement.driverName')}}</em>
+            <el-input maxlength="50" v-model="msg.Name" class="permiss-input w150" @keyup.native.enter="initData"
+              :placeholder="$t('pub.pleaseImport')"></el-input>
           </span>
         </li>
         <li>
           <span>
-            <em>{{$t('hotel.suplier_name')}}</em>
-            <el-input maxlength="50" v-model="msg.Name" class="permiss-input w150" @keyup.native.enter="initData"
+            <em>{{$t('objFill.v101.busManagement.driverMobile')}}</em>
+            <el-input maxlength="50" v-model="msg.Mobile" class="permiss-input w150" @keyup.native.enter="initData"
               :placeholder="$t('pub.pleaseImport')"></el-input>
           </span>
         </li>
-        <li>
+            <li>
           <span>
-            <em>{{$t('hotel.suplier_contact')}}</em>
-            <el-input maxlength="50" v-model="msg.Contact" class="permiss-input w150" @keyup.native.enter="initData"
+            <em>{{$t('objFill.v101.busManagement.driverWeChatName')}}</em>
+            <el-input maxlength="50" v-model="msg.WeChatName" class="permiss-input w150" @keyup.native.enter="initData"
               :placeholder="$t('pub.pleaseImport')"></el-input>
           </span>
         </li>
@@ -48,18 +32,18 @@
           <button class="hollowFixedBtn" type="button"
             @click="resetPageIndex(),initData()">{{$t('pub.searchBtn')}}</button>
           <button class="normalBtn" type="button"
-            @click="clearinputInfo(),outerVisible = true,dialogTitle=$t('objFill.v101.busManagement.tianjaigys')">{{$t('pub.addBtn')}}</button>
+            @click="clearinputInfo(),outerVisible = true,dialogTitle=$t('objFill.v101.busManagement.driverManager')">{{$t('pub.addBtn')}}</button>
         </li>
       </ul>
       <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center>
         <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
-          <el-form-item :label="$t('hotel.suplier_name')" prop="Name">
+          <el-form-item :label="$t('objFill.v101.busManagement.driverName')">
             <el-input type="text" class="w300" maxlength="50" v-model="addMsg.Name"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('hotel.table_tel')" p>
+          <el-form-item :label="$t('objFill.v101.busManagement.driverMobile')" >
             <el-input type="text" class="w300" maxlength="50" v-model="addMsg.Mobile"></el-input>
           </el-form-item>
-          <el-form-item :label="$t('hotel.suplier_contact')">
+          <el-form-item :label="$t('objFill.v101.busManagement.driverWeChatName')">
             <el-input type="text" class="w300" maxlength="50" v-model="addMsg.WeChatName"></el-input>
           </el-form-item>
         </el-form>
@@ -71,27 +55,29 @@
       </el-dialog>
     </div>
     <div class="supplierList clearfix" v-loading="loading">
-      <div class="supList" v-for="item in tableList" :key="item.subCode">
-        <div class="suTop">
-          <img src="../../assets/img/suplier.jpg">
-          <div class="topCircle">{{item.Number}}</div>
-        </div>
-        <div class="supTitle">{{item.Name}}</div>
-        <div class="telNumber">{{item.Mobile}}</div>
-        <div class="Address">
-          <div v-show="item.WeChatName">
-            <i class="iconfont icon-img_dz"></i>
-            <el-tooltip class="item" effect="dark" :content="item.WeChatName" placement="top-start">
-              <div class="AddressInner">{{item.WeChatName}}</div>
+      <el-table ref="busSupplierDriver" :data="dataList" tooltip-effect="dark" style="width: 100%">
+        <el-table-column prop="Name" :label="$t('objFill.v101.busManagement.driverName')"></el-table-column>
+        <el-table-column prop="Mobile" :label="$t('objFill.v101.busManagement.driverMobile')"></el-table-column>
+        <el-table-column prop="WeChatName" :label="$t('objFill.v101.busManagement.driverWeChatName')"></el-table-column>
+        <el-table-column prop="SupplierName" :label="$t('hotel.suplier_name')"></el-table-column>
+        <el-table-column prop="CreateByName" :label="$t('active.cl_addPp')"></el-table-column>
+        <el-table-column prop="CreateTime" :label="$t('fnc.cjshijian')"></el-table-column>
+        <el-table-column prop="UpdateByName" :label="$t('objFill.v101.administrative.xiugairen')"></el-table-column>
+        <el-table-column prop="UpdateTime" :label="$t('sm.xiugaishijian')"></el-table-column>
+        <el-table-column :label="$t('system.table_operation')">
+          <template slot-scope="scope">
+            <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
+              <el-button type="primary" icon="el-icon-edit" circle
+                @click="outerVisible = true,dialogTitle=$t('objFill.v101.busManagement.driverManager'),updateInfo(scope.row.DetailsId)">
+              </el-button>
             </el-tooltip>
-          </div>
-        </div>
-        <div class="updataBtn">
-          <button class="normalBtn UPBtn"
-            @click="outerVisible = true,dialogTitle=$t('objFill.v101.busManagement.xiugaigonys'),updateInfo(item.ID)">{{$t('pub.updateMsg')}}</button>
-          <button class="hollowFixedBtn UPBtn" @click="isdelete(item)">{{$t('system.table_delete')}}</button>
-        </div>
-      </div>
+            <el-tooltip class="item" effect="dark" :content="$t('pub.delete')" placement="top">
+              <el-button type="danger" icon="el-icon-delete" @click='isdelete(scope.row)' circle>
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
     </div>
     <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
       layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
@@ -105,7 +91,7 @@
       return {
         total: 0,
         currentPage: 1,
-        tableList: "",
+        dataList: [],
         outerVisible: false,
         loading: true,
         dialogTitle: "",
@@ -150,7 +136,7 @@
           res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
-              this.tableList = res.data.data.pageData;
+              this.dataList = res.data.data.pageData;
               this.total = res.data.data.count;
             }
           },
@@ -198,6 +184,7 @@
         );
       },
       clearinputInfo() {
+        this.addMsg.DetailsId = 0;
         this.addMsg.Name = "";
         this.addMsg.Mobile = "";
         this.addMsg.WeChatName = "";
@@ -244,4 +231,5 @@
       this.initData();
     }
   };
-</script>
+
\ No newline at end of file
+</script>

src/components/busManagement/busSuplier.vue

@@ -123,8 +123,7 @@
           <button class="hollowFixedBtn UPBtn" @click="isdelete(item.ID)">{{$t('system.table_delete')}}</button>
           <button class="hollowFixedBtn HS_financial"
             @click="AccountManage(item)">{{$t('visaT.Accountmanagement')}}</button>
-
-          <!-- <button>司机管理</button> -->
+          <button  class="hollowFixedBtn HS_financial" @click="goToDriver(item)">{{$t('objFill.v101.busManagement.driverManager')}}</button>
         </div>
       </div>
     </div>
@@ -189,6 +188,12 @@
       };
     },
     methods: {
+      goToDriver(item) {
+        let params = {
+          SupplierId: item.ID,
+        }
+        this.OpenNewPage('/busDriver', params)
+      },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.initData();
@@ -377,4 +382,4 @@
     }
   };
 
-</script>
+</script>
\ No newline at end of file

src/router/config.js

@@ -1535,8 +1535,7 @@ export default {
               meta: {
                 title: '餐厅套餐查询'
               },
-            },
-            ,
+            }, ,
             {
               path: '/RestaurantPackage', //餐厅套餐查询
               name: 'RestaurantPackage',
@@ -2222,6 +2221,14 @@ export default {
               meta: {
                 title: '车控供应商'
               },
+            },
+            { //司机管理
+              path: '/busDriver',
+              name: 'busDriver',
+              component: resolve => require(['@/components/busManagement/busDriver'], resolve),
+              meta: {
+                title: '车控供应商'
+              },
             }, {
               path: '/busArrangement', //派车安排
               name: 'busArrangement',
@@ -4217,8 +4224,7 @@ export default {
               meta: {
                 title: '费用摊销查询管理'
               },
-            }
-            , { //财务 财务单据 收款查询管理
+            }, { //财务 财务单据 收款查询管理
               path: '/RecPayQueryKM',
               name: 'RecPayQueryKM',
               component: resolve => require(['@/components/FinancialModule/RecPayQueryKM'], resolve),
@@ -6250,7 +6256,7 @@ export default {
       meta: {
         title: '价格保密协议'
       }
-    },{
+    }, {
       path: '/disclaimerProtocol', //老年人/孕妇参团免责
       name: 'disclaimerProtocol',
       component: resolve => require(['@/components/disclaimerProtocol'], resolve),
@@ -6474,6 +6480,6 @@ export default {
         title: '财务批量打印页面'
       },
     }
-    
+
   ]
 }