前端调整

src/views/pms/model/IotModelForm.vue

@@ -23,11 +23,11 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="12" v-if="formType==='update'">
           <el-form-item label="状态" prop="status">
             <el-select v-model="formData.status" placeholder="请选择">
               <el-option
-                v-for="dict in getStrDictOptions(DICT_TYPE.COMMON_STATUS)"
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
                 :key="dict.label"
                 :label="dict.label"
                 :value="dict.value"
@@ -40,7 +40,7 @@
             <el-input v-model="formData.sort" type="number" placeholder="请输入显示顺序" />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="formType==='create'?12:24">
           <el-form-item label="符合标准" prop="standard">
             <el-input v-model="formData.standard" placeholder="请输入符合标准" />
           </el-form-item>
@@ -61,7 +61,7 @@
 </template>
 <script setup lang="ts">
 import { IotModelApi, IotModelVO } from '@/api/pms/model'
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from '@/utils/dict'
 import BrandList from '@/views/pms/device/BrandList.vue'
 
 /** PMS 功能优化 规格型号 表单 */
@@ -108,6 +108,7 @@ const open = async (type: string, id?: number) => {
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  formData.value.sort = 0
   // 修改时，设置数据
   if (id) {
     formLoading.value = true

src/views/pms/productclassify/ProductClassifyForm.vue

@@ -13,21 +13,21 @@
           :data="deptTree"
           :props="defaultProps"
           check-strictly
-          default-expand-all
           placeholder="请选择上级分类"
-          value-key="deptId"
+          value-key="id"
+          :default-expanded-keys="firstLevelKeys"
         />
       </el-form-item>
       <el-form-item label="分类名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入分类名称" />
       </el-form-item>
-      <el-form-item label="分类编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入分类编码" />
-      </el-form-item>
+<!--      <el-form-item label="分类编码" prop="code">-->
+<!--        <el-input v-model="formData.code" placeholder="请输入分类编码" />-->
+<!--      </el-form-item>-->
       <el-form-item label="显示排序" prop="sort">
         <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="状态" prop="status" v-if="formType==='update'">
         <el-select v-model="formData.status" clearable placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -80,14 +80,16 @@ const formRules = reactive<FormRules>({
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构
-// const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, parentId: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  formData.value.sort = 0;
+  formData.value.parentId = parentId
+  debugger
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -97,8 +99,6 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
-  // 获得用户列表
-  //userList.value = await UserApi.getSimpleUserList()
   // 获得分类树
   await getTree()
 }
@@ -146,6 +146,7 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
+const firstLevelKeys = ref([])
 /** 获得分类树 */
 const getTree = async () => {
   deptTree.value = []
@@ -153,5 +154,7 @@ const getTree = async () => {
   let dept: Tree = { id: 0, name: '顶级分类', children: [] }
   dept.children = handleTree(data)
   deptTree.value.push(dept)
+  firstLevelKeys.value = deptTree.value.map(node => node.id);
+  debugger
 }
 </script>

src/views/pms/productclassify/index.vue

@@ -58,9 +58,10 @@
       row-key="id"
       :default-expand-all="isExpandAll"
       v-if="refreshTable"
+      @row-click="handleClick"
     >
       <el-table-column prop="name" label="分类名称" />
-      <el-table-column prop="code" label="分类编码" />
+<!--      <el-table-column prop="code" label="分类编码" />-->
       <el-table-column prop="sort" label="排序" />
       <el-table-column prop="status" label="状态">
         <template #default="scope">
@@ -124,8 +125,10 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const isExpandAll = ref(true) // 是否展开，默认全部展开
 const refreshTable = ref(true) // 重新渲染表格状态
-// const userList = ref<UserApi.UserVO[]>([]) // 用户列表
-
+const parentId = ref('')
+const handleClick = (node: {}) => {
+  parentId.value = node.id
+}
 /** 查询分类列表 */
 const getList = async () => {
   loading.value = true
@@ -160,8 +163,9 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (type: string, id?: number, parent: number) => {
+  parent = parentId.value
+  formRef.value.open(type, id, parent)
 }
 
 /** 删除按钮操作 */
@@ -184,3 +188,13 @@ onMounted(async () => {
   //userList.value = await UserApi.getSimpleUserList()
 })
 </script>
+<style scoped>
+/* 全局样式或 scoped 穿透 */
+:deep(.el-table__body tr) {
+  cursor: pointer; /* 手型光标 */
+}
+
+:deep(.el-table__body tr:hover) {
+  cursor: pointer;
+}
+</style>

src/views/supplier/base/form/SupplierInfoForm.vue

@@ -304,6 +304,7 @@ const submitForm = async () => {
     }
     // 发送操作成功的事件
     emit('success')
+    close()
   } finally {
     formLoading.value = false
   }