MONSTER-ygh 1 год назад
Родитель
Сommit
129889e3ca

+ 1 - 1
src/views/order/groupBuyingMr/dialog/details.vue

@@ -45,7 +45,7 @@
           <div class="grid-content bg-purple item-class">团购单价: <span v-if="form.price">¥{{ form.price || '' }}/人</span></div>
         </el-col>
         <el-col :span="12">
-          <div class="grid-content bg-purple item-class">预约时间: <span v-if="form.preformStartTime">{{ form.preformStartTime || '' }}</span></div>
+          <div class="grid-content bg-purple item-class">预约时间: <span v-if="form.performDate">{{ form.performDate + "  " || '' }}{{ form.performTimeStart +'  --'  || '' }}{{ form.performTimeEnd || '' }}</span></div>
         </el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple item-class">报名时间: <span>{{ form.applyTime || '' }}</span></div>

+ 9 - 1
src/views/ticket/ticketMr/dialog/FreightMgrIndexMi.js

@@ -1,3 +1,4 @@
+import { basePositionApi } from '@/api/ticketMr/ticketMr'
 export default {
     data() {
         return {
@@ -12,6 +13,9 @@ export default {
             selectDeliveryAreaDialogOpen: false,
             selectDeliveryAreaDialogTitle: '可售区域',
         }
+    },
+    created() {
+        
     },
     methods: {
         /**
@@ -19,6 +23,7 @@ export default {
          */
         deliverableAreaDialogCancel() {
             this.selectDeliveryAreaDialogOpen = true;
+            this.basePositionFun("#")
         },
         /** 关闭弹窗  */
         selectDeliveryAreaDialogCancel(){
@@ -30,7 +35,10 @@ export default {
         /**  获取行政区划  */
         async basePositionFun(upCode) {
             try {
-                let res = await basePositionApi({upCode})
+                let res = await basePositionApi({
+                    upCode,
+                    pa
+                })
                 if(res.code == 200) {
                 this.selectDeliveryAreaDialogList = [].concat(res.data.rows)
                 }

+ 11 - 3
src/views/ticket/ticketMr/dialog/addAndEdit.vue

@@ -187,9 +187,17 @@
                 @change="handleChangeProvince(areaIndex, areaItem)"
               >
                 <template #default>
-                  <span
-                    :class="areaItem.hasChildrenSelect ? 'area-province-label' : ''"
-                  >{{ areaItem.name }}</span>
+                  <el-popover
+                    placement="right"
+                    width="400"
+                    trigger="click">
+                    
+                    <span
+                    slot="reference"
+                      :class="areaItem.hasChildrenSelect ? 'area-province-label' : ''"
+                    >{{ areaItem.name }}</span>
+                  </el-popover>
+                  
                 </template>
               </el-checkbox>
             </el-col>