管理后台-商品管理：商品列表

htmldev/manage/src/router/modules/business.js

@@ -129,12 +129,6 @@ const businessRouter = {
           component: () => import('@/views/business/pms/goods/index'),
           name: 'BusinessPMSGoods',
           meta: { title: '商品列表' }
-        },
-        {
-          path: 'add',
-          component: () => import('@/views/business/pms/add/index'),
-          name: 'BusinessPMSAdd',
-          meta: { title: '添加商品' }
         }
       ]
     }

htmldev/manage/src/views/business/pms/add/index.vue

@@ -1,13 +0,0 @@
-<template>
-  <div>订单</div>
-</template>
-
-<script>
-export default {
-  name: 'index'
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>

htmldev/manage/src/views/business/pms/goods/details.vue

@@ -2,13 +2,13 @@
   <div>
     <el-dialog :title="exData.id ? '编辑': '新增'"
                :visible.sync="dialog"
-               width="50%"
+               width="70%"
                :close-on-click-modal="false"
                top="50px">
       <el-form ref="form"
                :model="form"
                :rules="formRules"
-               label-width="160px">
+               label-width="120px">
         <el-form-item label="商品分类：">
           <el-select v-model="form.productAttributeCategoryId" placeholder="请选择">
             <el-option
@@ -53,51 +53,75 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商品描述：">
-          <tinymce :height="300" v-model="form.content"/>
-        </el-form-item>
-        <el-form-item prop="bar_address"
-                      :rules="formRules.required"
-                      label="设置SKU：">
-          <el-col :span="16">
-            <el-input v-model="form.bar_address"
-                      placeholder="请输入门店地址"
-                      clearable></el-input>
-          </el-col>
-        </el-form-item>
         <el-form-item prop="bar_status"
                       :rules="formRules.required"
-                      label="门店状态：">
+                      label="是否上架：">
           <el-radio v-model="form.bar_status"
-                    label="1">有效
+                    label="1">上架
           </el-radio>
           <el-radio v-model="form.bar_status"
-                    label="0">无效
+                    label="0">下架
           </el-radio>
         </el-form-item>
-        <el-form-item prop="bar_song_start_time"
-                      :rules="formRules.required"
-                      label="点歌时间：">
-          <el-time-select placeholder="起始时间"
-                          v-model="form.bar_song_start_time"
-                          :picker-options="{start: '00:00', step: '00:05', end: '23:59'}">
-          </el-time-select>
-          <el-time-select placeholder="结束时间"
-                          v-model="form.bar_song_end_time"
-                          :picker-options="{start: '00:00', step: '00:05', end: '23:59', minTime: form.bar_song_start_time}">
-          </el-time-select>
+        <el-form-item label="商品描述：">
+          <tinymce :height="300" v-model="form.content"/>
         </el-form-item>
-        <el-form-item prop="bar_place_reserve_start_time"
-                      :rules="formRules.required"
-                      label="座位预定时间：">
-          <el-time-select placeholder="起始时间"
-                          v-model="form.bar_place_reserve_start_time"
-                          :picker-options="{start: '00:00', step: '00:05', end: '23:59'}">
-          </el-time-select>
-          <el-time-select placeholder="结束时间"
-                          v-model="form.bar_place_reserve_end_time"
-                          :picker-options="{start: '00:00', step: '00:05', end: '23:59', minTime: form.bar_place_reserve_start_time}">
-          </el-time-select>
+        <el-form-item label="设置SKU" required></el-form-item>
+        <el-form-item v-for="(desk, index) in form.place_number"
+                      :label="'SKU' + (index + 1)"
+                      :key="index"
+                      :prop="'place_number.' + index + '.value'"
+                      :rules="formRules.required">
+          <el-col :span="9">
+            <el-input v-model="desk.value" placeholder="请设置SKU名"></el-input>
+          </el-col>
+          <el-col :span="5">
+            <el-input v-model="form.place_price"
+                      placeholder="请输入单价"
+                      @input="form.place_price=form.place_price.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
+                      clearable></el-input>
+          </el-col>
+          <el-col :span="5" :offset="1">
+            <el-switch
+              v-model="value1"
+              active-text="上架"
+              inactive-text="下架">
+            </el-switch>
+          </el-col>
+          <el-col :span="3" :offset="1">
+            <el-button type="warning"
+                       size="small"
+                       @click.prevent="removeDeskNum(desk)">删除
+            </el-button>
+          </el-col>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="small" @click.prevent="addDomain">新增SKU</el-button>
+        </el-form-item>
+        <el-form-item label="设置可选规格"></el-form-item>
+        <el-form-item>
+          <el-input v-model="form.place_name"
+                    placeholder="请输入规格名称"
+                    clearable></el-input>
+          <el-select
+            v-model="value2"
+            multiple
+            filterable
+            allow-create
+            default-first-option
+            placeholder="请选择文章标签">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button size="small"
+                     @click.prevent="addDomain">添加规格
+          </el-button>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer text-center">
@@ -139,9 +163,26 @@ export default {
         bar_song_end_time: '', // 点歌结束时间
         bar_place_reserve_start_time: '', // 座位预定开始时间
         bar_place_reserve_end_time: '', // 座位预定结束时间
-        content: ''
+        content: '',
+        place_number: [
+          {
+            value: ''
+          }
+        ]
       },
-      fileList: []
+      fileList: [],
+      value1: true,
+      options: [{
+        value: 'HTML',
+        label: 'HTML'
+      }, {
+        value: 'CSS',
+        label: 'CSS'
+      }, {
+        value: 'JavaScript',
+        label: 'JavaScript'
+      }],
+      value2: []
     }
   },
   methods: {
@@ -167,6 +208,21 @@ export default {
         this.$message.error('图片上传失败')
       }
     },
+    removeDeskNum (item) {
+      var index = this.form.place_number.indexOf(item)
+      if (this.form.place_number.length <= 1) {
+        this.$message.warning('桌数不能小于1')
+        return
+      }
+      if (index !== -1) {
+        this.form.place_number.splice(index, 1)
+      }
+    },
+    addDomain () {
+      this.form.place_number.push({
+        value: ''
+      })
+    },
     handleSubmit () {
       const url = this.exData.id ? '/v1/bar/modify' : '/v1/bar/add'
       this.$refs.form.validate(async valid => {
@@ -218,4 +274,18 @@ export default {
   margin-top: -20px;
   margin-bottom: 20px;
 }
+
+.af-put-line-radio {
+  display: flex;
+  align-items: center;
+
+  p.lalel {
+    padding: 0 10px;
+  }
+
+  p {
+    padding: 0;
+    margin: 0;
+  }
+}
 </style>

htmldev/manage/src/views/business/sms/plan/details.vue

@@ -109,7 +109,7 @@ export default {
       })
     },
     handleSubmit () {
-      const url = this.exData.id ? '/v1/bar/modify' : '/v1/bar/add'
+      const url = this.exData.id ? '/v1/bar/modify' : '/v1/bar/show/plan/add'
       this.$refs.form.validate(async valid => {
         if (valid) {
           const data = await this.$fetch(url, {

htmldev/manage/src/views/business/sms/plan/index.vue

@@ -22,7 +22,12 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-table :data="tableData" stripe v-loading="tableLoading" fit class="marginT-10 order-table" border
+    <el-table :data="tableData"
+              stripe
+              v-loading="tableLoading"
+              fit
+              class="marginT-10 order-table"
+              border
               :max-height="vheight">
       <el-table-column label="ID" prop="id"></el-table-column>
       <el-table-column label="艺人" prop="created_at"></el-table-column>
@@ -109,7 +114,7 @@ export default {
       time: [],
       searchForm: {},
       tableData: [],
-      tableUrl: '/department/list',
+      tableUrl: '/v1/bar/show/plan/list',
       singerData: [], // 歌手列表
       musicData: [] // 当前歌手曲库
     }

htmldev/manage/src/views/business/sms/plan/playList.vue

@@ -112,7 +112,7 @@ export default {
       })
     },
     handleSubmit () {
-      const url = this.exData.id ? '/v1/bar/modify' : '/v1/bar/add'
+      const url = this.exData.id ? '/v1/bar/modify' : '/v1/bar/show/plan/song/add'
       this.$refs.form.validate(async valid => {
         if (valid) {
           const data = await this.$fetch(url, {