no message

cdf9f93a · zhengke · ba012b52 · cdf9f93a · cdf9f93a · cdf9f93a
Commit cdf9f93a authored May 11, 2022 by zhengke
Showing with 110 additions and 101 deletions

Agreement.vue src/components/guestManagement/Agreement.vue +27 -22

finance.vue src/components/guestManagement/finance.vue +81 -77

ticketOrder.vue src/components/guestManagement/ticketOrder.vue +2 -2

No files found.
--- a/src/components/guestManagement/Agreement.vue
+++ b/src/components/guestManagement/Agreement.vue
@@ -72,15 +72,18 @@
        color: #2961FE;
    }
    .agreement-IncomeMoney-box{
+        /* position: relative; */
+    }
+    .agreement-IncomeMoney-box .numIcon{
        position: relative;
    }
    .agreement-IncomeMoney-pop{
        position: absolute;
        top: -15px;
-        left: 80px;
+        left: 30px;
        z-index: 1;
        background: #fff;
-        padding: 3px 19px 5px 19px;
+        padding: 10px 19px 10px 19px;
        Box-shadow:5px 5px 10px 5px #ccc;
    }
    /deep/.el-table .cell{
@@ -185,7 +188,7 @@
                            {{scope.row.IncomeMoney}}
                            <i v-if="scope.row.OrderStatus==1" 
                            @click="makeAdocument(scope.row,scope.$index,1)" 
-                            class="iconfont iconjia- numIcon"></i>
+                            class="iconfont iconjia- numIcon">
                            <div v-show="scope.row.actuallyReceived" class="agreement-IncomeMoney-pop">
                                <div class="float-flag-shape"></div>
                                <el-checkbox-group v-model="scope.row.checkList" 
@@ -194,11 +197,13 @@
                                :label="item.Id">{{item.Name}}</el-checkbox>
                                </el-checkbox-group>
                                <div class="agreement-Cancel">
-                                    <span @click="popCancelClick(scope.row,scope.$index,1)">取消</span>
-                                    <span @click="popClick(scope.row,scope.$index,1)">确定</span>
+                                    <span @click.stop="popCancelClick(scope.row,scope.$index,1)">取消</span>
+                                    <span @click.stop="popClick(scope.row,scope.$index,1)">确定</span>
                                </div>
                                
                            </div>
+                        </i>
+                            
                        </div>
                        

@@ -214,19 +219,23 @@
              <template slot-scope="scope">
                <div class="agreement-IncomeMoney-box">
                {{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1" 
-                @click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon"></i>
-                <div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
-                    <div class="float-flag-shape"></div>
-                    <el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)">
-                    <el-radio v-for="(item,index) in scope.row.MultipleChoiceList" :key="index"
-                    :label="item.Id">{{item.Name}}</el-radio>
-                    </el-radio-group>
-                    <div class="agreement-Cancel">
-                        <span @click="popCancelClick(scope.row,scope.$index,3)">取消</span>
-                        <span @click="popClick(scope.row,scope.$index,3)">确定</span>
+                @click="makeAdocument(scope.row,scope.$index,3)" class="iconfont iconjia- numIcon">
+                    <div v-show="scope.row.cost" class="agreement-IncomeMoney-pop">
+                        <div class="float-flag-shape"></div>
+                        <el-radio-group v-model="scope.row.selectedType" @change="clickMultipleChoice(scope.row,scope.$index,3)">
+                        <el-radio v-for="(item,index) in scope.row.MultipleChoiceList" :key="index"
+                        :label="item.Id">{{item.Name}}</el-radio>
+                        </el-radio-group>
+                        <div class="agreement-Cancel">
+                            <span @click.stop="popCancelClick(scope.row,scope.$index,3)">取消</span>
+                            <span @click.stop="popClick(scope.row,scope.$index,3)">确定</span>
+                        </div>
                    </div>
+            
+             </i>
+                
                    
-                </div>
+                
                </div>
            </template>
          </el-table-column>
@@ -416,16 +425,12 @@
        methods: {
            // 取消
            popCancelClick(row, index, num){
-                if(num==1){
-                    this.dataList[index].actuallyReceived =false
-                }
-                if(num==3){
-                    this.dataList[index].cost =false
-                }
                this.dataList.forEach(item=>{
                    item.checkList = []
                    item.MultipleChoiceList = []
                    item.selectedType = ''
+                    item.actuallyReceived =false
+                    item.cost =false
                })
            },
            // 确定弹窗

--- a/src/components/guestManagement/finance.vue
+++ b/src/components/guestManagement/finance.vue
@@ -41,6 +41,10 @@
 .income_2{
  color: #3FC4FF;
 }
+.finance-content{
+  height: 600px;
+  overflow-y: scroll;
+}
 </style>
 <template>
    <div class="Business">
@@ -74,83 +78,83 @@
          </el-col>
        </el-row>
      </div>
-      <div class="page-content">
-      <el-table
-        v-loading="loading"
-        stripe
-        ref="multipleTable"
-        :data="dataList"
-        tooltip-effect="dark"
-        style="width: 100%"
-        row-class-name="font-size-12">
-        <el-table-column
-            fixed
-            label="单号"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              <p @click="openDetails(scope.row)" class="font-color-link cp">{{scope.row.FrID}}</p>
-            </template>
-        </el-table-column>
-        <el-table-column 
-            label="单据类型"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              <p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p>
-            </template>
-        </el-table-column>
-        <el-table-column
-            label="费用类型"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-                <p v-for="(item,index) in scope.row.CostTypeList" :key="index">
-                    {{item}}
-                </p>
-            </template>
-        </el-table-column>
-        <el-table-column
-            label="交易方式"
-            show-overflow-tooltip width="200">
-            <template slot-scope="scope">
-                <div class="_TradeWayList"
-                v-for="(item,index) in scope.row.TradeWayList" 
-                :key="index"
-                style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
-                    <p><span style="font-weight: bold;color:#333333">{{item.Alias}}</span>
-                    <span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':item.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{item.AccountType==""?'无':item.AccountType}}</span> </p>
-                    <p style="color:#333333">{{item.BankNo}}</p>
-                </div>
-            </template>
-        </el-table-column>
-        <el-table-column 
-            label="金额" width="150">
-            <template slot-scope="scope">
-              <p>{{scope.row.Type==1?'应收：':(scope.row.Type==2?'应付：':'')}}{{scope.row.Money}}</p>
-              <p>{{scope.row.Type==1?'实收：':(scope.row.Type==2?'实付：':'')}}{{scope.row.PayMoney}}</p>
-            </template>
-        </el-table-column>
-        <el-table-column 
-            label="付款对象"
-            show-overflow-tooltip width="260">
-            <template slot-scope="scope">
-              {{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}{{scope.row.RemitterName}}
-            </template>
-        </el-table-column>
-        <el-table-column 
-            label="制单人员"
-            show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{scope.row.EmName}}
-            </template>
-        </el-table-column>
-        <el-table-column
-            fixed="right"
-            label="当前状态"
-            show-overflow-tooltip width="110">
-            <template slot-scope="scope">
-              {{scope.row.StatusStr}}
-            </template>
-        </el-table-column>
-      </el-table>
+      <div class="page-content finance-content">
+        <el-table
+          v-loading="loading"
+          stripe
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          row-class-name="font-size-12">
+          <el-table-column
+              fixed
+              label="单号"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                <p @click="openDetails(scope.row)" class="font-color-link cp">{{scope.row.FrID}}</p>
+              </template>
+          </el-table-column>
+          <el-table-column 
+              label="单据类型"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                <p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p>
+              </template>
+          </el-table-column>
+          <el-table-column
+              label="费用类型"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                  <p v-for="(item,index) in scope.row.CostTypeList" :key="index">
+                      {{item}}
+                  </p>
+              </template>
+          </el-table-column>
+          <el-table-column
+              label="交易方式"
+              show-overflow-tooltip width="200">
+              <template slot-scope="scope">
+                  <div class="_TradeWayList"
+                  v-for="(item,index) in scope.row.TradeWayList" 
+                  :key="index"
+                  style="line-height: normal !important;padding: 5px 10px;background-color: #EEEEEE;border-radius: 4px;margin: 10px 0;width:230px">
+                      <p><span style="font-weight: bold;color:#333333">{{item.Alias}}</span>
+                      <span class="_bank_name" style="height:20px;;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;margin-letf:10px">{{scope.row.TradeWayList[0].TypeName}}</span><span style="height:20px;display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;" :style="{'background-color':item.AccountType=='私'?'#2AAEF2':'#FF9C01'}">{{item.AccountType==""?'无':item.AccountType}}</span> </p>
+                      <p style="color:#333333">{{item.BankNo}}</p>
+                  </div>
+              </template>
+          </el-table-column>
+          <el-table-column 
+              label="金额" width="150">
+              <template slot-scope="scope">
+                <p>{{scope.row.Type==1?'应收：':(scope.row.Type==2?'应付：':'')}}{{scope.row.Money}}</p>
+                <p>{{scope.row.Type==1?'实收：':(scope.row.Type==2?'实付：':'')}}{{scope.row.PayMoney}}</p>
+              </template>
+          </el-table-column>
+          <el-table-column 
+              label="付款对象"
+              show-overflow-tooltip width="260">
+              <template slot-scope="scope">
+                {{scope.row.Type==2?scope.row.ClientTypeName+'：':'汇款人：'}}{{scope.row.RemitterName}}
+              </template>
+          </el-table-column>
+          <el-table-column 
+              label="制单人员"
+              show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.EmName}}
+              </template>
+          </el-table-column>
+          <el-table-column
+              fixed="right"
+              label="当前状态"
+              show-overflow-tooltip width="110">
+              <template slot-scope="scope">
+                {{scope.row.StatusStr}}
+              </template>
+          </el-table-column>
+        </el-table>
      </div>
      <div v-if="total>0">
          <el-pagination class="Mypagination" background @current-change="handleCurrentChange"

--- a/src/components/guestManagement/ticketOrder.vue
+++ b/src/components/guestManagement/ticketOrder.vue
@@ -507,7 +507,7 @@
                      <el-col :span="8" v-if="name=='新建机票订单'||name=='编辑机票订单'">
                          <div class="MyEditForm-item">
                              <el-form-item label="出行概述" prop="StartCityName">
-                                  <el-input placeholder="请输入出发时间、出发地、目的地" v-model="form.StartCityName"></el-input>
+                                  <el-input placeholder="出发时间、出发地、目的地" v-model="form.StartCityName"></el-input>
                              </el-form-item>
                          </div>
                      </el-col>
@@ -1213,7 +1213,7 @@
                    }, ],
                    StartCityName: [{
                        required: true,
-                        message: "请输入出现时间、出发地、目的地",
+                        message: "请输入出发时间、出发地、目的地",
                        trigger: "blur"
                    }, ],
                    // EndCityName: [