liuhj il y a 1 an
Parent
commit
0fb5e69bb6

+ 3 - 3
src/components/Finance/PayReceived.vue

@@ -54,7 +54,7 @@
                 >
                     <el-table-column
                     label="付款时间"
-                    width="155">
+                    width="160">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"
@@ -81,14 +81,14 @@
                     </el-table-column>
                     <el-table-column
                         label="已收金额"
-                        width="120">
+                        width="150">
                         <template slot-scope="scope">
                             <el-input-number :controls="false" :precision="2" v-model="scope.row.price"></el-input-number>
                         </template>
                     </el-table-column>
                     <el-table-column
                         label="到款时间"
-                        width="155">
+                        width="160">
                         <template slot-scope="scope">
                             <el-date-picker
                             style="width: 100%;"

+ 71 - 15
src/components/OP/OpCarTouristGuideGroundId.vue

@@ -12,7 +12,7 @@
                     <div style="width: 25%;">
                         <el-form-item label="团组名称:" label-width="160px">
                             <el-select v-model="OpCarTouristGuideGroundData.diId" clearable filterable placeholder="团组选择"
-                                :disabled="isShow" style="width: 220px;" @change="DiIdSelectChange">
+                                :disabled="isShow"  @change="DiIdSelectChange">
                                 <el-option v-for="item in delegationInfoList" :key="item.id" :label="item.teamName"
                                     :value="item.id">
                                 </el-option>
@@ -62,14 +62,14 @@
                     <div style="width: 25%;">
                         <el-form-item label="OP提成等级:" prop="tourCode" label-width="160px">
                             <el-select v-model="delegationInfo.opRoyaltyLv" clearable filterable placeholder="等级"
-                                :disabled="true" style="width: 220px;">
+                                :disabled="true">
                                 <el-option v-for="item in opRoyaltyLvList" :key="item.id" :label="item.name + '元'"
                                     :value="item.id">
                                 </el-option>
                             </el-select>
                         </el-form-item>
                     </div>
-                    <div style="width: 60%;">
+                    <div style="width: 75%;">
                         <el-form-item label="Op提成等级说明:" prop="opRoyaltyRemark" label-width="160px">
                             <el-input placeholder="Op提成等级说明" v-model="delegationInfo.opRoyaltyRemark" :disabled="true">
                             </el-input>
@@ -83,8 +83,21 @@
                 <div style="display: flex;">
                     <div style="width: 25%;">
                         <el-form-item label="地区:" prop="area" label-width="160px">
-                            <el-input placeholder="地区" v-model="OpCarTouristGuideGroundData.area">
-                            </el-input>
+                            <!-- <el-autocomplete
+                            popper-class="el-autocomplete-suggestion"
+                            :popper-append-to-body="false"
+                            class="inline-input"
+                            size="medium"
+                            v-model.trim="OpCarTouristGuideGroundData.area"
+                            :fetch-suggestions="querySearch"
+                            @select="selectarea"
+                            ></el-autocomplete> -->
+                            <el-select v-model="OpCarTouristGuideGroundData.area" clearable filterable
+                                placeholder="地区" >
+                                <el-option v-for="(item,index) in restaurants" :key=index :value="item.id" :label="item.value"></el-option>
+                            </el-select>
+                            <!-- <el-input placeholder="地区" v-model="OpCarTouristGuideGroundData.area">
+                            </el-input> -->
                         </el-form-item>
                     </div>
                     <div style="width: 25%;">
@@ -140,7 +153,7 @@
                     <div style="width: 25%;">
                         <el-form-item label="费用表示:" prop="orbitalPrivateTransfer" label-width="160px">
                             <el-select v-model="OpCarTouristGuideGroundData.orbitalPrivateTransfer" clearable filterable
-                                placeholder="费用标识" style="width: 220px;">
+                                placeholder="费用标识" >
                                 <el-option :key=0 :value="0" label="公转"></el-option>
                                 <el-option :key=1 :value="1" label="私转"></el-option>
                             </el-select>
@@ -172,7 +185,7 @@
                     </div>
                 </div>
                 <el-form-item>
-                    <div style="margin-left: 60%;">
+                    <div style="text-align: right;">
                         <el-button type="primary" @click="addBtn">保存</el-button>
                         <el-button @click="EscAdd">取消</el-button>
                     </div>
@@ -244,10 +257,49 @@ export default {
                 serviceStartTime: { required: true, message: '请输入服务时间起', trigger: ['blur', 'change'] },
                 serviceEndTime: { required: true, message: '请输入服务时间止', trigger: ['blur', 'change'] },
                 orbitalPrivateTransfer: { required: true, message: '请选择费用表示', trigger: ['blur', 'change'] },
-            }
+            },
         }
     },
     methods: {
+        //地区提示
+        querySearch(queryString, cb) {
+            var restaurants = this.restaurants;
+            var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+            // 调用 callback 返回建议列表的数据
+            cb(results);
+        },
+        createFilter(queryString) {
+            return (restaurant) => {
+                return restaurant.value.replace("  ", "").toLowerCase().match(queryString.toLowerCase());
+            };
+        },
+        //获取地区
+        OpCarCityResult() {
+            var url = "/api/Groups/OpCarCityResult"
+            var that = this
+            this.$axios({
+                method: 'get',
+                url: url,
+            }).then(function (res) {
+                console.log(res)
+                if (res.data.code == 200) {
+                    that.restaurants=res.data.data;
+                    that.restaurants= that.restaurants.map((terminal) => {
+                        return {
+                            id:terminal.id,
+                            value:terminal.country +'  '+ terminal.city,
+                        };
+                    });
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            })
+        },
+        ///
+        selectarea(val){
+            console.log(this.OpCarTouristGuideGroundData.area);
+            console.log(val);
+        },
         //初始化下拉框
         initializeSelect() {
             var url = "/api/System/QuerySetData"
@@ -277,14 +329,11 @@ export default {
                         }
                     }).then(function (res) {
                         if (res.data.code == 200) {
-                            debugger
                             that.delegationInfoList = res.data.data.groupName;
                             for (let index = 0; index < that.delegationInfoList.length; index++) {
-                                debugger
                                 if (that.delegationInfoList[index].id == that.OpCarTouristGuideGroundData.diId) {
                                     that.delegationInfo = that.delegationInfoList[index];
                                     that.VisitDate = that.transformDateFormat(that.delegationInfo.visitStartDate) + '至' + that.transformDateFormat(that.delegationInfo.visitEndDate);
-                                    debugger
                                     that.delegationInfo.opRoyaltyLv = that.delegationInfo.opRoyaltyLv
                                     break;
                                 }
@@ -323,7 +372,6 @@ export default {
                 }
             }).then(function (res) {
                 if (res.data.code == 200) {
-                    debugger
                     var CreditCardPayment = res.data.data.creditCardPayment;
                     var carTouristGuideGround = res.data.data.carTouristGuideGround;
                     if (CreditCardPayment != null) {
@@ -394,7 +442,9 @@ export default {
             })
         }
     },
-
+    created(){
+        this.OpCarCityResult()
+    },
     mounted() {
         this.token = JSON.parse(localStorage.getItem('userinif')).token;
         this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId
@@ -402,7 +452,7 @@ export default {
         this.OpCarTouristGuideGroundData.diId = parseInt(this.$route.query.DiId)
         this.OpCarTouristGuideGroundData.id = this.$route.query.id
         this.OpCarTouristGuideGroundData.createUserId = this.userId
-        debugger
+        
         if (this.OpCarTouristGuideGroundData.id != null && this.OpCarTouristGuideGroundData.id != undefined && this.OpCarTouristGuideGroundData.id != 0) {
             this.QueryCarTouristGuideGroundById();
             this.title = "修改Op费用";
@@ -423,6 +473,7 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
+    
 }
 
 .car_add .communal-title {
@@ -461,7 +512,12 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
 }
-
+.car_add .el-date-editor.el-input{
+    width: 100%;
+}
+.car_add .el-select{
+    width: 100%;
+}
 @media screen and (max-width: 1700px) {
     .appraise-box>div {
         width: 48%;