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

src/components/Complaints/ComplaintsDetail.vue

@@ -163,8 +163,22 @@
   }
 
   .CD_dealResult:hover {
-    text-decoration: underline;
-    color: #E95252;
+    /* text-decoration: underline; */
+    /* color: #E95252; */
+  }
+  .CD_dealResultf{
+    border-radius: 3px;
+    background-color: #33B3FF;
+    color: #fff;
+    cursor: pointer;
+  }
+  .CD_dealResultf:hover {
+    /* text-decoration: underline; */
+    background-color: #E95252;
+    color: #fff;
+  }
+  .ComplaintsDetail .CD_aboutList ul li span.CD_dealResult,.ComplaintsDetail .CD_aboutList ul li span.CD_dealResultf{
+    width: auto;
   }
 
   .CD_ListLi li {
@@ -186,6 +200,20 @@
   .CD_ListLi li.checked {
     border: 1px #d81e06 solid;
   }
+  .CD_dealResultfZD{
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+  }
+  .CD_dealResultfZD span{
+    width: auto;
+  }
+  .CD_dealResultfZD div span{
+    height: 20px;
+    line-height: 20px;
+    margin-left: 3px;
+    padding: 0 2px;
+  }
 </style>
 <template>
   <div v-loading="loading">
@@ -234,11 +262,25 @@
             <li v-if="ComplainInfo.DisposeStatus===4">
               <span>已赔金额：</span>{{getBackMoney()}}
             </li>
-            <li
+            <li style="display: flex;width: 100%;"
               v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainInfo.CreateBy || getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
-              <span>立即制单：</span>
-              <span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
-                    @click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
+              <span style="flex-shrink: 0;">立即制单：</span>
+              <div class="CD_dealResultfZD" v-for="(compensation,index) in ComplainCompensation"
+              :style="{'margin-left':index!=0?'20px':''}">
+                  <span class="CD_dealResult"
+                    >{{compensation.CompensateMoney}}
+                  </span>
+                  <div>
+                    <span class="CD_dealResultf" @click="setFinance(compensation)">
+                      转账付款
+                    </span>
+                    <span class="CD_dealResultf" @click="setFinanceYL(compensation)">
+                      原路退款
+                    </span>
+                  </div>
+
+                </div>
+
             </li>
             <li
               v-if="ComplainInfo.DisposeStatus===4&&getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy">
@@ -627,6 +669,41 @@
           })
         }
 
+      },
+      //设置财务单据
+      setFinanceYL (compensation) {
+        let id = [252];//团费原路退款
+        //TODO跳转到财务单据
+        if (compensation.FinanceID === 0) {
+          var TCArr = [this.PriceInfo.TCID]
+          let orderObj = {
+            OrderID: this.PriceInfo.OrderId,
+            OrderSource: 11,
+            Obj: {},
+            SourceID: compensation.ID,
+            TCIDList: TCArr
+          }
+          this.$router.push({
+            name: 'ChoiceAddFinancialDocuments',
+            query: {
+              Type: 1,
+              templateID: JSON.stringify(id),
+              companyID: this.PriceInfo.OutBranchId,
+              'blank': 'y',
+              'orderObj': JSON.stringify(orderObj)
+            }
+          })
+        } else if (compensation.FinanceID > 0) {
+          this.$router.push({
+            name: 'FinancialDocumentsDetail',
+            query: {
+              id: compensation.FinanceID,
+              blank: 'y',
+              tab: this.$t('objFill.documentparticulars')
+            }
+          })
+        }
+
       },
       //保存结果
       saveResult () {
@@ -737,7 +814,13 @@
       getBackMoney () {
         let money = 0
         this.ComplainCompensation.forEach(x => {
+          if(x.BackMoney<0){
+            money += (x.BackMoney*-1)
+          }
+          else{
             money += x.BackMoney
+          }
+
         })
         return money
       },

src/components/FinancialModule/FinancialDocuments.vue

@@ -1403,15 +1403,15 @@
               <el-option v-for="(item,index) in costList" :key="index" :label="item.Name" :value='item.ID'></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item>
-            <input type="button" :value="$t('pub.searchBtn')" class="hollowFixedBtn" @click="czgetList">
-          </el-form-item>
           <el-form-item :label="$t('fnc.jiaoyiriqi')">
             <el-date-picker v-model="czdateList" type="daterange" :range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')"
               :end-placeholder="$t('OrderList.end')">
             </el-date-picker>
           </el-form-item>
-
+          <el-form-item>
+            <input type="button" :value="$t('pub.searchBtn')" class="hollowFixedBtn" @click="czgetList">
+            <input type="button" :value="$t('visa.v_daochu')" class="hollowFixedBtn" @click="downloadczgetList">
+          </el-form-item>
         </el-form>
         <p style="color: red;text-align: right;padding: 5px;">{{$t('objFill.balanceouttisp')}}</p>
         <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="yfcdLoading">
@@ -2167,7 +2167,25 @@
           null
         );
       },
+      downloadczgetList() {
+        if (this.czdateList && this.czdateList.length > 0) {
+          this.czMsg.sTradeDate = this.czdateList[0];
+          this.czMsg.eTradeDate = this.czdateList[1];
+        } else {
+          this.czMsg.sTradeDate = "";
+          this.czMsg.eTradeDate = "";
+        }
         
+        let msg = Object.assign({}, this.czMsg);
+        if (msg.FrID == "") {
+          msg.FrID = 0;
+        }
+        msg.EmployeeId=this.getLocalStorage().EmployeeId
+        this.yfcdLoading = true
+        this.GetLocalFile("Financial_get_OutToAdvanceFinance", msg, "预付款冲抵"+
+          ".xls");
+          this.yfcdLoading = false
+      },
       HebingSPLast() {
         if (this.checkList.length == 0) {
           this.Error(this.$t('fnc.a_qxzdanju'));