页面修改

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -65,6 +65,8 @@
           <th width="80">{{$t('ground.fyye')}}</th>
           <th width="80">{{$t('ground.fyzj')}}</th>
           <th width="80">{{$t('hotel.hotel_CurrentRate')}}</th>
+          <th width="80">预填合计</th>
+          <th width="80">实际合计</th>
           <th width="80">{{$t('ground.pinzheng')}}</th>
           <th width="100">{{$t('pub.pubRemark')}}</th>
           <th width="80">{{$t('hotel.hotel_Order')}}</th>
@@ -74,10 +76,10 @@
           <td colspan="22">{{$t('system.content_noData')}}</td>
         </tr>
         <tbody v-for="(outItem,outindex) in shopDataList" :class="{roomReservationsSplitTrCss:outindex%2!=0}"
-          v-if="outItem.PriceShopList.length>0">
+          v-if="outItem.PriceShopList.length>0" :key="outindex">
           <template v-for="(item,index) in outItem.PriceShopList">
             <template v-for="(subItem,subIndex) in item.ShopDetailsList">
-              <tr>
+              <tr :key="subIndex">
                 <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
                   {{outItem.NewCombinationNum}}
                 </td>
@@ -141,7 +143,23 @@
                   {{subItem.DMCRate}}
                 </td>
                 <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
-                  <p v-for="(img, imgIndex) in subItem.dmcImageList" title="点击下载" @click="downLoadPZ(img)"
+                  <template v-if="item.PreTotalMoney!=item.ActualTotalMoney">
+                     <span style="color:red;">{{item.PreTotalMoney}}</span>
+                  </template>
+                  <template v-else>
+                     {{item.PreTotalMoney}}
+                  </template>
+                </td>
+                <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
+                  <template v-if="item.PreTotalMoney!=item.ActualTotalMoney">
+                     <span style="color:red;">{{item.ActualTotalMoney}}</span>
+                  </template>
+                  <template v-else>
+                     {{item.ActualTotalMoney}}
+                  </template>
+                </td>
+                <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
+                  <p v-for="(img, imgIndex) in subItem.dmcImageList" title="点击下载" @click="downLoadPZ(img)" :key="imgIndex"
                     v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
                 </td>
                 <td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
@@ -165,8 +183,8 @@
             </template>
           </template>
         </tbody>
-        <tbody v-else v-for="(outItem,outindex) in shopDataList">
-          <tr>
+        <tbody v-else v-for="(outItem,outindex) in shopDataList" :key="outindex">
+          <tr >
             <td>
               {{outItem.NewCombinationNum}}
             </td>
@@ -202,7 +220,7 @@
       <template>
         <el-form label-width="100px">
           <el-form-item :label="$t('visa.v_tuanhao')">
-            <div v-for="item in CreateHandBillList">
+            <div v-for="(item,index) in CreateHandBillList" :key="index">
               <el-radio v-model="CreateHandBillID" :key="item.id" :label="item.id"></el-radio>
             </div>
           </el-form-item>
@@ -470,7 +488,7 @@
       this.msg.StartDate = nowDate;
       this.msg.LineId=14;//默认日本线
       // this.msg.StartDate = '';
-      // this.msg.TCNUM = 'NRTCA07190704A';
+      // this.msg.CombinationNum = 'JVS0703HP-MUB';
       this.getLineList();
       this.getList();
     },