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

src/components/FinancialModule/BasicDocuments.vue

@@ -2349,7 +2349,7 @@ export default {
                 if(res.data.resultCode==1){
                     let data=res.data.data;
                     if(this.RB_Post_Id!=5&&this.userId!=1648){
-                        if(this.userId==1918){
+                        if(this.userId==1918 || this.userId==2113){
                             this.AccList = res.data.data;
                         }else{
                             data.forEach(item=>{

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -410,23 +410,19 @@ export default {
                            }
                        }) 
                       if(status){
-                        // console.log("this.GetDetail.DetailList[0].Remark",this.GetDetail.DetailList[0].Remark)
-                        this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
-                            if(res.data.resultCode==1){
-                              // console.log("res.data.data",res.data.data);
-                                if(res.data.data.length>0){
-                                  this.GetDetail.DetailList[0].Remark+=`   `+"刷卡:"
-                                  res.data.data.forEach(item=>{
-                                    this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
-                                  })
-                                } 
+                        // this.apipost('Financial_post_GetFinanceSwipingCard',{FrId:this.ID},res=>{
+                        //     if(res.data.resultCode==1){
+                        //         if(res.data.data.length>0){
+                        //           this.GetDetail.DetailList[0].Remark+=`   `+"刷卡:"
+                        //           res.data.data.forEach(item=>{
+                        //             this.GetDetail.DetailList[0].Remark+=`${item.Name}，`;
+                        //           })
+                        //         } 
                                 
-                            }else{
-                                this.Error(res.data.message)
-                            }
-                        },err=>{})
-                       
-
+                        //     }else{
+                        //         this.Error(res.data.message)
+                        //     }
+                        // },err=>{})
                       }
                     }
                 }

src/components/FinancialModule/invoicesManager.vue

@@ -80,14 +80,15 @@
 .page_iisMg ._icon_btn i.icon-sousuo:active{background-color: #35ab79}
 ._zhuihui{
   display: inline-block;
-  height: 20px;
-  width: 20px;
+  height: 30px;
+  width: 30px;
   border-radius: 50%;
   color: white;
   background-color: #e42d2d;
   text-align: center;
-  line-height: 20px;
+  line-height: 30px;
   cursor: pointer;
+  margin-right: 10px
 }
 </style>
 <template>
@@ -180,7 +181,6 @@
           <td :rowspan="item.InvoiceApplyList.length">{{item.ApplyTotalPrice}}</td>
           <td :rowspan="item.InvoiceApplyList.length">
             <span>{{item.DpreadPrice - item.ApplyTotalPrice}}</span>
-            <span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
           </td>
           <td>{{item.InvoiceApplyList[0].CreateDate.replace('T', ' ')}}</td>
           <td>
@@ -191,11 +191,15 @@
             <span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" class="status_owe">欠票</span>
             <span v-else-if="item.InvoiceApplyList[0].InvoiceApplyState === 6" class="status_Recover">发票追回</span>
           </td>
-          <td class="_icon_btn">
+          <td class="_icon_btn" style="text-align: left;padding-left: 20px">
             <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')"  placement="top">
               <i class="iconfont icon-sousuo"  @click="goIisDetail(item.InvoiceApplyList[0].ID)"></i>
             </el-tooltip>
-            <el-tooltip class="item"  effect="dark" content="追回"   placement="top">
+            <el-tooltip class="item"  effect="dark" content="追回发票"   placement="top">
+              <span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
+            </el-tooltip>
+            <el-tooltip class="item"  effect="dark" content="确认追回"   placement="top">
+              <!-- v-if="item.InvoiceApplyList[0].InvoiceApplyState === 5"  -->
               <i v-if="item.InvoiceApplyList[0].InvoiceApplyState === 5" class="iconfont icon-ico_commodity_defaul" @click="setStatus(item.InvoiceApplyList[0].ID, 6)"></i>
             </el-tooltip>
           </td>
@@ -210,11 +214,15 @@
             <span v-else-if="item2.InvoiceApplyState === 5" class="status_owe">欠票</span>
             <span v-else-if="item2.InvoiceApplyState === 6" class="status_Recover">发票追回</span>
           </td>
-          <td class="_icon_btn">
+          <td class="_icon_btn" style="text-align: left;padding-left: 20px">
             <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')"  placement="top">
               <i class="iconfont icon-sousuo"  @click="goIisDetail(item2.ID)"></i>
             </el-tooltip>
-            <el-tooltip class="item"  effect="dark" content="追回"   placement="top">
+            <el-tooltip class="item"  effect="dark" content="追回发票"   placement="top">
+              <span v-if="item.ApplyTotalPrice!=0" class="_zhuihui" @click="zhuihui(item.OrderId)">追</span>
+            </el-tooltip>
+            <el-tooltip class="item"  effect="dark" content="确认追回"   placement="top">
+              <!-- v-if="item2.InvoiceApplyState === 5" -->
               <i v-if="item2.InvoiceApplyState === 5" class="iconfont icon-ico_commodity_defaul" @click="setStatus(item2.ID, 6)"></i>
             </el-tooltip>
           </td>
@@ -265,11 +273,18 @@ export default {
   },
   methods: {
     zhuihui: function (OrderId) {
-      this.apipost('InvoiceApply_get_BatchUpdateInvoiceApply', {OrderId: OrderId}, res=>{
-        if (res.data.resultCode == 1) {
-          this.getPageList()
-        }
-      }, null)
+      this.$confirm('是否设置发票状态为追回？', this.$t('tips.tips'), {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+          }).then(() => {
+            this.apipost('InvoiceApply_get_BatchUpdateInvoiceApply', {OrderId: OrderId}, res=>{
+              if (res.data.resultCode == 1) {
+                this.getPageList()
+              }
+             }, null)
+          }).catch(() => {
+      });
     },
     goIisDetail: function (id) {
       this.$router.push({
@@ -283,11 +298,18 @@ export default {
         ID: id,
         InvoiceApplyState: type,
       }
-      this.apipost('InvoiceApply_get_UpdateInvoiceApply', msg, res=>{
-        if (res.data.resultCode == 1) {
-          this.getPageList()
-        }
-      }, null)
+      this.$confirm('是否设置发票状态为已追回？', this.$t('tips.tips'), {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+          }).then(() => {
+            this.apipost('InvoiceApply_get_UpdateInvoiceApply', msg, res=>{
+              if (res.data.resultCode == 1) {
+                this.getPageList()
+              }
+            }, null)
+          }).catch(() => {
+      });
     },
     timeAdd: function () {
       // 日期格式