save

src/components/Hotel/reservation/OrderList.vue

@@ -524,6 +524,11 @@
             }}</span>
           </template>
         </el-table-column> -->
+        <el-table-column label="待收金额" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="利润" min-width="100">
           <template slot-scope="scope">
             <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>

src/components/administrative/empBankAccountAll.vue

@@ -213,7 +213,6 @@
       <div
         v-if="accountList.length"
         style="
-          padding: 20px;
           display: flex;
           justify-content: center;
           align-items: center;
@@ -255,7 +254,6 @@
           :placeholder="$t('fnc.khleixing')"
           class="w135 _border_b_1"
         >
-          <el-option label="不限" value="" key="0"> </el-option>
           <el-option
             v-for="item in ClientTypeList"
             :label="item.Name"
@@ -501,10 +499,9 @@ export default {
     // this.msg.Type= id;
     // this.addMsg.ObjID=this.$route.query.id || 0;
     // this.addMsg.Type= id;
+    this.financeinfo_post_GetClientTypeList();
     this.getBank();
-    this.getList();
     this.changeTitle();
-    this.financeinfo_post_GetClientTypeList();
   },
   methods: {
     financeinfo_post_GetClientTypeList() {
@@ -515,6 +512,8 @@ export default {
         (res) => {
           if (res.data.resultCode == 1) {
             this.ClientTypeList = res.data.data;
+			this.msg.Type = this.ClientTypeList[0].ID
+    this.getList();
           }
         },
         (err) => {}
@@ -603,6 +602,10 @@ export default {
         this.$message.error(this.$t("visaT.Pleasefillin") + this.nameD);
         return;
       }
+      if (this.addMsg.Type == "") {
+        this.$message.error(this.$t("visaT.Pleasefillin") + this.nameE);
+        return;
+      }
       // 查询是否有冲突的账户信息
       this.checkCanAdd();
     },

src/components/busManagement/BookAcar/components/BookAcarOrder.vue

@@ -139,7 +139,7 @@
     </div>
   </template>
   <script>
-    import OrderList from './OrderList.vue';
+    import OrderList from './orderList';
     export default {
       props:['pagesTitle','dataObj'],
       components: { OrderList },

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

@@ -571,6 +571,11 @@
                 <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
               </template>
             </el-table-column>
+        <el-table-column label="待收金额" min-width="100">
+          <template slot-scope="scope">
+            <span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
+          </template>
+        </el-table-column>
             <el-table-column label="利润" min-width="100">
               <template slot-scope="scope">
                 <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>