Mr.Shi
2023-09-19 a5e6e7061cbef6912f294dcfd2cb88f472f8ca6f
企业端
已修改5个文件
99 ■■■■■ 文件已修改
company_admin/.env.development 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/src/components/business/OperaCategoryWindow.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/src/views/business/brand.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/src/views/business/category.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/src/views/business/goods.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
company_admin/.env.development
@@ -3,6 +3,8 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
VUE_APP_API = 'http://192.168.0.15:10012/'
VUE_APP_API = 'http://192.168.0.15:10022/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
company_admin/src/components/business/OperaCategoryWindow.vue
@@ -9,7 +9,7 @@
      <h3 style="margin: 20px 0 10px 0;">基本信息</h3>
      <el-form :model="form" ref="form" :rules="rules">
        <el-form-item label="类别来源" prop="type">
          <el-radio-group v-model="form.type" @change="changeRadio">
          <el-radio-group v-model="form.type" :disabled="form.id ? true : false" @change="changeRadio">
            <el-radio :label="1">从平台库选择</el-radio>
            <el-radio :label="0">企业自建</el-radio>
          </el-radio-group>
@@ -65,6 +65,7 @@
                v-model="scope.row.isselect"
                active-color="#13ce66"
                inactive-color="#ff4949"
                @change="changeIsselect($event, scope.row)"
                :active-value="1"
                :inactive-value="0">
              </el-switch>
@@ -187,6 +188,18 @@
      })
    },
    methods: {
      changeIsselect(e, item) {
        let num = 0
        this.form.tableData.forEach(row => {
          if (row.isselect === 1) {
            num += 1
          }
        })
        if (num > 2) {
          item.isselect = 0
          this.$message.warning({ message: '只能设置两个选项' })
        }
      },
      addItem() {
        this.form.tableData.push({ name: '', isselect: 0, isshow: 1 })
      },
company_admin/src/views/business/brand.vue
@@ -5,6 +5,16 @@
        <el-form-item label="品牌名称" prop="name">
          <el-input v-model="searchForm.name" placeholder="请输入品牌名称" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="类型" prop="type">
          <el-select v-model="searchForm.type" clearable placeholder="请选择">
            <el-option
              v-for="item in typeList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:brand:exportExcel']" @click="exportExcel">导出</el-button> -->
@@ -35,6 +45,12 @@
                fit="cover"></el-image>
            </template>
          </el-table-column>
          <el-table-column prop="categoryName" label="类型" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.type == 0">自建</span>
              <span v-else>拉取</span>
            </template>
          </el-table-column>
          <el-table-column prop="sortnum" label="排序码(升序)" min-width="100px"></el-table-column>
          <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
          <el-table-column
@@ -44,8 +60,10 @@
            fixed="right"
          >
            <template slot-scope="{row}">
              <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:brand:update']">编辑</el-button>
              <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:brand:delete']">删除</el-button>
              <template v-if="row.type == 0">
                <el-button type="text" @click="edit(row)" icon="el-icon-edit" v-permissions="['business:brand:update']">编辑</el-button>
                <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:brand:delete']">删除</el-button>
              </template>
            </template>
          </el-table-column>
        </el-table>
@@ -74,8 +92,13 @@
      return {
        // 搜索
        searchForm: {
          name: ''
        }
          name: '',
          type: ''
        },
        typeList: [
          { name: '自建', id: 0 },
          { name: '拉取', id: 1 }
        ]
      }
    },
    created () {
company_admin/src/views/business/category.vue
@@ -5,6 +5,16 @@
        <el-form-item label="类别名称" prop="name">
          <el-input v-model="searchForm.name" placeholder="请输入类别名称" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="类型" prop="type">
          <el-select v-model="searchForm.type" clearable placeholder="请选择">
            <el-option
              v-for="item in typeList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:category:exportExcel']" @click="exportExcel">导出</el-button> -->
@@ -35,6 +45,12 @@
            </template>
          </el-table-column>
          <el-table-column prop="name" label="类别名称" min-width="100px"></el-table-column>
          <el-table-column prop="categoryName" label="类型" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.type == 0">自建</span>
              <span v-else>拉取</span>
            </template>
          </el-table-column>
          <el-table-column prop="sortnum" label="排序码(升序)" min-width="100px"></el-table-column>
          <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
          <el-table-column prop="status" label="状态" min-width="100px">
@@ -87,8 +103,13 @@
      return {
        // 搜索
        searchForm: {
          name: ''
        }
          name: '',
          type: ''
        },
        typeList: [
          { name: '自建', id: 0 },
          { name: '拉取', id: 1 }
        ]
      }
    },
    created () {
company_admin/src/views/business/goods.vue
@@ -42,6 +42,17 @@
          </el-select>
          <!-- <el-input v-model="searchForm.status" placeholder="请输入状态 0启用 1禁用" @keypress.enter.native="search"></el-input> -->
        </el-form-item>
        <el-form-item label="类型" prop="type">
          <el-select v-model="searchForm.type" clearable placeholder="请选择">
            <el-option
              v-for="item in typeList"
              :key="item.id"
              :label="item.name"
              :value="item.id">
            </el-option>
          </el-select>
          <!-- <el-input v-model="searchForm.status" placeholder="请输入状态 0启用 1禁用" @keypress.enter.native="search"></el-input> -->
        </el-form-item>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
@@ -87,6 +98,12 @@
          </el-table-column>
          <el-table-column prop="brandName" label="品牌" min-width="100px"></el-table-column>
          <el-table-column prop="categoryName" label="类别" min-width="100px"></el-table-column>
          <el-table-column prop="categoryName" label="类型" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.type == 0">自建</span>
              <span v-else>拉取</span>
            </template>
          </el-table-column>
          <el-table-column label="指导价(元)" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.type == 0">{{ row.zdPrice }}</span>
@@ -155,7 +172,8 @@
          name: '',
          status: '',
          categoryId: '',
          brandId: ''
          brandId: '',
          type: ''
        },
        ids: '',
        categoryList: [],
@@ -163,6 +181,10 @@
        statusList: [
          { name: '启用', id: 0 },
          { name: '禁用', id: 1 }
        ],
        typeList: [
          { name: '自建', id: 0 },
          { name: '拉取', id: 1 }
        ]
      }
    },