Browse Source

no message

DESKTOP-SVI9JE1\muzen 1 year ago
parent
commit
833e5c1857
2 changed files with 13 additions and 7 deletions
  1. 2 2
      src/components/GanttChart/index.vue
  2. 11 5
      src/views/store/list/index.vue

+ 2 - 2
src/components/GanttChart/index.vue

@@ -30,8 +30,8 @@
         display: getDisplay(element), top: getTop(element), left: getLeft(element),
         height: getHeight(element), width: getWidth(element)
       }" :class="[element.status === 0 ? 'grid-item' : 'grid-item-disabled']" @mousedown.stop>
-            <el-popover placement="bottom" width="300px" popper-class="popper" :popper-style="popperStyle"
-              :hide-after="0">
+            <el-popover placement="right" width="300px" popper-class="popper" :popper-style="popperStyle"
+              :hide-after="0" trigger="click">
               <div class="title">
                 <h2>{{ element.name }}</h2>
                 <div style="display:flex; justify-content: space-between;">

+ 11 - 5
src/views/store/list/index.vue

@@ -43,11 +43,11 @@
             </el-icon>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item>
-                  <el-button link @click="getDialog(item.id)" v-hasPermi="['store:list:edit']">编辑</el-button>
+                <el-dropdown-item @click="getDialog(item.id)" v-hasPermi="['store:list:edit']">
+                  编辑
                 </el-dropdown-item>
-                <el-dropdown-item>
-                  <el-button link @click="getDelete(item)" v-hasPermi="['store:list:delete']">删除</el-button>
+                <el-dropdown-item @click="getDelete(item)" v-hasPermi="['store:list:delete']">
+                  删除
                 </el-dropdown-item>
               </el-dropdown-menu>
             </template>
@@ -220,7 +220,11 @@ const getDetail = (id) => {
     if (res.code === 0) {
       data.dialogForm = res.data
       data.areaList = [res.data.provinceId, res.data.cityId, res.data.areaId]
-      data.timeList = []
+      if(res.data.timeRestList.length < 1) {
+        data.timeList = [[]]
+      }else{
+        data.timeList = []
+      }
       res.data.timeRestList.map(i => {
         data.timeList.push([i.startTime, i.endTime])
       })
@@ -264,6 +268,8 @@ const handleChangeTime = (e, index) => {
         endTime: data.timeList[i][1]
       })
     }
+  }else{
+    data.dialogForm.timeRestList.splice(index, 1)
   }
 }