门票 发票详情调整

src/components/Hotel/reservation/OrderList.vue

@@ -336,7 +336,7 @@
               {{ scope.row.OrderType == 1 ? "散拼订房" : "团队订房" }}
             </div>
 
-            
+
           </div>
           <div class="cblack fz14 mr"
                 :class="{ cF1416C: scope.row.IsFinish == 0,c20C997: scope.row.IsFinish == 1 }">
@@ -715,7 +715,7 @@
             'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
             'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
               v-for="(x, i) in scope.row.InvoiceApplyList"
-              @click="openDetails(x)"
+              @click="openDetails(x,scope.row)"
               >{{ x.ID }}</span
             >
             <span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
@@ -1206,15 +1206,27 @@ export default {
       );
     },
     // 单据详情
-    openDetails(item) {
+    openDetails(item,x) {
       let query = {
         id: item.FrID?item.FrID:item.ID,
         blank: "y",
       };
-      this.$router.push({
-        path: "/FinancialDocumentsDetail",
-        query
-      });
+      // 跳转发票详情页面
+      if(x){
+          this.$router.push({
+            name: "invoicesManagerDetail",
+            query: {
+              id: x.OrderId,
+              blank: "y",
+            },
+          });
+        }else{
+          this.$router.push({
+          path: "/FinancialDocumentsDetail",
+          query
+        });
+      }
+
     },
     // 制作单据
     makeAdocument(row, index, num, name,Offset) {

src/components/SingleAirTicket/components/OrderList.vue

@@ -774,7 +774,7 @@
           <div class="row wrap orderNo fz12 py">
             <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState==0,'bgFAEAED':x.InvoiceApplyState==1,'bjFFF3E0':x.InvoiceApplyState==2,
                 'c3FC4FF':x.InvoiceApplyState==0,'cF1416C':x.InvoiceApplyState==1,'cff9800':x.InvoiceApplyState==2}"
-              v-for="(x, i) in item.InvoiceApplyList" @click="goInvoiceDetail(x)" :key="i+40000">{{ x.ID }}</span>
+              v-for="(x, i) in item.InvoiceApplyList" @click="goInvoiceDetail(x,item)" :key="i+40000">{{ x.ID }}</span>
             <span v-if="item.InvoiceApplyList.length == 0" class="c9e fz12">
               暂无发票单据
             </span>

src/components/busManagement/BookAcar/components/orderList.vue

@@ -817,7 +817,7 @@
             'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
             'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
               v-for="(x, i) in scope.row.InvoiceApplyList"
-              @click="openDetails(x)"
+              @click="openDetails(x,scope.row)"
               >{{ x.ID }}</span
             >
             <span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
@@ -1412,15 +1412,26 @@ export default {
       );
     },
     // 单据详情
-    openDetails(item) {
+    openDetails(item,x) {
       let query = {
         id: item.FrID?item.FrID:item.ID,
         blank: "y",
       };
-      this.$router.push({
-        path: "/FinancialDocumentsDetail",
-        query,
-      });
+      // 跳转发票详情页面
+      if(x){
+          this.$router.push({
+            name: "invoicesManagerDetail",
+            query: {
+              id: x.OrderId,
+              blank: "y",
+            },
+          });
+        }else{
+          this.$router.push({
+            path: "/FinancialDocumentsDetail",
+            query
+          });
+        }
     },
     // 制作单据
     makeAdocument(row, index, num, Offset) {

src/components/myOrdersAllType/components/OrderList.vue

@@ -603,7 +603,6 @@
     <!-- 申请弹窗 -->
     <div class="combottomDiv OPremarkDiv" v-if="changePriceMsg.outerVisible">
       <div class="combottomTitle">{{ titlePrice }}
-
         <span style="margin-left: 20px;">
           提示：
           <span style="color: red;">
@@ -612,37 +611,38 @@
             方可帐平</span>
         </span>
       </div>
+      <div slot="footer" class="dialog-footer"
+      style="float: right;margin-right: 5%;position: relative; z-index: 1;">
+        <button
+          class="hollowFixedBtn"
+          @click="changePriceMsg.outerVisible = false"
+        >
+          {{ $t("pub.cancelBtn") }}
+        </button>
+        <button class="normalBtn" type="primary" @click="setChangePrice">
+          {{ $t("pub.sureBtn") }}
+        </button>
+      </div>
       <el-form label-width="100px">
-        <el-col :span="8">
+        <el-col :span="4">
           <el-form-item label="应收总金额" prop="">
             <el-input
               type="number"
               v-model="changePriceMsg.Money"
-              rows="6"
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="6">
           <el-form-item label="改价原因" prop="">
             <el-input
               type="textarea"
               v-model="changePriceMsg.ApplyForReason"
-              rows="6"
+              autosize
             ></el-input>
           </el-form-item>
         </el-col>
       </el-form>
-      <div slot="footer" class="dialog-footer">
-        <button
-          class="hollowFixedBtn"
-          @click="changePriceMsg.outerVisible = false"
-        >
-          {{ $t("pub.cancelBtn") }}
-        </button>
-        <button class="normalBtn" type="primary" @click="setChangePrice">
-          {{ $t("pub.sureBtn") }}
-        </button>
-      </div>
+
     </div>
     <!-- 审核弹窗 -->
     <div
@@ -699,22 +699,22 @@
         <el-row>
           <el-col :span="4">
             <el-form-item label="订单应收总金额">
-              <span rows="6">
+              <span>
                 {{ changePriceMsg.PreferPrice }}
               </span>
             </el-form-item></el-col
           >
 
-          <el-col :span="8">
+          <el-col :span="16">
             <el-form-item label="申请理由">
-              <span rows="6">{{ changePriceMsg.ApplyForReason }} </span>
+              <span>{{ changePriceMsg.ApplyForReason?changePriceMsg.ApplyForReason:'-' }} </span>
             </el-form-item></el-col
           >
         </el-row>
         <el-row>
           <el-col :span="4">
             <el-form-item label="申请总金额">
-              <span rows="6">{{ changePriceMsg.ApplyForMoney }}</span>
+              <span>{{ changePriceMsg.ApplyForMoney }}</span>
             </el-form-item></el-col
           >
           <el-col :span="4">
@@ -738,13 +738,13 @@
               </el-radio-group>
             </el-form-item></el-col
           >
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item label="审核理由" prop="">
               <el-input
                 :readonly="changePriceMsg.DialogType == 1 ? true : false"
                 type="textarea"
                 v-model="changePriceMsg.RefuseReason"
-                rows="6"
+                autosize
               ></el-input> </el-form-item
           ></el-col>
         </el-row>

src/components/scenicSpot/reservation/OrderList.vue

@@ -792,7 +792,7 @@
             'bjFFF3E0':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5,
             'c3FC4FF':x.InvoiceApplyState===6,'cF1416C':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
             'cff9800':x.InvoiceApplyState===2||x.InvoiceApplyState===4||x.InvoiceApplyState===5}"
-                  v-for="(x, i) in scope.row.InvoiceApplyList" @click="openDetails(x)">{{ x.ID }}</span>
+                  v-for="(x, i) in scope.row.InvoiceApplyList" @click="openDetails(x,scope.row)">{{ x.ID }}</span>
                 <span v-if="scope.row.InvoiceApplyList&&scope.row.InvoiceApplyList.length == 0" class="c9e fz12">
                   暂无发票单据
                 </span>
@@ -1197,7 +1197,7 @@
       },
       OrderList: {
         handler(val, oldVal) {
-          
+
         }
       }
     },
@@ -1421,15 +1421,26 @@
         );
       },
       // 单据详情
-      openDetails(item) {
+      openDetails(item,x) {
         let query = {
           id: item.FrID ? item.FrID : item.ID,
           blank: "y",
         };
-        this.$router.push({
-          path: "/FinancialDocumentsDetail",
-          query
-        });
+        // 跳转发票详情页面
+        if(x){
+          this.$router.push({
+            name: "invoicesManagerDetail",
+            query: {
+              id: x.OrderId,
+              blank: "y",
+            },
+          });
+        }else{
+          this.$router.push({
+            path: "/FinancialDocumentsDetail",
+            query
+          });
+        }
       },
       // 制作单据
       makeAdocument(row, index, num, Offset) {