页面修改

src/components/SalesVisa/components/VisaProductOrder.vue

@@ -321,11 +321,6 @@
               <el-input class='w220' v-model='msg.Name' :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
-          <!-- <li>
-                      <span>
-                          <em>送签日期</em><el-date-picker v-model='msg.SendStartDate'  class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>-<el-date-picker v-model='msg.SendEndDate'  class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
-                      </span>
-                  </li> -->
           <li>
             <span>
               <em>订单状态</em>

src/components/SalesVisa/components/visaOrderList.vue

 <style scoped>
-.row {
+  .row {
     display: flex;
-}
+  }
 
-.row-c {
+  .row-c {
     display: flex;
     align-items: center;
-}
+  }
 
-.column {
+  .column {
     display: flex;
     flex-direction: column;
-}
+  }
 
-.column-jac {
+  .column-jac {
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
-}
+  }
 
-.column-ac {
+  .column-ac {
     display: flex;
     flex-direction: column;
     align-items: center;
-}
+  }
 
-.wrap {
+  .wrap {
     flex-wrap: wrap;
-}
+  }
 
-.justify-sb {
+  .justify-sb {
     justify-content: space-between;
-}
+  }
 
-.justify-c {
+  .justify-c {
     justify-content: center;
-}
+  }
 
-.justify-e {
+  .justify-e {
     justify-content: flex-end;
     align-items: flex-end;
-}
+  }
 
-.flex-g {
+  .flex-g {
     flex-grow: 1;
-}
+  }
 
-.flex-s {
+  .flex-s {
     flex-shrink: 0;
-}
+  }
 
-.align-c {
+  .align-c {
     align-items: center;
-}
+  }
 
-.cblack {
+  .cblack {
     color: black;
-}
+  }
 
-.cf {
+  .cf {
     color: #ffffff;
-}
+  }
 
-.c9e {
+  .c9e {
     color: #9e9e9e;
-}
+  }
 
-.c20C997 {
+  .c20C997 {
     color: #20c997;
-}
+  }
 
-.c02C854 {
+  .c02C854 {
     color: #02c854;
-}
+  }
 
-.cff9800 {
+  .cff9800 {
     color: #ff9800;
-}
+  }
 
-.cF1416C {
+  .cF1416C {
     color: #f1416c;
-}
+  }
 
-.cF57A98 {
+  .cF57A98 {
     color: #f57a98;
-}
+  }
 
-.c04C8C8 {
+  .c04C8C8 {
     color: #04c8c8;
-}
+  }
 
-.c059FF6 {
+  .c059FF6 {
     color: #059ff6;
-}
+  }
 
-.c3FC4FF {
+  .c3FC4FF {
     color: #3fc4ff;
-}
+  }
 
-.fz10 {
+  .fz10 {
     font-size: 10px;
-}
+  }
 
-.fz11 {
+  .fz11 {
     font-size: 11px;
-}
+  }
 
-.fz12 {
+  .fz12 {
     font-size: 12px;
-}
+  }
 
-.fz13 {
+  .fz13 {
     font-size: 13px;
-}
+  }
 
-.fz14 {
+  .fz14 {
     font-size: 14px;
-}
+  }
 
-.fz15 {
+  .fz15 {
     font-size: 15px;
-}
+  }
 
-.fz16 {
+  .fz16 {
     font-size: 16px;
-}
+  }
 
-.fz17 {
+  .fz17 {
     font-size: 17px;
-}
+  }
 
-.fz18 {
+  .fz18 {
     font-size: 18px;
-}
+  }
 
-.fbold {
+  .fbold {
     font-weight: bold;
-}
+  }
 
-.ml {
+  .ml {
     margin-left: 10px;
-}
+  }
 
-.mr {
+  .mr {
     margin-right: 10px;
-}
+  }
 
-.mt {
+  .mt {
     margin-top: 10px;
-}
+  }
 
-.mt20 {
+  .mt20 {
     margin-top: 20px;
-}
+  }
 
-.mb {
+  .mb {
     margin-bottom: 10px;
-}
+  }
 
-.mb20 {
+  .mb20 {
     margin-bottom: 20px;
-}
+  }
 
-.mx {
+  .mx {
     margin-left: 10px;
     margin-right: 10px;
-}
+  }
 
-.mx5 {
+  .mx5 {
     margin-left: 5px;
     margin-right: 5px;
-}
+  }
 
-.mb5 {
+  .mb5 {
     margin-bottom: 5px;
-}
+  }
 
-.py {
+  .py {
     padding: 15px 0;
-}
+  }
 
-.py5 {
+  .py5 {
     padding: 5px 0;
-}
+  }
 
-.px5 {
+  .px5 {
     padding: 0 5px;
-}
+  }
 
-.px15 {
+  .px15 {
     padding: 0 15px;
-}
+  }
 
-.pa15 {
+  .pa15 {
     padding: 15px;
-}
+  }
 
-.py20 {
+  .py20 {
     padding: 20px 0;
-}
+  }
 
-.pb5 {
+  .pb5 {
     padding: 0 0 5px 0;
-}
+  }
 
-.pa {
+  .pa {
     padding: 10px 20px;
-}
+  }
 
-.pa20 {
+  .pa20 {
     padding: 20px;
-}
+  }
 
-.pt20 {
+  .pt20 {
     padding: 20px 0;
-}
+  }
 
-.borderD {
+  .borderD {
     border-bottom: 1px dashed #dddddd;
-}
+  }
 
-.bgf {
+  .bgf {
     background: #ffffff;
-}
+  }
 
-.bgf5 {
+  .bgf5 {
     background: #f5f5f5;
-}
+  }
 
-.bgE8F5E9 {
+  .bgE8F5E9 {
     background: #e8f5e9;
-}
+  }
 
-.bgD9F3FF {
+  .bgD9F3FF {
     background: #d9f3ff;
-}
+  }
 
-.bgFAEAED {
+  .bgFAEAED {
     background: #faeaed;
-}
+  }
 
-.bj {
+  .bj {
     background: #ffffff;
-}
+  }
 
-.bjFFF3E0 {
+  .bjFFF3E0 {
     background: #FFF3E0;
-}
+  }
 
-.radius5 {
+  .radius5 {
     border-radius: 5px;
-}
+  }
 
-.cursor-pointer {
+  .cursor-pointer {
     cursor: pointer;
-}
+  }
 
-.relative {
+  .relative {
     position: relative;
-}
+  }
 
-.absolute {
+  .absolute {
     position: absolute;
-}
+  }
 
-.left0 {
+  .left0 {
     left: 0;
-}
+  }
 
-.right0 {
+  .right0 {
     right: 0;
-}
+  }
 
-.top0 {
+  .top0 {
     top: 0;
-}
+  }
 
-.bottom0 {
+  .bottom0 {
     bottom: 0;
-}
+  }
 
-.left20 {
+  .left20 {
     left: 020px;
-}
+  }
 
-.right20 {
+  .right20 {
     right: 20px;
-}
+  }
 
-.top20 {
+  .top20 {
     top: 20px;
-}
+  }
 
-.bottom20 {
+  .bottom20 {
     bottom: 20px;
-}
+  }
 
-.text-center {
+  .text-center {
     text-align: center;
-}
+  }
 
-.orderType {
+  .orderType {
     padding: 3px 15px;
     border-radius: 3px;
     background: #f57a98;
     margin-right: 15px;
-}
+  }
 
-.orderType.active {
+  .orderType.active {
     background: #4dd0e1;
-}
+  }
 
-.orderType.activeNo {
+  .orderType.activeNo {
     background: #E95252;
-}
+  }
 
-.copy {
+  .copy {
     display: inline-block;
     padding: 3px 15px;
     border-radius: 3px;
     margin-left: 20px;
-}
+  }
 
-.copy:hover {
+  .copy:hover {
     background: #f5f5f5;
-}
+  }
 
-.see-rec div {
+  .see-rec div {
     padding: 1px 5px;
     border-radius: 3px;
-}
+  }
 
-.see {
+  .see {
     border: 1px solid #04c8c8;
-}
+  }
 
-.seeLK {
+  .seeLK {
     border: 1px solid #059ff6;
-}
+  }
 
-.see:hover {
+  .see:hover {
     background-color: rgba(4, 200, 200, 0.1);
-}
+  }
 
-.rec {
+  .rec {
     border: 1px solid #04c8c8;
     background-color: rgba(4, 200, 200, 1);
-}
+  }
 
-.rec:hover {
+  .rec:hover {
     border: 1px solid rgba(4, 200, 200, 0.9);
     background-color: rgba(4, 200, 200, 0.9);
-}
+  }
 
-.cancel:hover {
+  .cancel:hover {
     background-color: #f3dce2;
-}
+  }
 
-.confirm:hover {
+  .confirm:hover {
     background-color: #dcedc8;
-}
+  }
 
-.change:hover {
+  .change:hover {
     background-color: #d7e9f3;
-}
+  }
 
-.change1:hover {
+  .change1:hover {
     background-color: #dcedc8;
-}
+  }
 
-.orderop {
+  .orderop {
     text-align: center;
-}
+  }
 
-.orderop div {
+  .orderop div {
     display: flex;
     justify-content: center;
     padding: 0 10px;
     margin: 5px 0;
-}
+  }
 
-.RoomList div {
+  .RoomList div {
     border-bottom: 1px solid #e7e7e7;
-}
+  }
 
-.RoomList div:last-child {
+  .RoomList div:last-child {
     border: 0;
-}
+  }
 
-.el-table {
+  .el-table {
     font-size: 13px;
-}
+  }
 
-.shezhifrom {
+  .shezhifrom {
     position: relative;
-}
+  }
 
-.shebox {
+  .shebox {
     position: absolute;
     top: 0;
     left: -100px;
     display: none;
-}
+  }
 
-.shezhifrom:hover .shebox {
+  .shezhifrom:hover .shebox {
     display: block;
-}
+  }
 
-.flexOne-form-bj h3 {
+  .flexOne-form-bj h3 {
     font-size: 18px;
     color: black;
     padding: 0 0 20px 0;
     font-weight: 400;
-}
+  }
 
-.flexOne-type {
+  .flexOne-type {
     display: flex;
     align-items: center;
     padding: 0 0 20px 0;
-}
+  }
 
-.flexOne-type b {
+  .flexOne-type b {
     font-size: 13px;
     width: 100px;
     flex-shrink: 0;
-}
+  }
 
-.flexOne-type div {
+  .flexOne-type div {
     display: flex;
-}
+  }
 
-.flexOne-description {
+  .flexOne-description {
     padding: 15px 15px;
     border-radius: 5px;
     background: #E1F5FE;
     margin-bottom: 20px;
-}
+  }
 
-.flexOne-description b {
+  .flexOne-description b {
     font-size: 14px;
-}
+  }
 
-.flexOne-description p {
+  .flexOne-description p {
     font-size: 12px;
     color: #4C5759;
     padding: 10px 0 0 0;
-}
+  }
 
-.flexOne-infor-box b {
+  .flexOne-infor-box b {
     font-size: 13px;
-}
+  }
 
-.infor-list {
+  .infor-list {
     display: flex;
     flex-direction: column;
-}
+  }
 
-.list-title {
+  .list-title {
     padding: 20px 0;
     border-bottom: 1px dashed #eeeeee;
     color: #7E8299;
     font-size: 13px;
-}
+  }
 
-.list-title,
-.list-centent {
+  .list-title,
+  .list-centent {
     display: flex;
     flex-wrap: wrap;
     margin-top: 20px;
-}
+  }
 
-.infor-list li {
+  .infor-list li {
     width: 25%;
-}
+  }
 
-.list-centent li {
+  .list-centent li {
     width: 33.33%;
-}
+  }
 
-.list-centent.active li {
+  .list-centent.active li {
     width: 25%;
-}
+  }
 
-/deep/.el-table tr td:first-child {
+  /deep/.el-table tr td:first-child {
     /* border-bottom: 0; */
-}
+  }
 
-/deep/.el-table tr:last-child td {
+  /deep/.el-table tr:last-child td {
     border-bottom: 1px solid #EBEEF5;
 
-}
+  }
 
-/deep/.el-table tr td {
+  /deep/.el-table tr td {
     border-bottom: 1px solid #EBEEF5;
 
-}
-/deep/.el-table .el-table__cell{
+  }
+
+  /deep/.el-table .el-table__cell {
     padding: 5px 0;
-}
+  }
+
 </style>
 
 <template>
@@ -507,33 +509,26 @@
       <el-button class="hollowFixedBtn" v-if="IsSupperOrderEdit&&pagesTitle!='销售'" @click="setCompleted"
         :loading="CompletedLoading">一键完结</el-button>
     </div>
-    <el-table
-          ref="multipleTable"
-          :data="OrderList"
-          tooltip-effect="dark"
-          style="width: 100%"
-          row-key="id"
-          @selection-change="handleSelectionChange"
-         >
-         <el-table-column
-            type="selection"
-            :selectable="selectable"
-            :reserve-selection="true"  v-if="IsSupperOrderEdit&&pagesTitle!='销售'"/>
+    <el-table ref="multipleTable" :data="OrderList" tooltip-effect="dark" style="width: 100%" row-key="id"
+      @selection-change="handleSelectionChange">
+      <el-table-column type="selection" :selectable="selectable" :reserve-selection="true"
+        v-if="IsSupperOrderEdit&&pagesTitle!='销售'">
       </el-table-column>
-          <el-table-column
-          :label="IsSupperOrderEdit&&pagesTitle!='销售'?'全选':''">
+      <el-table-column :label="IsSupperOrderEdit&&pagesTitle!='销售'?'全选':''">
         <template slot-scope="scope">
           <div class="row-c justify-sb align-c py">
             <div class="row-c">
               <div>
-                    <div class="orderType cf fz12" :class="{ active: scope.row.visaOrderStatus == 1,activeNo: scope.row.visaOrderStatus == 2 }">
+                <div class="orderType cf fz12"
+                  :class="{ active: scope.row.visaOrderStatus == 1,activeNo: scope.row.visaOrderStatus == 2 }">
                   <template v-if="scope.row.visaOrderStatus == 1">正常</template>
                   <template v-else-if="scope.row.visaOrderStatus == 3">待付款</template>
                   <template v-else-if="scope.row.visaOrderStatus == 2">取消</template>
                 </div>
 
               </div>
-                  <div class="cblack fz14 mr" :class="{ cF1416C: scope.row.isFinish == 0,c20C997: scope.row.isFinish == 1 }">
+              <div class="cblack fz14 mr"
+                :class="{ cF1416C: scope.row.isFinish == 0,c20C997: scope.row.isFinish == 1 }">
                 <template v-if="scope.row.isFinish == 1">
                   已完结 <template v-if="scope.row.finishTime">/ {{scope.row.finishTime}}</template>
                 </template>
@@ -544,7 +539,8 @@
               <div class="c9e fz12">
                 <span>{{$t('fnc.danhao')}}：</span>
                 <span>{{scope.row.visaTCNUM}}({{scope.row.id}})</span>
-                    <span class="copy cblack cursor-pointer" v-if="copyId != scope.row.id" @click="CopyHandler(scope.row)">复制</span>
+                <span class="copy cblack cursor-pointer" v-if="copyId != scope.row.id"
+                  @click="CopyHandler(scope.row)">复制</span>
                 <span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
               </div>
             </div>
@@ -555,8 +551,7 @@
                   <span class="mr">创建人：</span>
                   <span class="mr">{{ scope.row.createName }}</span>
                   <el-image class="mr" v-if="scope.row.createPhoto"
-                        style="width: 20px; height: 20px;border-radius: 50%;"
-                        :src="scope.row.createPhoto"
+                    style="width: 20px; height: 20px;border-radius: 50%;" :src="scope.row.createPhoto"
                     :preview-src-list="[scope.row.createPhoto]">
                   </el-image>
                 </template>
@@ -641,7 +636,8 @@
               </el-table-column>
               <el-table-column label="利润" style="background:#EAEAEA">
                 <template slot-scope="scope">
-                      <span :class="{'cF1416C':(scope.row.income*100-scope.row.costMoney*100-scope.row.refundMoney*100)/100>0}">
+                  <span
+                    :class="{'cF1416C':(scope.row.income*100-scope.row.costMoney*100-scope.row.refundMoney*100)/100>0}">
                     ￥<span class="fz15 fbold">
                       {{moneyFormat((scope.row.income*100-scope.row.costMoney*100-scope.row.refundMoney*100)/100)}}
                     </span>
@@ -661,13 +657,14 @@
                   </div>
                 </template>
               </el-table-column>
-                  <template slot="append" >
+              <template slot="append">
                 <div class="row justify-sb" style="padding:10px;">
-                      <div class="cF1416C flex-g" style="min-width: 300px;" >
+                  <div class="cF1416C flex-g" style="min-width: 300px;">
                     <div class="row flex-wrap mb" v-if="scope.row.guestList&&scope.row.guestList.length>0">
                       <span class="flex-s">旅客名单：</span>
                       <div class="row wrap orderNo fz12 ml">
-                            <span class="cursor-pointer radius5 mr px5 bgf5 c3FC4FF" style="margin: 3px;" v-for="(x, i) in scope.row.guestList"
+                        <span class="cursor-pointer radius5 mr px5 bgf5 c3FC4FF" style="margin: 3px;"
+                          v-for="(x, i) in scope.row.guestList" :key="i+10000"
                           @click="goUrl2('VisapassengerList',scope.row.id,'旅客名单')">{{ x.userName }}</span>
                       </div>
                     </div>
@@ -699,60 +696,66 @@
                       </el-tooltip>
                     </div>
                   </div>
-
                   <div class="row justify-sb">
-                        <div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative" style="min-width: 200px;max-width: 400px;">
+                    <div class="row-c justify-sb px15 bgf5 radius5 flex-g pa relative"
+                      style="min-width: 200px;max-width: 400px;">
                       <div class="row-c">
                         <div class="fz12 flex-s">收款单据</div>
                         <div class="row wrap orderNo fz12 ml">
-                            <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
-                            :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
-                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.financeList"
-                              @click="openDetails(x)">{{ x.frID }}</span>
+                          <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;" :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
+                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}"
+                            v-for="(x, i) in scope.row.financeList" @click="openDetails(x)"
+                            :key="i+20000">{{ x.frID }}</span>
                           <span v-if="scope.row.financeList&&scope.row.financeList.length == 0" class="c9e fz12 mr">
                             暂无
                           </span>
                         </div>
                       </div>
-                          <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="item" effect="dark" content="制单" placement="top">
+                      <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="item" effect="dark" content="制单"
+                        placement="top">
                         <i class="el-icon-circle-plus cursor-pointer c059FF6"
                           @click="makeAdocument(scope.row, index, 1)"></i>
                       </el-tooltip>
                     </div>
-                        <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
+                    <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative"
+                      style="min-width: 200px;max-width: 400px;">
                       <div class="row-c">
                         <div class="fz12 flex-s">退款单据</div>
                         <div class="row wrap orderNo fz12 ml">
-                            <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
-                            :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
-                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.refundFinanceList"
-                              @click="openDetails(x)">{{ x.frID }}</span>
-                            <span v-if="scope.row.refundFinanceList&&scope.row.refundFinanceList.length == 0" class="c9e fz12 mr">
+                          <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;" :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
+                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}"
+                            v-for="(x, i) in scope.row.refundFinanceList" @click="openDetails(x)"
+                            :key="i+30000">{{ x.frID }}</span>
+                          <span v-if="scope.row.refundFinanceList&&scope.row.refundFinanceList.length == 0"
+                            class="c9e fz12 mr">
                             暂无
                           </span>
                         </div>
                       </div>
-                          <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="item" effect="dark" content="制单" placement="top">
+                      <el-tooltip v-if="scope.row.visaOrderStatus!=2" class="item" effect="dark" content="制单"
+                        placement="top">
                         <i class="el-icon-circle-plus cursor-pointer c059FF6"
                           @click="makeAdocument(scope.row, index, 2)"></i>
                       </el-tooltip>
                     </div>
-                        <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
+                    <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative"
+                      style="min-width: 200px;max-width: 400px;">
                       <div class="row-c">
                         <div class="fz12 flex-s">成本单据</div>
                         <div class="row wrap orderNo fz12 ml">
-                            <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
-                            :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
-                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.costFinanceList"
-                              @click="openDetails(x)">{{ x.frID }} {{ x.name?x.name:'' }}</span>
-                            <span v-if="scope.row.costFinanceList&&scope.row.costFinanceList.length == 0" class="c9e fz12 mr">
+                          <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;" :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
+                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}"
+                            v-for="(x, i) in scope.row.costFinanceList" @click="openDetails(x)"
+                            :key="i+40000">{{ x.frID }}
+                            {{ x.name?x.name:'' }}</span>
+                          <span v-if="scope.row.costFinanceList&&scope.row.costFinanceList.length == 0"
+                            class="c9e fz12 mr">
                             暂无
                           </span>
                         </div>
                       </div>
                       <div class="item" v-if="scope.row.visaOrderStatus!=2&& pagesTitle != '销售'">
-                            <el-tooltip class="" effect="dark" content="制单"
-                            placement="top">
+                        <el-tooltip class="" effect="dark" content="制单" placement="top">
                           <i class="el-icon-circle-plus cursor-pointer c059FF6"
                             @click="makeAdocument(scope.row, index, 3)"></i>
                         </el-tooltip>
@@ -762,33 +765,27 @@
                         </el-tooltip>
                       </div>
                     </div>
-                        <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 200px;max-width: 400px;">
+                    <div class="row-c justify-sb px15 bgf5 radius5 ml flex-g pa relative"
+                      style="min-width: 200px;max-width: 400px;">
                       <div class="row-c">
-                          <div class="fz12 flex-s">发票单据</div>
+                        <div class="fz12 flex-s">发票单据 :</div>
                         <div class="row wrap orderNo fz12 ml">
                           <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;"
-                            :class="{'bgD9F3FF':x.status==1,'bgFAEAED':x.status==2,'bjFFF3E0':x.status==3,
-                            'c3FC4FF':x.status==1,'cF1416C':x.status==2,'cff9800':x.status==3}" v-for="(x, i) in scope.row.invoiceApplyList"
-                              @click="openDetails(x)">{{ x.frID }} {{ x.name?x.name:'' }}</span>
-                            <span v-if="scope.row.invoiceApplyList&&scope.row.invoiceApplyList.length == 0" class="c9e fz12 mr">
+                            :class="{'bgD9F3FF':x.invoiceApplyState==1,'bgFAEAED':x.invoiceApplyState==2,'bjFFF3E0':x.invoiceApplyState==3,
+                            'c3FC4FF':x.invoiceApplyState==1,'cF1416C':x.invoiceApplyState==2,'cff9800':x.invoiceApplyState==3}" v-for="(x, i) in scope.row.invoiceApplyList"
+                            @click="goIisDetail(x)" :key="i+50000">{{ x.id }} </span>
+                          <span v-if="scope.row.invoiceApplyList&&scope.row.invoiceApplyList.length == 0"
+                            class="c9e fz12 mr">
                             暂无
                           </span>
                         </div>
                       </div>
                     </div>
-                        <div
-                          class="row wrap px15 bgE8F5E9 radius5 ml fz12 orderop" style="min-width: 150px;">
+                    <div class="row wrap px15 bgE8F5E9 radius5 ml fz12 orderop" style="min-width: 150px;">
                       <div class="row-c cursor-pointer radius5 change py5" @click="goUrlVisaList(scope.row)"
                         v-if="scope.row.VisaPlanIdStr!=''&&pagesTitle!='销售'">
                         <span class="c059FF6">签证详情</span>
                       </div>
-                            <!-- <div
-                            v-if="pagesTitle=='OP'"
-                            class="row-c cursor-pointer radius5 change py5"
-                            @click="clickCorrelation(item, 1)"
-                          >
-                            <span class="c059FF6">编辑关联OP</span>
-                          </div> -->
                       <div class="row-c cursor-pointer radius5 change py5" @click="getDetail(scope.row,false)"
                         v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&scope.row.visaStatus==1&&pagesTitle=='销售'">
                         <span class="c059FF6">{{$t('system.table_edit')}}订单</span>
@@ -797,7 +794,7 @@
                         v-if="scope.row.income<=0&&(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)">
                         <span class="cF1416C">{{ $t('pub.cancelBtn') }}</span>
                       </div>
-                            <!-- &&scope.row.visaStatus==1 -->
+
                       <div class="row-c cursor-pointer radius5 change py5" @click='goUrlT(scope.row)'
                         v-if="(scope.row.visaOrderStatus==1||scope.row.visaOrderStatus==3)&&pagesTitle=='销售'">
                         <span class="c059FF6">{{ $t('salesModule.LKMD') }}</span>
@@ -808,19 +805,19 @@
                         <span class="c20C997">{{ $t('salesModule.ApplyInvoice') }}</span>
                       </div>
                       <template v-if="pagesTitle!='销售'">
-                            <div class="row-c cursor-pointer radius5 cancel py5" @click="goUrl2('OrderSplitting',scope.row.id,'订单拆分')"
+                        <div class="row-c cursor-pointer radius5 cancel py5"
+                          @click="goUrl2('OrderSplitting',scope.row.id,'订单拆分')"
                           v-if="scope.row.peopleNum==scope.row.guestList.length">
                           <span class="cF1416C">订单拆分</span>
                         </div>
-                            <div class="row-c cursor-pointer radius5 change py5"
-                            @click='Edit(scope.row)'
+                        <div class="row-c cursor-pointer radius5 change py5" @click='Edit(scope.row)'
                           v-if="IsSupperOrderEdit">
                           <span class="c059FF6">修改金额</span>
                         </div>
                         <div v-if="IsSupperOrderEdit&&pagesTitle!='销售'&&scope.row.isFinish!=1
                             &&scope.row.income>0&&scope.row.dueInMoney==0"
-                             class="row-c cursor-pointer radius5 change py5"
-                            @click='setCompleted(scope.row.id,scope.row)' v-loading="scope.row.loading">
+                          class="row-c cursor-pointer radius5 change py5" @click='setCompleted(scope.row.id,scope.row)'
+                          v-loading="scope.row.loading">
                           <span class="c059FF6">完结</span>
                         </div>
                         <div class="row-c cursor-pointer radius5 change py5"
@@ -832,8 +829,6 @@
                     </div>
                   </div>
                 </div>
-
-
               </template>
             </el-table>
           </div>
@@ -950,7 +945,6 @@
           </el-col>
         </el-row>
       </el-form>
-
     </div>
     <el-dialog title="修改金额" :visible.sync="EditVisible" width="400px">
       <div>
@@ -963,16 +957,19 @@
     </el-dialog>
     <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
     <TransferOrder v-if="showTransferOrder" :isShow="showTransferOrder" :obj="queryObj"
-    @success="showTransferOrder=false,$emit('success')"
-    @close="showTransferOrder=false"></TransferOrder>
+      @success="showTransferOrder=false,$emit('success')" @close="showTransferOrder=false"></TransferOrder>
   </div>
 </template>
 <script>
   import offset from '../../public/offset.vue';
   import TransferOrder from './TransferOrder.vue';
   import commissionDialog from "../../FinancialModule/TradeCommission/commissionDialog"
-export default {
-  components: { offset,TransferOrder,commissionDialog },
+  export default {
+    components: {
+      offset,
+      TransferOrder,
+      commissionDialog
+    },
     props: ["OrderList", "pagesTitle"],
     data() {
       return {
@@ -980,8 +977,8 @@ export default {
         CompletedLoading: false,
         multipleSelection: [],
         isCommissionDialog: false,
-      objNew:{},
-      queryObj:null,
+        objNew: {},
+        queryObj: null,
         cdState: false,
         copyId: 0,
         loading0: false,
@@ -1064,7 +1061,7 @@ export default {
         EditMsg: {
           TotalPrice: 0,
         },
-        IsSupperOrderEdit:false
+        IsSupperOrderEdit: false
       };
     },
     watch: {
@@ -1078,15 +1075,15 @@ export default {
       }
     },
     methods: {
-    clickCorrelation(item,){
+      clickCorrelation(item, ) {
         this.CorrelationObj = JSON.parse(JSON.stringify(item));
         this.CorrelationObj.TypeNum = 7;
       },
-    DetailsOfRoyalty(){
+      DetailsOfRoyalty() {
 
       },
-    isOffset(row, index, num){
-      this.makeAdocument(row, index, num,'Offset')
+      isOffset(row, index, num) {
+        this.makeAdocument(row, index, num, 'Offset')
       },
       PerferPrice() {
         this.apipost('dmc_get_visa_SetVisaOrderPrice', this.EditMsg, res => {
@@ -1169,15 +1166,13 @@ export default {
           }
         });
       },
-      goIisDetail: function (id) { // 跳转发票详情页面
-        this.$router.push({
-          name: 'invoicesManagerDetail',
-          query: {
-            id: id,
-            noDetail: 1,
+      // 跳转发票详情页面
+      goIisDetail(item) {
+        console.log("item", item)
+        this.OpenNewPage('/invoicesManagerDetail', {
+          id: item.id,
           InvoiceApplyType: 2,
-            blank: "y",
-          }
+          noDetail: 1,
         });
       },
       // 申请发票
@@ -1294,25 +1289,28 @@ export default {
           }
         });
       },
-      selectable(row, index){
-        if (this.OrderList[index].isFinish!=1&&this.OrderList[index].income>0&&this.OrderList[index].dueInMoney==0) {
+      selectable(row, index) {
+        if (this.OrderList[index].isFinish != 1 && this.OrderList[index].income > 0 && this.OrderList[index]
+          .dueInMoney == 0) {
           return true;
         } else {
           return false;
         }
       },
       handleSelectionChange(val) {
-        this.multipleSelection = val.map(x=>{ return x.id});
+        this.multipleSelection = val.map(x => {
+          return x.id
+        });
       },
-      setCompleted(id,row){
+      setCompleted(id, row) {
         let ids = ''
-        if(id>0){
+        if (id > 0) {
           ids = id
-        }else{
-          if(this.multipleSelection.length==0) return this.$message.error('请勾选需要完结的数据')
+        } else {
+          if (this.multipleSelection.length == 0) return this.$message.error('请勾选需要完结的数据')
           ids = this.multipleSelection.join(',')
         }
-        if(ids == '') {
+        if (ids == '') {
           this.$message.error('请勾选需要完结的数据')
         }
         this.$confirm('是否确认完结?', '提示', {
@@ -1320,18 +1318,18 @@ export default {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          if(id>0){
+          if (id > 0) {
             row.loading = true
-          }else{
+          } else {
             this.CompletedLoading = true
           }
           this.apipost('dmc_post_SetVisaOrderFinish', {
             VisaOrderIds: ids
           }, res => {
             if (res.data.resultCode == 1) {
-              if(id>0){
+              if (id > 0) {
                 row.loading = false
-              }else{
+              } else {
                 this.CompletedLoading = false
               }
               for (let i = 0; i < this.OrderList.length; i++) {
@@ -1344,9 +1342,9 @@ export default {
               this.$message.success('操作成功！');
               this.$emit('success')
             } else {
-              if(id>0){
+              if (id > 0) {
                 row.loading = false
-              }else{
+              } else {
                 this.CompletedLoading = false
               }
               this.$message.error(res.data.message);
@@ -1468,22 +1466,23 @@ export default {
         this.$router.push({
           path: "/FinancialDocumentsDetail",
           query,
-        blank:'y'
+          blank: 'y'
         });
       },
+
       // 制作单据
       makeAdocument(row, index, num, Offset) {
-      if((num==2||num==3)&&row.income<=0){
+        if ((num == 2 || num == 3) && row.income <= 0) {
           this.Info('请先制收款单据，再制成本或退款单据！')
           return
         }
-      if(Offset){
+        if (Offset) {
           this.cdState = true
         }
         let type = 0
-      if(num==3){
+        if (num == 3) {
           type = 2
-      }else{
+        } else {
           type = num
         }
         let TCIDARR = [];
@@ -1497,7 +1496,7 @@ export default {
           SourceID: row.visaId,
           TCIDList: TCIDARR,
           ReFinanceId2: num,
-        MatchFrId:0
+          MatchFrId: 0
         }
         let query = {};
         query = {
@@ -1508,14 +1507,13 @@ export default {
           orderObj: JSON.stringify(orderObj),
           Type: type,
         }
-      if(num==2){
-        query.searchTitle='签证退款'
-      }
-      else if(num ==3 && this.cdState == false){
-        query.portTypeId= 2;//签证成本
+        if (num == 2) {
+          query.searchTitle = '签证退款'
+        } else if (num == 3 && this.cdState == false) {
+          query.portTypeId = 2; //签证成本
         }
         this.queryObj = query
-      if(!Offset){
+        if (!Offset) {
           this.$router.push({
             name: "ChoiceAddFinancialDocuments",
             query
@@ -1536,7 +1534,7 @@ export default {
       CopyHandler(item) {
         this.copyId = item.id;
         let copyText = item.id;
-      const save = function(e) {
+        const save = function (e) {
           e.clipboardData.setData('text/plain', copyText)
           e.preventDefault() // 阻止默认行为
         }
@@ -1558,7 +1556,8 @@ export default {
         this.IsSupperOrderEdit = true
       }
     }
-};
+  };
+
 </script>
 
 <style>

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -417,7 +417,7 @@
                     :key="index"></el-option>
                 </el-select>
               </el-form-item>
-              <span style="color:red">关联提成,请正确填写</span>
+              <span style="color:red">关联提成,请正确填写;美工有单独的配置，请不要配置在助理OP里面。</span>
             </td>
             <td colspan="2">
               <el-form-item label="付款方式">