!342 【CRM：优化产品以及产品分类】

Merge pull request !342 from ZanGe丶/master

!342 【CRM：优化产品以及产品分类】
Merge pull request !342 from ZanGe丶/master
ee966750 · 芋道源码 · Gitee · 0c613e94 · dde61c29 · ee966750
Commit ee966750 authored Dec 05, 2023 by 芋道源码 Committed by Gitee Dec 05, 2023
6 changed files
--- a/src/api/crm/productCategory/index.ts
+++ b/src/api/crm/productCategory/index.ts
--- a/src/views/crm/product/ProductDetail.vue
+++ b/src/views/crm/product/ProductDetail.vue
@@ -33,7 +33,7 @@
 </template>
 <script setup lang="ts">
 import { DICT_TYPE } from '@/utils/dict'
-import * as ProductCategoryApi from '@/api/crm/productCategory'
+import * as ProductCategoryApi from '@/api/crm/product/productCategory'
 import * as ProductApi from '@/api/crm/product'
 import { formatDate } from '@/utils/formatTime'
 import { fenToYuan } from '@/utils'

--- a/src/views/crm/product/ProductForm.vue
+++ b/src/views/crm/product/ProductForm.vue
@@ -8,12 +8,20 @@
      label-width="100px"
      v-loading="formLoading"
    >
+      <el-row>
+        <el-col :span="12">
          <el-form-item label="产品名称" prop="name">
            <el-input v-model="formData.name" placeholder="请输入产品名称" />
          </el-form-item>
+        </el-col>
+        <el-col :span="12">
          <el-form-item label="产品编码" prop="no">
            <el-input v-model="formData.no" placeholder="请输入产品编码" />
          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
          <el-form-item label="单位" prop="unit">
            <el-select v-model="formData.unit" class="w-1/1" placeholder="请选择单位">
              <el-option
@@ -24,9 +32,15 @@
              />
            </el-select>
          </el-form-item>
+        </el-col>
+        <el-col :span="12">
          <el-form-item label="价格" prop="price">
            <el-input type="number" v-model="formData.price" placeholder="请输入价格" />
          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
          <el-form-item label="状态" prop="status">
            <el-select v-model="formData.status" placeholder="请选择状态">
              <el-option
@@ -37,6 +51,8 @@
              />
            </el-select>
          </el-form-item>
+        </el-col>
+        <el-col :span="12">
          <el-form-item label="产品分类" prop="categoryId">
            <el-cascader
              v-model="formData.categoryId"
@@ -48,9 +64,15 @@
              filterable
            />
          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
          <el-form-item label="产品描述" prop="description">
            <el-input v-model="formData.description" placeholder="请输入产品描述" />
          </el-form-item>
+        </el-col>
+        <el-col :span="12">
          <el-form-item label="负责人" prop="ownerUserId">
            <el-select
              v-model="formData.ownerUserId"
@@ -65,6 +87,8 @@
              />
            </el-select>
          </el-form-item>
+        </el-col>
+      </el-row>
    </el-form>
    <template #footer>
      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -75,7 +99,7 @@
 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import * as ProductApi from '@/api/crm/product'
-import * as ProductCategoryApi from '@/api/crm/productCategory'
+import * as ProductCategoryApi from '@/api/crm/product/productCategory'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'

--- a/src/views/crm/product/index.vue
+++ b/src/views/crm/product/index.vue
@@ -17,15 +17,6 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="产品编码" prop="no">
-        <el-input
-          v-model="queryParams.no"
-          placeholder="请输入产品编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
      <el-form-item label="状态" prop="status">
        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
          <el-option
@@ -36,26 +27,6 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item label="产品分类" prop="categoryId">
-        <el-input
-          v-model="queryParams.categoryId"
-          placeholder="请选择产品分类"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
      <el-form-item>
        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -167,7 +138,7 @@ import * as ProductApi from '@/api/crm/product'
 import ProductForm from './ProductForm.vue'
 import ProductDetail from './ProductDetail.vue'
 import { fenToYuan } from '@/utils'
-import * as ProductCategoryApi from '@/api/crm/productCategory'
+import * as ProductCategoryApi from '@/api/crm/product/productCategory'
 import { getSimpleUserList, UserVO } from '@/api/system/user'
 defineOptions({ name: 'CrmProduct' })

--- a/src/views/crm/productCategory/ProductCategoryForm.vue
+++ b/src/views/crm/productCategory/ProductCategoryForm.vue
@@ -29,7 +29,7 @@
  </Dialog>
 </template>
 <script setup lang="ts">
-import * as ProductCategoryApi from '@/api/crm/productCategory'
+import * as ProductCategoryApi from '@/api/crm/product/productCategory'
 defineOptions({ name: 'CrmProductCategoryForm' })

--- a/src/views/crm/productCategory/index.vue
+++ b/src/views/crm/productCategory/index.vue
@@ -74,7 +74,7 @@
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import * as ProductCategoryApi from '@/api/crm/productCategory'
+import * as ProductCategoryApi from '@/api/crm/product/productCategory'
 import ProductCategoryForm from './ProductCategoryForm.vue'
 import { handleTree } from '@/utils/tree'