车订单列表

src/components/CarDealerOrder/components/OrderList.vue

@@ -536,13 +536,20 @@
                   <span class="text-grey-6">{{scope.row.FinishTimeStr}}</span>
                 </span>
               </div>
+
               <div class="c9e fz12">
                 <span>{{ $t('OrderList.search.orderId') }}：</span>
-                <span>({{ scope.row.OrderId}})</span>
+                <span>{{ scope.row.OrderId}}</span>
                 <span class="copy cblack cursor-pointer" v-if="copyId != scope.row.OrderId"
                   @click="CopyHandler(scope.row)">复制</span>
                 <span v-else class="copy c059FF6 bgD9F3FF cursor-pointer"><i class="el-icon-check mr"></i>已复制</span>
               </div>
+              <div class="cblack fz12 mr" v-if="false">
+                <span class="">
+                  <span class="c9e">请求书：</span>
+                  <span class="text-grey-6">{{scope.row.PetitionId}}</span>
+                </span>
+              </div>
             </div>
             <div class="c9e fz12">
               <span>客人信息：{{scope.row.CustomerName}}
@@ -940,7 +947,8 @@
           // EmpIds:'',
           OtherType: 61,
           ReFinanceId: "",
-          ReFinanceId2: ""
+          ReFinanceId2: "",
+          CostType: '',
         },
         userInfo: {},
         msg: {
@@ -1350,8 +1358,8 @@
         }
         this.BillMakingMsg.ReFinanceId = row.OrderId;
         this.BillMakingMsg.ReFinanceId2 = num;
-        this.BillMakingMsg.OtherType = 66;
-
+        this.BillMakingMsg.OtherType = 80;
+        if(type==1) this.BillMakingMsg.CostType = 77
         let text = "";
         let query = {};
         if (num == 1) {
@@ -1367,6 +1375,7 @@
           tab: `新增${text}单据`,
           Type: type,
           tradeObj: JSON.stringify(this.BillMakingMsg),
+          companyID: 1248
           // companyID:row.OutBranchId
         };
         if (num == 2) {
@@ -1662,6 +1671,12 @@
     },
     mounted() {
       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;
       if (ActionMenuCode.indexOf('is_correlationOP') != -1) {
@@ -1672,6 +1687,7 @@
       window.onresize = () => {
         this.com_onresize();
       };
+
     }
   };
 

src/components/public/offset.vue

@@ -126,19 +126,8 @@
     },
     methods: {
       cancelBtn(){
-        if(this.queryObj.companyID){
-            this.$confirm("车行冲抵单据参数将丢失，是否继续关闭", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            })
-            .then(() => {
-              this.cdState = false
-              this.$emit('close',false)
-            }).catch(() => {
-              this.$message.info("已取消！");
-            });
-          }
+          this.cdState = false
+          this.$emit('close',false)
       },
         close(){
           this.cdState = false