车行订单

src/components/CarDealerOrder/components/OrderList.vue

@@ -658,10 +658,10 @@
                   暂无收款单据
                 </span>
               </div>
-              <!-- <el-tooltip v-if="scope.row.OrderState == 2" class="item" effect="dark" content="制单" placement="top">
+              <el-tooltip v-if="scope.row.OrderState == 1" class="item" effect="dark" content="制单" placement="top">
                 <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(scope.row, index, 1)"></i>
-              </el-tooltip> -->
+                  @click="makeAdocument(scope.row, 1)"></i>
+              </el-tooltip>
             </div>
             <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
               <div class="fz12">退款单据</div>
@@ -673,10 +673,10 @@
                   暂无退款单据
                 </span>
               </div>
-              <!-- <el-tooltip v-if="scope.row.OrderState == 2" class="item" effect="dark" content="制单" placement="top">
+              <el-tooltip v-if="scope.row.OrderState == 1" class="item" effect="dark" content="制单" placement="top">
                 <i class="absolute right20 bottom20 el-icon-circle-plus cursor-pointer c059FF6"
-                  @click="makeAdocument(scope.row, index, 2)"></i>
-              </el-tooltip> -->
+                  @click="makeAdocument(scope.row, 2)"></i>
+              </el-tooltip>
             </div>
             <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
               <div class="fz12">成本单据</div>
@@ -688,16 +688,16 @@
                   暂无成本单据
                 </span>
               </div>
-              <!-- <div class="item absolute right20 bottom20" v-if="scope.row.OrderState == 2 && pagesTitle != '销售'">
+              <div class="item absolute right20 bottom20" v-if="scope.row.OrderState == 1 && pagesTitle != '销售'">
                 <el-tooltip class="" effect="dark" content="制单" placement="top">
-                  <i class="el-icon-circle-plus cursor-pointer c059FF6" @click="makeAdocument(scope.row, index, 3)"></i>
+                  <i class="el-icon-circle-plus cursor-pointer c059FF6" @click="makeAdocument(scope.row, 3)"></i>
                 </el-tooltip>
-                <el-tooltip v-if="scope.row.OrderState == 2" class="" effect="dark" content="冲抵" placement="top">
-                  <i class="el-icon-circle-plus cursor-pointer c3FC4FF" @click="isOffset(scope.row, index, 3)"></i>
+                <el-tooltip v-if="scope.row.OrderState == 1" class="" effect="dark" content="冲抵" placement="top">
+                  <i class="el-icon-circle-plus cursor-pointer c3FC4FF" @click="isOffset(scope.row, 3)"></i>
                 </el-tooltip>
-              </div> -->
               </div>
-            <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
+            </div>
+            <div v-if="false" class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
               <div class="fz12">发票单据</div>
               <div class="row wrap orderNo fz12 py">
                 <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
@@ -725,16 +725,6 @@
                 <i v-loading="msg.OrderId == scope.row.OrderId && loading1"></i>
                 <span class="c20C997">确认订单</span>
               </div>
-              <div v-if="scope.row.OrderState == 2 && scope.row.MailingState == 2 && pagesTitle != '销售'"
-                class="row-c cursor-pointer radius5 cancel py5" @click="clickRightButtom(scope.row, 2)">
-                <i v-loading="msg.OrderId == scope.row.OrderId && loading1"></i>
-                <span class="cF1416C">邮寄</span>
-              </div>
-              <div v-if="(scope.row.OrderState == 1 && pagesTitle == '销售')||(scope.row.OrderState >1 && scope.row.OrderState != 3
-            &&pagesTitle=='OP'&&is_correlationOP)" class="row-c cursor-pointer radius5 change py5"
-                @click="goRoomDetails(scope.row, pagesTitle=='销售'?'门票预定变更':'编辑取票方式')">
-                <span class="c059FF6">{{pagesTitle=='销售'?'订单变更':'编辑取票方式'}}</span>
-              </div>
               <div v-if="scope.row.OrderState > 1" class="row-c cursor-pointer radius5 change1 py5"
                 @click="clickRightButtom(scope.row, 4)">
                 <i v-loading="msg.OrderId == scope.row.OrderId && loading2"></i>
@@ -766,39 +756,6 @@
       </el-table-column>
     </el-table>
 
-    <el-dialog custom-class="w400" :title="typeState == 3 ? '设置自提地址' : '设置收损金额'" :visible.sync="outerVisible">
-      <div>
-        <el-form label-width="80px" :model="msg" :rules="rules" ref="msg">
-          <el-row :gutter="20">
-            <!-- <el-col :span="20">
-              <el-form-item label="订单状态" prop="State">
-                <el-select v-model="msg.State" class="w110 HworkInput">
-                  <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="20" v-if="typeState == 3">
-              <el-form-item label="自提地址" prop="SelffetchAddress">
-                <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="msg.SelffetchAddress">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="20" v-if="typeState == 4">
-              <el-form-item label="收损金额" prop="LossMoney">
-                <el-input-number class="w200" v-model="msg.LossMoney" :min="0" :max="10000000"></el-input-number>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" style="margin-top: 20px;margin-bottom: 20px;">
-            <el-col :span="24" style="text-align: right;">
-              <input type="button" class="normalBtn" value="保存" @click="submitForm('msg')" />
-              <input type="button" class="hollowFixedBtn" value="取消"
-                @click="(outerVisible = false), $refs['msg'].resetFields()" />
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-    </el-dialog>
     <el-dialog custom-class="w600" title="取消订单" :visible.sync="cancelOrderDialog">
       <div style="padding-bottom:20px">
         <el-input type="textarea" autofocus rows="5" placeholder="请填写取消订单的缘由" clear="w300" v-model="cancelRemark">
@@ -1118,8 +1075,8 @@
       this.queryObj =  query
       this.cdState = true
     },
-      isOffset(row, index, num) {
-        this.makeAdocument(row, index, num, 'Offset')
+      isOffset(row, num) {
+        this.makeAdocument(row, num, 'Offset')
       },
       editRemark(item) {
         this.postMsg.OrderId = item.OrderId
@@ -1342,7 +1299,7 @@
         }
       },
       // 制作单据
-      makeAdocument(row, index, num, Offset) {
+      makeAdocument(row, num, Offset) {
         if ((num == 2 || num == 3) && (row.Income+row.PlatformMoney) <= 0) {
           this.Info('请先制收款单据，再制成本或退款单据！')
           return
@@ -1370,19 +1327,24 @@
           text = "成本";
         }
 
+
         query = {
           blank: "y",
           tab: `新增${text}单据`,
           Type: type,
           tradeObj: JSON.stringify(this.BillMakingMsg),
-          companyID: 1248
-          // companyID:row.OutBranchId
+          companyID: 1248,
         };
-        if (num == 2) {
-          query.searchTitle = '溢收团费退款';
-        } else if (num == 3 && this.cdState == false) {
-          query.portTypeId = 6;
+        // 检索财务流程
+        if(num==1){
+          query.searchTitle = row.PayWay==1?'车行月结收入':'收款'
+        }else if(num==2) {
+          query.searchTitle = '溢收团费退款'
+        }else if(num==3) {
+          query.searchTitle = row.PayWay==1?'车行成本月结':'车行车资付款'
+          if(this.cdState == false) query.portTypeId = 6;
         }
+
         this.queryObj = query
         if (!Offset) {
           this.$store.commit("ChoiceAddFinancialDocuments");
@@ -1392,52 +1354,6 @@
           });
         }
       },
-      // 订单明细
-      goRoomDetails(obj, title) {
-        var path
-        if (title === '订房详情') {
-          path = "roomReservationsDetails";
-          if (this.userInfo.RB_Group_id == 91) {
-            path = "roomReservationsDetails_swt";
-          }
-          this.$router.push({
-            name: path,
-            query: {
-              id: obj.OrderId,
-              OrderType: 1,
-              blank: "y",
-              tab: title
-            }
-          });
-        } else { //变更门票预定
-          this.msgParameter = JSON.parse(JSON.stringify(obj))
-          this.msgParameter.MailingState = JSON.stringify(this.msgParameter.MailingState)
-          this.msgParameter.Sex = JSON.stringify(this.msgParameter.Sex)
-          this.ChangeOrderDialog = true
-          // 获取自取地址
-          this.GetTicketCouponsInfo()
-        }
-      },
-      GetTicketCouponsInfo() {
-        this.apipost('ticket_post_GetTicketCouponsInfo', {
-            CouponsId: this.msgParameter.CouponsId,
-            OpenTime: this.msgParameter.UseDate,
-          },
-          res => {
-            this.loading3 = false
-            if (res.data.resultCode == 1) {
-              this.msgParameter.SelffetchAddress = res.data.data.SelffetchAddress
-              let arr = res.data.data.TicketPriceList.sort((a, b) => {
-                return a.MailingMoney - b.MailingMoney
-              })
-              this.msgParameter.MailingMoney = this.msgParameter.MailingMoney ? this.msgParameter.MailingMoney : arr[
-                0].MailingMoney
-            }
-          },
-          err => {
-            this.Error(err.message)
-          })
-      },
       clickRightButtom(item, type) {
         // 0取消订单 1确认订单 2已邮寄 3设置自提地址 4收损
         this.msg.OrderId = item.OrderId;
@@ -1673,9 +1589,6 @@
       if(localStorage.typeSystem) this.typeSystem = localStorage.typeSystem
       if(this.$route.query.cdState=='true'){
         this.addBalanceout()
-        let datas = this.$route.query
-        let tradeObj = datas.tradeObj
-        this.msg.OrderId = datas.tradeObj.ReFinanceId
       }
       this.userInfo = this.getLocalStorage();
       let ActionMenuCode = this.userInfo.ActionMenuCode;

src/components/CarDealerOrder/components/ReservationOrder.vue

@@ -288,6 +288,13 @@ export default {
               this.CustomerList = res.data.data;
           }
       }, err => {})
+      this.apipost('JapanCar_get_GetJapanCarPayWay', {
+        keyWord: ''
+      }, res => {
+          if(res.data.resultCode == 1) {
+              this.PaymentMethods = res.data.data;
+          }
+      }, err => {})
     },
     getEmployee() { //员工
         let userInfo=this.getLocalStorage();
@@ -380,6 +387,7 @@ export default {
             addList(data)
             data.forEach(item => {
               item.typeInfo = this.OrderStatusType.find(y => y.ID == item.OrderState) ?? this.OrderStatusType[1]
+              item.paymentInfo = this.PaymentMethods.find(y => y.Id == item.PayWay) ?? this.PaymentMethods[1]
               if(item.OrderDetailList.length>2){
                 item.isMore = true
               }
@@ -419,6 +427,11 @@ export default {
     },
   },
   created() {
+      if(this.$route.query&&this.$route.query.tradeObj){
+        let datas = this.$route.query
+        let tradeObj = JSON.parse(datas.tradeObj)
+        this.msg.OrderId = tradeObj.ReFinanceId
+      }
     if (this.$route.query.OrderId) {
       this.msg.OrderId = this.$route.query.OrderId
     }

src/components/Hotel/reservation/OrderList.vue

@@ -1521,9 +1521,7 @@ export default {
     window.onresize = () => {
       this.com_onresize();
     };
-    if(this.$route.query.cdState=='true'){
-      this.addBalanceout()
-    }
+
 
   }
 };