耗材列表盘点

src/views/product/components/addGroup.vue

@@ -33,10 +33,23 @@
                         <el-radio :label="0">禁用</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="" v-if="form.useTime == 1" prop="saleTime">
-                    <el-time-picker is-range v-model="form.saleTime" value-format="HH:mm" format="HH:mm"
-                        range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围">
+                <el-form-item label="" v-if="form.useTime == 1">
+                    <!-- <el-time-picker is-range v-model="form.saleTime" value-format="HH:mm" format="HH:mm"
+                        :picker-options="pickerOptions" range-separator="至" start-placeholder="开始时间"
+                        end-placeholder="结束时间" placeholder="选择时间范围">
+                    </el-time-picker> -->
+
+                    <el-time-picker placeholder="起始时间" v-model="form.saleStartTime" :picker-options="{
+                        selectableRange: '00:00:00 - 23:59:59',
+                        format: 'HH:mm'
+                    }" format="HH:mm" value-format="HH:mm">
                     </el-time-picker>
+                    <el-time-picker placeholder="结束时间" v-model="form.saleEndTime" :picker-options="{
+                        selectableRange: '00:00:00 - 23:59:59',
+                    }" format="HH:mm" value-format="HH:mm">
+                    </el-time-picker>
+
+
                 </el-form-item>
                 <el-form-item label="分组排序" v-if="form.id">
                     <el-input-number v-model="form.sort" controls-position="right" :min="0"></el-input-number>
@@ -44,7 +57,7 @@
 
             </el-form>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button @click="quxiaodialogVisible">取 消</el-button>
                 <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
             </span>
         </el-dialog>
@@ -73,6 +86,15 @@ export default {
                 useTime: 0,
                 shopId: localStorage.getItem('shopId')
             },
+            pickerOptions: {
+                selectableRange: '00:00:00 - 23:59:59'
+                // disabledDate(time) {
+                //     // return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 
+                //     // return time.getTime() < Date.now(); //只可以选择今天之后
+                //     return time.getTime() < Date.now() - 8.64e7;//只可以选择今天之后包括今天
+
+                // }
+            },
             rules: {
                 name: [
                     {
@@ -93,6 +115,11 @@ export default {
         }
     },
     methods: {
+        quxiaodialogVisible() {
+            this.dialogVisible = false
+            this.$emit('success', null)
+
+        },
         slectShop(res) {
             if (this.productIds.length) {
                 res.map(async item => {
@@ -115,14 +142,12 @@ export default {
             return falg
         },
         onSubmitHandle() {
-            console.log(this.form.saleTime)
             this.$refs.form.validate(async valid => {
                 if (valid) {
                     this.loading = true
                     try {
                         this.form.productIds = this.productIds.map(item => item.id);
-                        this.form.saleStartTime = this.form.saleTime[0]
-                        this.form.saleEndTime = this.form.saleTime[1]
+
                         let res = null
                         if (!this.form.id) {
                             await tbProductGroupPost(this.form)
@@ -152,6 +177,8 @@ export default {
             }
         },
         show(obj) {
+            // if()
+            this.form.useTime = 0
             if (obj && obj.id) {
                 this.form = obj
                 this.form.id = obj.id
@@ -159,12 +186,11 @@ export default {
                 this.form.name = obj.name
                 this.form.sort = obj.sort
                 this.form.productIds = obj.productIds
-                if (obj.saleStartTime != null) {
-                    this.$set(this.form, 'saleTime', [obj.saleStartTime, obj.saleEndTime])
-                }
+                // if (obj.saleStartTime != null) {
+                //     this.$set(this.form, 'saleTime', [obj.saleStartTime, obj.saleEndTime])
+                // }
                 this.getProduts()
             }
-
             this.dialogVisible = true
         },
         close() {

src/views/product/group/index.vue

@@ -12,7 +12,12 @@
         <el-table-column label="分组名称" prop="name"></el-table-column>
         <el-table-column label="售卖时间管控" prop="useTime">
           <template v-slot="scope">
-            {{ scope.row.useTime==1? scope.row.saleStartTime +'-'+scope.row.saleEndTime:'' }}
+            <template v-if="scope.row.useTime == 1">
+
+              <!-- {{ scope.row.saleStartTime + '-' + (scope.row.saleEndTime) }} -->
+              {{ saleEndTimeFilter(scope.row.saleStartTime, scope.row.saleEndTime) }}
+              <!-- {{ new Date(scope.row.saleEndTime+'').getTime() }} -->
+            </template>
           </template>
         </el-table-column>
         <el-table-column label="状态">
@@ -66,8 +71,22 @@ export default {
         this.tableDrag()
       })
     }
+  },
+  filters: {
+
   },
   methods: {
+    saleEndTimeFilter: (a, b) => {
+
+      var currentDate = new Date(); // 当前日期对象
+      var dateString = currentDate.toDateString(); // 获取当前日期的字符串表示（不包含时分秒）
+      var dateTimeString = dateString + ' ' + a; // 拼接日期和时分秒字符串
+      var dateTimeStringb = dateString + ' ' + b; // 拼接日期和时分秒字符串
+      var timestamp = Date.parse(dateTimeString); // 将日期时间字符串转换为时间戳
+      var timestamp2 = Date.parse(dateTimeStringb); // 将日期时间字符串转换为时间戳
+      let ciri = timestamp > timestamp2 ? '次日' : ''
+      return a + ' - ' + ciri + b
+    },
     //表格拖拽
     tableDrag() {
       const el = document.querySelector('#table_drag .el-table__body-wrapper tbody')

src/views/product/index.vue

@@ -130,6 +130,7 @@ export default {
     }
   },
   async mounted() {
+    console.log(this.$route.query.productId,'tiaoshi1')
     if (this.$route.query.productId) {
       this.query.productId = this.$route.query.productId
     }
@@ -206,11 +207,11 @@ export default {
       try {
         let localQuery = JSON.parse(localStorage.getItem('shopIndexQuery'))
         if (localQuery != null && localQuery.hasOwnProperty('productId')) {
-          this.query = localQuery
+          // this.query = localQuery
         }
 
         this.tableData.loading = true
-        console.log(this.query)
+        console.log(this.query,'调试2')
         const res = await tbProduct({
           page: this.tableData.page,
           size: this.tableData.size,