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

src/components/FinancialModule/BasicDocuments.vue

@@ -262,17 +262,17 @@
     <div class="page_bdm" v-if="GetDetail" v-loading="loading">
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
-            <template v-if="GetDetail.Type===2">
+            <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
                 <my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
             </template>
-            <template v-else-if="GetDetail.Type===1">
+            <template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
                 <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
             </template>
             <template v-else-if="GetDetail.Type===7">
                 <my-GZ-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
             </template>
             <div class="_explain">
-                <p>附加说明：</p>
+                <p>附加说明：</p>1
                 <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                     <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                         <td :colspan="4">{{o.TCNUM}}（{{o.TCID}}）</td>

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -219,7 +219,7 @@
                     <td height="26px"></td>
                 </tr>
                 <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
-                  <td height="34px" class="">{{$t('fnc.jiaoyifangshi')}}</td>
+                  <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
                   <td height="34px" colspan="7" class="_color_b">
                     <template v-for="(item,index) in GetDetail.CashierDetail">
                       <p  class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>

src/components/FinancialModule/FinancialSubmodule/GZBillModule.vue

@@ -233,7 +233,7 @@
                     <td height="26px"></td>
                 </tr>
                 <tr v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail.length&&(GetDetail.Type!=1|| GetDetail.Type!=5)">
-                  <td height="34px" class="">{{$t('fnc.jiaoyifangshi')}}</td>
+                  <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
                   <td height="34px" colspan="9" class="_color_b">
                     <template v-for="(item,index) in GetDetail.CashierDetail">
                       <p  class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（{{item.Money}}）</p>

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -105,7 +105,7 @@
 				<li>
                     <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
                     <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
-                    <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
+                    <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> -->
                 </li>
 			</ul>
 		</div>

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -99,7 +99,8 @@
 				<li>
           <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
-                        <input type="button" class="normalBtn" :value="$t('visa.v_daochu')"  @click=""/></li>
+          <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')"  @click=""/> -->
+          </li>
 			</ul>
 		</div>
         <div class="cm_content">

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -96,7 +96,8 @@
 				<li>
           <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
-                        <input type="button" class="normalBtn" :value="$t('visa.v_daochu')"  @click=""/></li>
+                        <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')"  @click=""/> -->
+                        </li>
 			</ul>
 		</div>
         <div class="cm_content">

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -88,7 +88,7 @@
 				<li>
           <input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
           <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
-                        <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" />
+                        <!-- <input type="button" class="normalBtn" :value="$t('visa.v_daochu')" /> -->
 				</li>
 			</ul>
 		</div>

src/components/FinancialModule/invoicesManagerAdd.vue

@@ -85,7 +85,7 @@
         </td>
       </tr>
       <tr>
-        <td rowspan="2">开具内容</td>
+        <td rowspan="6">开具内容</td>
         <td>公司名称
           <el-select v-model="isChang" placeholder="" class="w150" @change="clearInfo">
             <el-option :key="1" :value='1' label='常用公司'></el-option>
@@ -111,6 +111,30 @@
           <span v-else>{{msg.DutyParagraph}}</span>
         </td>
       </tr>
+      <tr>
+        <td>地址</td>
+        <td colspan="2">
+          <el-input placeholder v-model="msg.Address"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>电话</td>
+        <td colspan="2">
+          <el-input placeholder v-model="msg.CompanyPhone"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>开户行</td>
+        <td colspan="2">
+          <el-input placeholder v-model="msg.OpeningBank"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>账号</td>
+        <td colspan="2">
+          <el-input placeholder type="number" v-model="msg.BankNo"></el-input>
+        </td>
+      </tr>
       <tr>
         <td>备注</td>
         <td colspan="3">
@@ -137,6 +161,10 @@ export default {
         InvoiceApplyState: 1,
         CustomerId: 0,
         IsDefaultInfo: 1,
+        Address: '',
+        CompanyPhone: '',
+        OpeningBank: '',
+        BankNo: '',
       },
       DepartName: "",
       emName: "",
@@ -164,6 +192,10 @@ export default {
     Addiis: function () {   // 新增接口
       if (this.msg.CompanyName === '') return this.$message.error('请填写公司名称！')
       if (this.msg.DutyParagraph === '') return this.$message.error('请填写税号！')
+      if (this.msg.Address === '') return this.$message.error('请填写地址！')
+      if (this.msg.CompanyPhone === '') return this.$message.error('请填写电话！')
+      if (this.msg.OpeningBank === '') return this.$message.error('请填写开户行！')
+      if (this.msg.BankNo === '') return this.$message.error('请填写账号！')
       if (this.checked) {
         this.msg.IsDefaultInfo = 1
       } else {

src/components/FinancialModule/invoicesManagerDetail.vue

@@ -85,7 +85,7 @@
         </td>
       </tr>
       <tr>
-        <td rowspan="2">开具内容</td>
+        <td rowspan="6">开具内容</td>
         <td>公司名称</td>
         <td colspan="2" class="font-weight">
           {{detail.CompanyName}}
@@ -97,6 +97,30 @@
           {{detail.DutyParagraph}}
         </td>
       </tr>
+      <tr>
+        <td>地址</td>
+        <td colspan="2">
+          {{detail.Address}}
+        </td>
+      </tr>
+      <tr>
+        <td>电话</td>
+        <td colspan="2">
+          {{detail.CompanyPhone}}
+        </td>
+      </tr>
+      <tr>
+        <td>开户行</td>
+        <td colspan="2">
+          {{detail.OpeningBank}}
+        </td>
+      </tr>
+      <tr>
+        <td>账号</td>
+        <td colspan="2">
+          {{detail.BankNo}}
+        </td>
+      </tr>
       <tr>
         <td>备注</td>
         <td colspan="3">
@@ -104,19 +128,22 @@
         </td>
       </tr>
     </table>
-    <div class="iis_save" v-if="noDetail">
+    <div class="iis_save" v-if="!noDetail && detail.InvoiceApplyState===1">
       <button class="normalBtn" @click="setStatus(3)">通过</button>
       <button class="normalBtn" @click="dialogFormVisible = true">拒绝</button>
     </div>
+    <div class="iis_save" v-else-if="noDetail && detail.InvoiceApplyState===1">
+      <button class="normalBtn" @click="setStatus(2)">{{$t('pub.cancelBtn')}}</button>
+    </div>
     <el-dialog title="提示信息" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" >
       <el-form label-width="110px">
         <el-form-item label="拒绝理由">
           <el-input type="textarea" v-model="msg.RefuseRemarks" class="w216"></el-input>
         </el-form-item>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-          <el-button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</el-button>
-          <el-button class="normalBtn" type="primary" @click="setStatus(4)">{{$t('pub.sureBtn')}}</el-button>
+      <div slot="footer" class="dialog-footer" >
+        <el-button class="hollowFixedBtn" @click="dialogFormVisible=false">{{$t('pub.cancelBtn')}}</el-button>
+        <el-button class="normalBtn" type="primary" @click="setStatus(4)">{{$t('pub.sureBtn')}}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -158,12 +185,22 @@ export default {
       this.apipost('InvoiceApply_get_UpdateInvoiceApply', this.msg, res=>{
         if (res.data.resultCode == 1) {
           this.$message.success(res.data.message)
-          setTimeout(()=>{
-            this.$router.push({
-              name: 'invoicesManager',
-              query: {blank: "y",}
-            });
-          },1000)
+          if (type !== 2) {
+            setTimeout(()=>{
+              this.$router.push({
+                name: 'invoicesManager',
+                query: {blank: "y",}
+              });
+            },1000)
+          } else {
+            setTimeout(()=>{
+              this.$router.push({
+                name: 'groupTourOrder',
+                query: {blank: "y",}
+              });
+            },1000)
+          }
+          
         }
       }, null)
     },

src/components/SalesModule/groupTourOrder.vue

@@ -1703,8 +1703,8 @@
                       <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                       <span v-else>设为收损单</span>
                     </div>
-                    <!-- item.confirmFileList.length>0 &&  q -->
-                    <div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
+                    <!-- v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)'  -->
+                    <div @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
                     <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')"
                          @click='deleteItem(item)'>取消
                     </div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1739,6 +1739,7 @@
                       <div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
                       <!-- v-if="item.isUpdateOrderCommission" -->
                       <div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div>
+                      <div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
                       <div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
                         <span v-if="item.isChargeLossOrders==1">恢复收损单</span>
                         <span v-else>设为收损单</span>
@@ -1819,6 +1820,18 @@
                   <span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span>
                 </div>
               </div>
+              <div>
+              <div>发票单据：</div>
+              <div>
+                <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
+                  <span v-if="item2.invoiceApplyState===6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState===1" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState===5" class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                  <span v-else-if="item2.invoiceApplyState===3" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
+                </span>
+                <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
+              </div>
+            </div>
           </td>
         </tr>
         </tbody>
@@ -2450,6 +2463,19 @@ export default {
     }
   },
   methods: {
+    goIisDetail: function (id) {  // 跳转发票详情页面
+        this.$router.push({
+          name: 'invoicesManagerDetail',
+          query: { id: id,noDetail: 1,blank: "y",}
+        });
+      },
+      // 申请发票
+      goUrlAdd: function (path, OrderId, TCID, customerId) {
+        this.$router.push({
+          name: path,
+          query: {OrderId: OrderId, TCID: TCID, customerId: customerId, blank: "y",}
+        });
+      },
     //跳转
       goUrlTS (path, id, orderId, title) {
         this.$router.push({

src/components/dmc/manager/dmcTotalTable.vue

@@ -455,7 +455,7 @@
           query: {
             "id": obj.TCIDS,
             NewCombinationNum:outItem.NewCombinationNum,
-            isUpdate: false,
+            isUpdate: true,
             blank: 'y',
             tab: title
           }

src/components/systemLogs.vue

 <style>
     .sysLog_Content{
-        width:100%;
         border-left:2px solid #D2D2D2;
-        margin-left:20px;
+        margin:40px 0 0 40px;
     }
     .sysLog_List{
         position: relative;
@@ -16,11 +15,15 @@
         border:2px solid #58D2A7;
         border-radius:50%;
         margin-right:10px;
+        position: relative;
+        top:-4px;
     }
     .sysFirDate{
         color:#38425D;
         font-weight: bold;
         font-size:12px;
+        position: relative;
+        top:-4px;
     }
     .sysContent_main{
         width:894px;
@@ -44,10 +47,14 @@
         background-color: #B1B1B1;
         border:2px solid #EFEFEF;
         margin-right:10px;
+        position: relative;
+        top:-3px;
     }
     .sysFirDate_other{
         color:#38425D;
         font-size:12px;
+        position: relative;
+        top:-4px;
     }
 </style>
 
@@ -57,7 +64,7 @@
             <div class="sysPosi_div">
                 <span class="sysCircle" v-if="index==0"></span>
                 <span class="sysCircle_other" v-else></span>
-                <span style="font-size:14px;margin-right:20px;">{{item.UpdateTitle}}</span>
+                <span style="font-size:14px;margin-right:20px;position:relative;top:-4px;">{{item.UpdateTitle}}</span>
                 <span class="sysFirDate" v-if="index==0">{{item.UpdateTimeStr}}</span>
                 <span class="sysFirDate_other" v-else>{{item.UpdateTimeStr}}</span>
             </div>
@@ -83,7 +90,6 @@
             this.apipost("sysrecord_get_GetPageList",this.msg,res => {
                 if (res.data.resultCode == 1) {
                     this.dataList = res.data.data.pageData;
-                    console.log(this.dataList,'datalist');
                 } else {
                     this.Error(res.data.message);
                 }

src/router/config.js

@@ -2939,16 +2939,13 @@ export default {
                 title: '奖项列表'
               }
             },
-            {
-              path: '/systemLogs', //版本更新记录
-              name: 'systemLogs',
-              component: resolve => require(['@/components/systemLogs'], resolve),
-              meta:{
-                title: '版本更新记录'
-              }
-            }
           ]
         },
+        {
+          path: '/systemLogs', //版本更新记录
+          name: 'systemLogs',
+          component: resolve => require(['@/components/systemLogs'], resolve),
+        },
         {
           path: '/permissionmanage',
           name: 'PermissionManage',