fix: 车间管理除上飞组件和排序功能实现

src/api/system/region.ts

@@ -23,7 +23,7 @@ export function regionList(params) {
  */
 export function getProvinceList(params?: any) {
   return http.request({
-    url: '/region/queryProvinceList',
+    url: '/admin/region/queryProvinceList',
     method: 'GET',
     params,
   });

src/types/scene/constant.ts

@@ -1,6 +1,6 @@
-export enum ENABLED {
-  FALSE = 1,
-  TRUE = 0,
+export enum IS_DISABLED {
+  FALSE = 0,
+  TRUE = 1,
 }
 
 export enum DATA_LEVEL {

src/types/scene/type.ts

@@ -1,4 +1,4 @@
-import { ViewType } from './constant';
+import { ViewType, DrawerType } from './constant';
 
 /** 场景标签信息 */
 export type SceneLabelOrModuleItem = {
@@ -387,6 +387,7 @@ export interface UseComType<T> {
   latitude?: number;
   longitude?: number;
   name: string;
+  nodeType: DrawerType;
   orderNum: number;
   parentId: number;
   regionCode: string;
@@ -408,6 +409,7 @@ export interface UseWorkshopType<T> {
   // isDeleted: number;
   isDisabled: number;
   name: string;
+  nodeType: DrawerType;
   orderNum: number;
   remark: string;
   tenantId: number;
@@ -427,6 +429,7 @@ export interface UseWorkspaceType {
   isDeleted: number;
   isDisabled: number;
   name: string;
+  nodeType: DrawerType;
   orderNum: number;
   principalId: number;
   principalName: string;

src/views/system-config/scene-manage/SceneManage.vue

@@ -44,46 +44,38 @@
     <div v-if="disableDepartmentEdit">
       <!-- 上飞定制的抽屉表单 -->
       <!-- 公司 -->
-      <CompanyDrawer_shangfei
+      <!-- <CompanyDrawer_shangfei
         v-if="showDrawer === DrawerType.company"
-        :comEdit="comEdit"
-        :sceneList="sceneList"
-        :templateList="templateList"
         :detail="detail"
         @on-ok="subCompany"
         @on-close="handleUpdateTableCom"
-      />
+      /> -->
       <!-- 车间 -->
-      <WorkshopDrawer_shangfei
+      <!-- <WorkshopDrawer_shangfei
         v-if="showDrawer === DrawerType.workshop"
-        :workshopTemplateList="workshopTemplateList"
         :detail="detail"
         @on-close="handleUpdataWorkshopTab"
         @on-ok="subWorkshop"
-      />
+      /> -->
       <!-- 工位 -->
-      <WorkspaceDrawer_shangfei
+      <!-- <WorkspaceDrawer_shangfei
         v-if="showDrawer === DrawerType.workspace"
         :detail="detail"
         @on-close="handleUpdataWorkspaceTab"
         @on-ok="subWorkspace"
-      />
+      /> -->
     </div>
     <div v-else>
       <!-- 其他项目的抽屉表单 -->
       <!-- 公司 -->
       <CompanyDrawer
         v-if="showDrawer === DrawerType.company"
-        :comEdit="comEdit"
-        :sceneList="sceneList"
-        :templateList="templateList"
         :detail="detail"
         @on-ok="subCompany"
         @on-close="handleUpdateTableCom" />
       <!-- 车间 -->
       <WorkshopDrawer
         v-if="showDrawer === DrawerType.workshop"
-        :workshopTemplateList="workshopTemplateList"
         :detail="detail"
         @on-close="handleUpdataWorkshopTab"
         @on-ok="subWorkshop" />
@@ -102,7 +94,7 @@
 </template>
 
 <script setup lang="ts">
-  import { ref, onMounted, reactive, h, computed, Ref } from 'vue';
+  import { ref, onMounted, reactive, h, Ref } from 'vue';
   import { Plus } from '@element-plus/icons-vue';
   import { BasicTable, BasicColumn } from '@/components/Table';
   import ActionColomn from './components/ActionColomns.vue';
@@ -112,7 +104,7 @@
   import WorkshopDrawer_shangfei from './components/WorkshopDrawer-shangfei.vue';
   import WorkspaceDrawer from './components/WorkspaceDrawer.vue';
   import WorkspaceDrawer_shangfei from './components/WorkspaceDrawer-shangfei.vue';
-  import { DATA_LEVEL, DrawerType, ENABLED } from '@/types/scene/constant.ts';
+  import { DrawerType, IS_DISABLED } from '@/types/scene/constant.ts';
   import SceneDialog from './components/SceneDialog.vue';
   import {
     colomns,
@@ -122,12 +114,12 @@
     // flattenCodes,
     // getParent,
   } from './hook/use-table-method';
-  // import {
-  //   delCompany,
-  //   delWorkshop,
-  //   delWorkspace,
-  //   updateComShopSpaceTreeSort,
-  // } from '@/api/scene/scene';
+  import {
+    delCompany,
+    delWorkshop,
+    delWorkspace,
+    // updateComShopSpaceTreeSort,
+  } from '@/api/scene/scene';
   import {
     // ComAddDatas,
     // WorkshopAddDatas,
@@ -137,10 +129,11 @@
     UseWorkspaceType,
   } from '@/types/scene/type.ts';
   import useComTree from './store/use-com-tree';
-  import useSceneTemplete from './hook/use-sence-templete';
+  // import useSceneTemplete from './hook/use-sence-templete';
   import { storeToRefs } from 'pinia';
   // import { ElMessageBox } from 'element-plus';
   import { useGlobSetting } from '@/hooks/setting';
+  import { ElMessageBox } from 'element-plus';
 
   // 此处获取了全局变量，关系到用不用sf定制的组件
   const globSetting = useGlobSetting();
@@ -151,8 +144,8 @@
   const { comTreeData } = storeToRefs(comTree);
 
   const { getComTreeDetail } = comTree;
-  const useSceneTempleteDetail = useSceneTemplete();
-  const { sceneList, templateList, workshopTemplateList } = useSceneTempleteDetail;
+  // const useSceneTempleteDetail = useSceneTemplete();
+  // const { sceneList, templateList, workshopTemplateList } = useSceneTempleteDetail;
   const expendRowKeys = ref(['']);
 
   const showDrawer = ref<DrawerType | null>(null);
@@ -179,9 +172,7 @@
   };
 
   // 判断是否为公司编辑
-  const comEdit = ref<boolean>(false);
-
-  // const level = ref<number>();
+  // const comEdit = ref<boolean>(false);
 
   onMounted(() => {
     //获取公司树数据
@@ -197,7 +188,7 @@
   };
 
   /**
-   * 新建公司时的表单初始化
+   * 表格外新建公司时的表单初始化
    * @modifications
    *  - 2025-01-09: Yunfeng
    *  - V4-平台权限重构
@@ -205,21 +196,12 @@
   const companyAdd = () => {
     showDrawer.value = DrawerType.company;
     detail.value = {
-      seniorScene: '顶级场景',
-      selectItems: [{ tag: '', template: '' }],
-      addEnable: ENABLED.TRUE,
+      isDisabled: IS_DISABLED.FALSE,
       name: '',
-      code: '',
+      // orderNum: comTreeData.value.length,
     };
-    comEdit.value = false;
   };
 
-  // 用于新增场景
-  // const selectItems = ref([{ tag: '', template: '' }] as { tag: string; template: string }[]);
-  // const allCodes = computed(() => {
-  //   return flattenCodes(comTreeData.value);
-  // });
-
   //新增车间
   const subWorkshop = () => {
     getComTreeDetail();
@@ -260,8 +242,7 @@
     dialogVisible.value = true;
   };
 
-  //公司，车间，工位的模板数据
-  // const editedItem: Ref<(ComAddDatas & WorkshopAddDatas & WorkspaceAddDatas) | undefined> = ref();
+  // 公司，车间，工位的模板数据
   const editedItem: Ref<
     (UseComType<undefined> & UseWorkshopType<undefined> & UseWorkspaceType) | undefined
   > = ref();
@@ -269,20 +250,102 @@
   //点击所有添加和编辑时显示的数据内容
   const detail = ref({});
 
-  // 点击添加时
+  // 点击添加下一级时
   const handleAdd = (row) => {
-    console.log(row);
+    editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中
+    if (editedItem.value?.nodeType === DrawerType.company) {
+      // 如果当前层级为公司级，应传入车间表单
+      showDrawer.value = DrawerType.workshop;
+      detail.value = {
+        // 车间表单需提交：车间名称，所属公司，状态
+        // 因为是添加车间所以没有id
+        name: '',
+        seniorScene: editedItem.value?.name,
+        isDisabled: IS_DISABLED.FALSE,
+        companyId: editedItem.value?.id,
+        // orderNum: editedItem.value?.children?.length,
+      };
+    } else if (editedItem.value?.nodeType === DrawerType.workshop) {
+      // 当前层级为车间级，应传入工位表单
+      showDrawer.value = DrawerType.workspace;
+      detail.value = {
+        // 工位表单需提交：工位名称，所属车间，负责人，状态
+        name: '',
+        seniorScene: editedItem.value?.name,
+        principal: '',
+        isDisabled: IS_DISABLED.FALSE,
+        workshopId: editedItem.value?.id,
+        // orderNum: editedItem.value?.children?.length,
+      };
+    }
   };
 
   // 点击编辑时
   const handleEdit = (row) => {
-    editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中，以便编辑
-    console.log(row);
+    editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中
+    // 如果当前层级为什么级去什么表单
+    showDrawer.value = editedItem.value!.nodeType;
+    if (editedItem.value?.nodeType === DrawerType.company) {
+      // 公司表单初始值
+      detail.value = {
+        id: editedItem.value.id,
+        name: editedItem.value.name,
+        regionCode: editedItem.value.regionCode,
+        isDisabled: editedItem.value.isDisabled,
+        thumbnail: editedItem.value.thumbnail,
+      };
+    } else if (editedItem.value?.nodeType === DrawerType.workshop) {
+      // 车间表单初始值
+      detail.value = {
+        id: editedItem.value.id,
+        name: editedItem.value.name,
+        seniorScene: comTreeData.value.find((it) => it.id === editedItem.value?.companyId)!.name,
+        isDisabled: editedItem.value.isDisabled,
+      };
+    } else if (editedItem.value?.nodeType === DrawerType.workspace) {
+      // 工位表单初始值
+      detail.value = {
+        id: editedItem.value.id,
+        name: editedItem.value.name,
+        seniorScene: comTreeData.value
+          .find((it) => it.id === editedItem.value?.companyId)!
+          .children!.find((it) => it.id === editedItem.value?.workshopId)!.name,
+        principal: editedItem.value.principalName,
+        isDisabled: editedItem.value.isDisabled,
+      };
+    }
   };
 
   // 点击删除时
   const handleDelete = (row) => {
-    console.log(row);
+    if (row.children?.length > 0) {
+      ElMessageBox.confirm('存在下级场景，无法删除该场景', '无法删除该条信息', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'error',
+      });
+    } else {
+      ElMessageBox.confirm('确认要删除该场景吗', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          if (row.nodeType === DrawerType.company) {
+            return delCompany(row.id);
+          } else if (row.nodeType === DrawerType.workshop) {
+            return delWorkshop(row.id);
+          } else {
+            return delWorkspace(row.id);
+          }
+        })
+        .catch(() => {
+          console.log('删除失败');
+        })
+        .finally(() => {
+          getComTreeDetail();
+        });
+    }
   };
 
   // 点击上移时
@@ -295,151 +358,6 @@
     console.log(row);
   };
 
-  //页面设置函数 Deprecated in V4
-  // const handleConfig = (row) => {
-  //   router.push({
-  //     path: '/page-config/config',
-  //     query: { companyId: row.id },
-  //   });
-  // };
-
-  // TODO 处理添加
-  // const handleAdd = (row) => {
-  //   editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中，以便编辑
-  //   //得出当前的数据的层级
-  //   level.value = findItemLevel(comTreeData.value, row.id, row.name);
-  //   if ((expendRowKeys.value[0] = row.name)) {
-  //     expendRowKeys.value[0] = '';
-  //   }
-  //   expendRowKeys.value[0] = row.name;
-  //   if (level.value === DATA_LEVEL.company) {
-  //     showDrawer.value = DrawerType.workshop;
-  //     detail.value = {
-  //       id: editedItem.value?.id,
-  //       seniorScene: editedItem.value?.name,
-  //       tagList: row?.labelList,
-  //       addEnable: ENABLED.TRUE,
-  //       name: '',
-  //       code: '',
-  //       tagWorkshop: null,
-  //       templateWorkshop: null,
-  //     };
-  //   } else if (level.value === DATA_LEVEL.workshop) {
-  //     detail.value = {
-  //       id: editedItem.value?.id,
-  //       seniorScene: editedItem.value?.name,
-  //       addEnable: ENABLED.TRUE,
-  //       name: '',
-  //       code: '',
-  //       principal: '',
-  //     };
-  //     if (disableDepartmentEdit) detail.value['workshopCode'] = editedItem.value?.code;
-  //     showDrawer.value = DrawerType.workspace;
-  //   }
-  // };
-
-  // TODO 在这里实现删除行的函数
-  // const handleDelete = (row: Recordable) => {
-  //   level.value = findItemLevel(comTreeData.value, row.id, row.name);
-  //   if (row.children?.length > 0) {
-  //     ElMessageBox.confirm('存在下级场景，无法删除该场景', '无法删除该条信息', {
-  //       confirmButtonText: '确认',
-  //       cancelButtonText: '取消',
-  //       type: 'error',
-  //     })
-  //       .then(() => {
-  //         console.log('存在子集');
-  //       })
-  //       .catch(() => {
-  //         console.log('取消删除物件');
-  //       });
-  //   } else {
-  //     ElMessageBox.confirm('确认要删除该场景吗', {
-  //       confirmButtonText: '确认',
-  //       cancelButtonText: '取消',
-  //       type: 'warning',
-  //     })
-  //       .then(() => {
-  //         //删除接口的调用
-  //         if (level.value === DATA_LEVEL.company) {
-  //           return delCompany(row.id);
-  //         } else if (level.value === DATA_LEVEL.workshop) {
-  //           return delWorkshop(row.id);
-  //         } else {
-  //           return delWorkspace(row.id);
-  //         }
-  //       })
-  //       .catch(() => {
-  //         console.log('取消删除物件');
-  //       })
-  //       .finally(() => {
-  //         getComTreeDetail();
-  //       });
-  //   }
-  // };
-
-  /**
-   * TODO
-   * 处理公司/车间/工位编辑表单数据的初始化
-   * @modifications
-   *  - 2025-01-09: Yunfeng
-   *  - V4-平台权限重构
-   */
-  // const handleEdit = (row) => {
-  //   editedItem.value = { ...row }; // 将当前行的内容拷贝到 editedItem 中，以便编辑
-  //   level.value = findItemLevel(comTreeData.value, row.id, row.name);
-  //   if (level.value === DATA_LEVEL.company) {
-  //     showDrawer.value = DrawerType.company;
-  //     comEdit.value = true;
-  //     //复原公司选择的场景集合
-  //     if (row.labelList && Array.isArray(row.labelList)) {
-  //       selectItems.value = row.labelList.map((item, index) => ({
-  //         tag: item.id,
-  //         template: row.moduleList[index]?.id,
-  //       }));
-  //     }
-  //     detail.value = {
-  //       id: editedItem.value?.id,
-  //       name: editedItem.value!.name,
-  //       code: editedItem.value!.code,
-  //       seniorScene: '顶级场景',
-  //       addEnable: editedItem.value!.status,
-  //       selectItems: selectItems.value,
-  //       remark: editedItem.value?.remark,
-  //       longitude: editedItem.value?.longitude!,
-  //       latitude: editedItem.value?.latitude!,
-  //       regionCode: editedItem.value?.regionCode,
-  //       thumbnail: editedItem.value?.thumbnail,
-  //     };
-  //   } else if (level.value === DATA_LEVEL.workshop && 'companyId' in editedItem.value!) {
-  //     showDrawer.value = DrawerType.workshop;
-  //     detail.value = {
-  //       id: editedItem.value.id,
-  //       name: editedItem.value.name,
-  //       code: editedItem.value.code,
-  //       seniorScene: editedItem.value.parent?.name || '',
-  //       tagWorkshop: editedItem.value.sceneLabelId,
-  //       templateWorkshop: editedItem.value.workshopModule?.id,
-  //       addEnable: editedItem.value.status,
-  //       tagList: editedItem.value.parent?.labelList || [],
-  //       companyId: editedItem.value.companyId,
-  //     };
-  //   } else if (level.value === DATA_LEVEL.workspace && 'workshopId' in editedItem.value!) {
-  //     detail.value = {
-  //       id: editedItem.value.id,
-  //       name: editedItem.value.name,
-  //       code: editedItem.value.code,
-  //       seniorScene: editedItem.value.parent?.name || '',
-  //       principal: editedItem.value.principal,
-  //       addEnable: editedItem.value.status,
-  //     };
-
-  //     showDrawer.value = DrawerType.workspace;
-  //   }
-  // };
-
-  //编辑时的提交按钮功能
-
   //编辑公司的提交按钮
   const subCompany = () => {
     getComTreeDetail();

src/views/system-config/scene-manage/components/CompanyDrawer-shangfei.vue

@@ -101,8 +101,8 @@
         <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.addEnable"
-            :active-value="ENABLED.TRUE"
-            :inactive-value="ENABLED.FALSE"
+            :active-value="IS_DISABLED.TRUE"
+            :inactive-value="IS_DISABLED.FALSE"
             class="switchUse"
           />
         </el-form-item>
@@ -129,7 +129,7 @@
   } from '@/api/scene/scene.ts';
   import { SceneLabelType, TemplateType } from '@/types/scene/type.ts';
 
-  import { ENABLED } from '@/types/scene/constant.ts';
+  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import type { FormInstance, FormRules } from 'element-plus';
   import { ElMessage, ElMessageBox } from 'element-plus';
   import { CirclePlus } from '@element-plus/icons-vue';
@@ -151,7 +151,7 @@
       name?: string;
       code?: string;
       seniorScene?: string;
-      addEnable?: ENABLED;
+      addEnable?: IS_DISABLED;
       selectItems?: SelectItemType[];
       remark?: string;
       longitude?: number; //经度
@@ -186,7 +186,7 @@
     tagWorkshop?: number; //场景标签  车间
     templateWorkshop?: number; //车间模板
     selectItems?: SelectItemType[];
-    addEnable?: ENABLED;
+    addEnable?: IS_DISABLED;
     remark?: string; //备注，可用于添加经纬度，非必要
     longitude?: number; //经度
     latitude?: number; //纬度
@@ -203,7 +203,7 @@
     tagWorkshop: undefined,
     templateWorkshop: undefined,
     selectItems: [{ tag: '', template: '' }],
-    addEnable: ENABLED.TRUE,
+    addEnable: IS_DISABLED.TRUE,
     remark: '',
     longitude: undefined, //经度
     latitude: undefined, //纬度
@@ -408,7 +408,7 @@
   const resetDrawCom = () => {
     ruleForm.name = '';
     // ruleForm.code = '';
-    ruleForm.addEnable = ENABLED.TRUE;
+    ruleForm.addEnable = IS_DISABLED.TRUE;
     ruleForm.selectItems = [{ tag: '', template: '' }];
     ruleForm.regionCode = '';
   };

src/views/system-config/scene-manage/components/CompanyDrawer.vue

@@ -24,58 +24,6 @@
         <el-form-item label="公司名称" prop="name">
           <el-input v-model="ruleForm.name" style="width: 200px" />
         </el-form-item>
-        <!-- 上级场景改为固定 0 -->
-        <el-form-item label="上级场景" prop="seniorScene">
-          <el-input v-model="ruleForm.seniorScene" style="width: 200px" disabled />
-        </el-form-item>
-        <el-form-item v-if="!props.comEdit" label="公司代码" prop="code">
-          <el-input v-model="ruleForm.code" style="width: 200px" />
-        </el-form-item>
-        <!-- <el-form-item label="标签&模板" required>
-          <div style="display: flex; flex-direction: column; align-items: flex-start">
-            <div
-              v-for="(item, index) in ruleForm.selectItems"
-              :key="index"
-              style="margin-bottom: 16px; display: flex"
-            >
-              <el-select v-model="item.tag" placeholder="请选择标签" style="width: 126px">
-                <el-option
-                  v-for="scene in props.sceneList"
-                  :key="scene.id"
-                  :label="scene.name"
-                  :value="scene.id"
-                />
-              </el-select>
-              <img
-                src="@/assets/icons/link.png"
-                alt=""
-                style="width: 16px; margin-left: 2px; margin-right: 2px" />
-              <el-select v-model="item.template" placeholder="请选择模板" style="width: 126px">
-                <el-option
-                  v-for="template in props.templateList"
-                  :key="template.id"
-                  :label="template.name"
-                  :value="template.id"
-                />
-              </el-select>
-              <img
-                src="@/assets/icons/close.png"
-                @click="deleScene(index)"
-                alt=""
-                style="
-                  width: 13px;
-                  height: 13px;
-                  margin-top: 10px;
-                  margin-left: 3px;
-                  cursor: pointer;
-                "
-            /></div>
-            <div style="width: 200px">
-              <el-icon size="28px" @click="addChange" style="cursor: pointer"
-                ><CirclePlus /></el-icon
-            ></div>
-          </div>
-        </el-form-item> -->
         <el-form-item label="所在省市" prop="regionCode" required>
           <el-select v-model="ruleForm.regionCode" placeholder="请选择省市" style="width: 200px">
             <el-option
@@ -97,9 +45,9 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-switch
-            v-model="ruleForm.addEnable"
-            :active-value="ENABLED.TRUE"
-            :inactive-value="ENABLED.FALSE"
+            v-model="ruleForm.isDisabled"
+            :active-value="IS_DISABLED.FALSE"
+            :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
         </el-form-item>
@@ -127,9 +75,9 @@
         </el-form-item>
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
-        <el-button v-if="!props.comEdit" @click="resetDrawCom">重置</el-button>
-        <el-button type="primary" v-if="!props.comEdit" @click="newCompanyAdd"> 提交 </el-button>
-        <el-button type="primary" v-if="props.comEdit" @click="editedSub(ruleFormRef)">
+        <el-button v-if="!props.detail.id" @click="resetDrawCom">重置</el-button>
+        <el-button type="primary" v-if="!props.detail.id" @click="newCompanyAdd"> 提交 </el-button>
+        <el-button type="primary" v-if="props.detail.id" @click="editedSub(ruleFormRef)">
           提交
         </el-button>
       </div>
@@ -144,14 +92,14 @@
   import { computed, reactive, ref, defineProps, defineEmits, watch, onMounted } from 'vue';
 
   import {
-    addCompanyModuleLabel,
-    editCompanyModuleLabel,
+    // addCompanyModuleLabel,
+    // editCompanyModuleLabel,
     addCompany,
     editCompany,
   } from '@/api/scene/scene.ts';
-  import { SceneLabelType, TemplateType } from '@/types/scene/type.ts';
+  // import { SceneLabelType, TemplateType } from '@/types/scene/type.ts';
 
-  import { ENABLED } from '@/types/scene/constant.ts';
+  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import type { FormInstance, FormRules } from 'element-plus';
   import { ElMessage } from 'element-plus';
   // import { CirclePlus } from '@element-plus/icons-vue';
@@ -163,27 +111,16 @@
   import urlJoin from 'url-join';
   import { useGlobSetting } from '@/hooks/setting';
 
-  interface SelectItemType {
-    tag: string;
-    template: string;
-  }
-
   const props = defineProps<{
-    sceneList: SceneLabelType[];
-    templateList: TemplateType[];
-    // allCodes: string[];
-    comEdit: boolean;
     detail: {
-      id?: number;
+      id?: number; //传不传id代表着是不是编辑
       name?: string;
-      code?: string;
-      seniorScene?: string;
-      addEnable?: ENABLED;
-      selectItems?: SelectItemType[];
+      // orderNum?: number;
+      isDisabled?: IS_DISABLED;
       remark?: string;
       longitude?: number; //经度
       latitude?: number; //纬度
-      regionCode?: string;
+      regionCode?: string; //省市代码
       thumbnail?: string;
     };
   }>();
@@ -191,7 +128,7 @@
   const { urlPrefix } = useGlobSetting();
 
   const actionUrl = computed(() => {
-    return urlJoin(urlPrefix!, `/issue/uploadPicture`);
+    return urlJoin(urlPrefix!, `/admin/minio/uploadFile`);
   });
 
   const uploadRef = ref();
@@ -201,8 +138,6 @@
   const fileList = ref<UploadFile[]>([]);
 
   onMounted(() => {
-    console.log('props.detail', props.detail.thumbnail);
-
     if (props.detail.thumbnail) {
       fileList.value.push({
         name: '公司头像',
@@ -236,7 +171,7 @@
   };
 
   const title = computed(() => {
-    if (props.comEdit) {
+    if (props.detail.id) {
       return '编辑公司';
     }
     return '添加公司';
@@ -253,72 +188,39 @@
 
   interface RuleForm {
     name: string; //名称
-    seniorScene: string; //上级场景
-    code: string; //代码
-    sceneCode: string; //场景代码
-    tagCom?: string[]; //公司场景标签 可选多个
-    templateCom?: string[]; //公司场景模板 可选多个
-    tagWorkshop?: number; //场景标签  车间
-    templateWorkshop?: number; //车间模板
-    selectItems?: SelectItemType[];
-    addEnable?: ENABLED;
-    remark?: string; //备注，可用于添加经纬度，非必要
+    isDisabled?: IS_DISABLED; //状态
+    remark?: string; //备注
     longitude?: number; //经度
     latitude?: number; //纬度
-    regionCode?: string;
-    /** 公司缩略图 */
-    thumbnail?: string;
+    regionCode?: string; //省市代码
+    thumbnail?: string; //公司缩略图
   }
 
   const ruleForm = reactive<RuleForm>({
     name: '',
-    seniorScene: '顶级场景',
-    code: '',
-    sceneCode: '',
-    tagCom: [],
-    templateCom: [],
-    tagWorkshop: undefined,
-    templateWorkshop: undefined,
-    selectItems: [{ tag: '', template: '' }],
-    addEnable: ENABLED.TRUE,
+    isDisabled: IS_DISABLED.TRUE,
     remark: '',
     longitude: undefined, //经度
     latitude: undefined, //纬度
     regionCode: '',
+    thumbnail: '',
   });
   const rules = reactive<FormRules>({
     name: [
       { required: true, message: '公司名称不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: '长度在1-100之间', trigger: 'blur' },
+      { min: 1, max: 100, message: '字符长度在1-100之间', trigger: 'blur' },
     ],
-
-    code: [
-      { required: true, message: '公司代码不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: '长度在1-100之间', trigger: 'blur' },
-    ],
-
     regionCode: [{ required: true, message: '省市不能为空', trigger: 'blur' }],
   });
 
   const { data: provinceList } = useRequest(getProvinceList);
 
-  //增加空的场景&模板
-  // const addChange = () => {
-  //   ruleForm.selectItems!.push({
-  //     tag: '',
-  //     template: '',
-  //   });
-  // };
-
   //编辑时需要传入子组件的数据
   watch(
     () => props.detail,
     (data) => {
       ruleForm.name = data.name!;
-      ruleForm.code = data.code!;
-      ruleForm.seniorScene = data.seniorScene!;
-      ruleForm.addEnable = data.addEnable;
-      ruleForm.selectItems = data.selectItems;
+      ruleForm.isDisabled = data.isDisabled;
       ruleForm.remark = data.remark;
       ruleForm.latitude = data.latitude;
       ruleForm.longitude = data.longitude;
@@ -328,26 +230,6 @@
     { immediate: true },
   );
 
-  //删除场景&模板
-  // const deleScene = (index) => {
-  //   if (ruleForm.selectItems!.length > 1) {
-  //     ElMessageBox.confirm('请确认是否关闭该场景？', '状态关闭', {
-  //       confirmButtonText: '确认',
-  //       cancelButtonText: '取消',
-  //       type: 'warning',
-  //     })
-  //       .then(() => {
-  //         ruleForm.selectItems!.splice(index, 1);
-  //       })
-  //       .catch(() => {
-  //         console.log('取消删除物件');
-  //       });
-  //   } else {
-  //     ElMessage.warning({
-  //       message: '无法删除',
-  //     });
-  //   }
-  // };
   //添加新公司的提交
   const newCompanyAdd = () => {
     if (!ruleFormRef.value) return;
@@ -356,39 +238,10 @@
         return;
       }
 
-      const selectTags = ruleForm.selectItems?.filter((item) => {
-        return item.tag && item.template;
-      });
-
-      if (!selectTags?.[0]) {
-        ElMessage({
-          message: '请选择标签和模板',
-          type: 'error',
-        });
-        return;
-      }
-
-      // if (props.allCodes.indexOf(ruleForm.code) > -1) {
-      //   ElMessageBox.confirm('场景代码重复，请重新填写', '代码重复', {
-      //     confirmButtonText: '确认',
-      //     cancelButtonText: '取消',
-      //     type: 'error',
-      //   })
-      //     .then(() => {
-      //       // ruleFormCom.code = '';
-      //       console.log('场景代码重复，请重新填写');
-      //     })
-      //     .catch(() => {
-      //       console.log('取消删除物件');
-      //     });
-      // } else {
       const newComData = {
         name: ruleForm.name,
-        code: ruleForm.code,
-        status: Number(ruleForm.addEnable),
-        isDeleted: 0,
-        parentId: 0,
-        serial: 0,
+        isDisabled: ruleForm.isDisabled,
+        // orderNum: props.detail.orderNum,
         remark: ruleForm.remark,
         longitude: ruleForm.longitude,
         latitude: ruleForm.latitude,
@@ -397,23 +250,8 @@
       };
       //提交数据并重置关闭el-draw
       addCompany(newComData)
-        .then((res) => {
-          //选出不为空字符串的数据
-          ruleForm.selectItems = ruleForm.selectItems!.filter((item) => {
-            return item.tag && item.template;
-          });
-          //将selectItems加工成保存公司-模板的数据类型
-          const newModuleLabel = ruleForm.selectItems!.map((item) => {
-            return {
-              companyId: res,
-              isDeleted: 0,
-              sceneLabelId: Number(item.tag), //item.tag
-              sceneModuleId: Number(item.template), ///item.template
-            };
-          });
-
-          //保存公司-场景标签-场景模板关系
-          return addCompanyModuleLabel(newModuleLabel);
+        .then(() => {
+          console.log('添加成功');
         })
         .catch((err) => {
           console.log(err);
@@ -421,7 +259,6 @@
         .finally(() => {
           emit('onOk');
         });
-      // }
     });
   };
 
@@ -433,32 +270,11 @@
         return;
       }
 
-      // if (props.allCodes.indexOf(ruleForm.code) > -1) {
-      //   if (props.detail.code !== ruleForm.code) {
-      //     ElMessageBox.confirm('场景代码重复，请重新填写', '代码重复', {
-      //       confirmButtonText: '确认',
-      //       cancelButtonText: '取消',
-      //       type: 'error',
-      //     })
-      //       .then(() => {
-      //         console.log('代码重复');
-      //       })
-      //       .catch(() => {
-      //         console.log('取消删除物件');
-      //       });
-      //     return;
-      //   }
-      // }
-
-      ruleForm.selectItems = ruleForm.selectItems!.filter((item) => {
-        return item.tag && item.template;
-      });
       //新增的数据
       const editNewCom = {
         id: props.detail.id,
         name: ruleForm.name,
-        code: ruleForm.code,
-        status: Number(ruleForm.addEnable),
+        isDisabled: ruleForm.isDisabled,
         remark: ruleForm.remark,
         longitude: ruleForm.longitude,
         latitude: ruleForm.latitude,
@@ -468,16 +284,7 @@
       // 编辑上传
       editCompany(editNewCom)
         .then(() => {
-          //保存公司-场景标签-场景模板关系
-          const editModuleLabel = ruleForm.selectItems!.map((item) => {
-            return {
-              companyId: props.detail.id,
-              isDeleted: 0,
-              sceneLabelId: Number(item.tag), //item.tag
-              sceneModuleId: Number(item.template), ///item.template
-            };
-          });
-          return editCompanyModuleLabel(editModuleLabel);
+          console.log('编辑成功');
         })
         .finally(() => {
           emit('onOk');
@@ -488,10 +295,11 @@
   //重置编辑框
   const resetDrawCom = () => {
     ruleForm.name = '';
-    ruleForm.code = '';
-    ruleForm.addEnable = ENABLED.TRUE;
-    ruleForm.selectItems = [{ tag: '', template: '' }];
+    ruleForm.isDisabled = IS_DISABLED.TRUE;
     ruleForm.regionCode = '';
+    ruleForm.latitude = undefined;
+    ruleForm.longitude = undefined;
+    ruleForm.thumbnail = '';
   };
 </script>
 

src/views/system-config/scene-manage/components/WorkshopDrawer-shangfei.vue

@@ -72,8 +72,8 @@
         <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.addEnable"
-            :active-value="ENABLED.TRUE"
-            :inactive-value="ENABLED.FALSE"
+            :active-value="IS_DISABLED.TRUE"
+            :inactive-value="IS_DISABLED.FALSE"
             class="switchUse"
           />
         </el-form-item>
@@ -93,7 +93,7 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from '@/types/scene/constant.ts';
+  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import {
     addWorkshop,
@@ -130,7 +130,7 @@
       seniorScene?: string;
       tagWorkshop?: number;
       templateWorkshop?: number;
-      addEnable?: ENABLED;
+      addEnable?: IS_DISABLED;
       tagList?: LabelModuleListType[];
       companyId?: number;
     };
@@ -158,7 +158,7 @@
     code: string; //代码
     tagWorkshop?: number | null; //场景标签  车间
     templateWorkshop?: number | null; //车间模板
-    addEnable?: ENABLED; //状态
+    addEnable?: IS_DISABLED; //状态
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
@@ -166,7 +166,7 @@
     code: '',
     tagWorkshop: null,
     templateWorkshop: null,
-    addEnable: ENABLED.TRUE,
+    addEnable: IS_DISABLED.TRUE,
     // principal: '',
   });
   const rules = reactive<FormRules>({
@@ -303,7 +303,7 @@
   const resetDraw = () => {
     ruleForm.name = '';
     // ruleForm.code = '';
-    ruleForm.addEnable = ENABLED.TRUE;
+    ruleForm.addEnable = IS_DISABLED.TRUE;
     ruleForm.templateWorkshop = null;
     ruleForm.tagWorkshop = null;
   };

src/views/system-config/scene-manage/components/WorkshopDrawer.vue

@@ -22,58 +22,24 @@
         <el-form-item label="车间名称" prop="name">
           <el-input v-model="ruleForm.name" />
         </el-form-item>
-        <el-form-item label="上级场景" prop="seniorScene">
+        <el-form-item label="所属公司" prop="seniorScene">
           <el-input v-model="ruleForm.seniorScene" disabled />
         </el-form-item>
-        <el-form-item label="车间代码" prop="code">
-          <el-input v-model="ruleForm.code" />
-        </el-form-item>
-        <el-form-item label="场景标签" prop="tagWorkshop">
-          <el-radio-group
-            v-model="ruleForm.tagWorkshop"
-            size="10px"
-            style="display: flex; justify-content: space-between"
-          >
-            <el-radio-button
-              v-for="item in props.detail.tagList"
-              :key="item.id"
-              :label="item.id!"
-              class="tag-select"
-              style="margin-right: 10px"
-              >{{ item.name }}</el-radio-button
-            >
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="车间模板" prop="templateWorkshop">
-          <el-radio-group
-            v-model="ruleForm.templateWorkshop"
-            size="10px"
-            style="display: flex; justify-content: space-between"
-          >
-            <el-radio-button
-              v-for="item in props.workshopTemplateList"
-              :key="item.id"
-              :label="item.id!"
-              class="tag-select"
-              >{{ item.name }}</el-radio-button
-            >
-          </el-radio-group>
-        </el-form-item>
         <el-form-item label="状态">
           <el-switch
-            v-model="ruleForm.addEnable"
-            :active-value="ENABLED.TRUE"
-            :inactive-value="ENABLED.FALSE"
+            v-model="ruleForm.isDisabled"
+            :active-value="IS_DISABLED.FALSE"
+            :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
         </el-form-item>
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
-        <el-button v-if="!props.detail.companyId" @click="resetDraw">重置</el-button>
-        <el-button v-if="!props.detail.companyId" type="primary" @click="addNewType(ruleFormRef)">
+        <el-button v-if="!props.detail.id" @click="resetDraw">重置</el-button>
+        <el-button v-if="!props.detail.id" type="primary" @click="addNewType(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="props.detail.companyId" type="primary" @click="editedSub(ruleFormRef)">
+        <el-button v-if="props.detail.id" type="primary" @click="editedSub(ruleFormRef)">
           提交
         </el-button>
       </div>
@@ -83,29 +49,18 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from '@/types/scene/constant.ts';
+  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
-  import {
-    addWorkshopModuleLabel,
-    editWorkshopModuleLabel,
-    addWorkshop,
-    editWorkshop,
-  } from '@/api/scene/scene.ts';
-  import { LabelModuleListType, WorkshopModuleType } from '@/types/scene/type.ts';
+  import { addWorkshop, editWorkshop } from '@/api/scene/scene.ts';
 
   const props = defineProps<{
-    // allCodes: string[];
-    workshopTemplateList: WorkshopModuleType[];
     detail: {
       id?: number;
       name?: string;
-      code?: string;
       seniorScene?: string;
-      tagWorkshop?: number;
-      templateWorkshop?: number;
-      addEnable?: ENABLED;
-      tagList?: LabelModuleListType[];
+      isDisabled?: IS_DISABLED;
       companyId?: number;
+      // orderNum?: number;
     };
   }>();
 
@@ -128,35 +83,22 @@
   interface RuleForm {
     name: string; //名称
     seniorScene: string; //上级场景
-    code: string; //代码
-    tagWorkshop?: number | null; //场景标签  车间
-    templateWorkshop?: number | null; //车间模板
-    addEnable?: ENABLED; //状态
+    isDisabled?: IS_DISABLED; //状态
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     seniorScene: '',
-    code: '',
-    tagWorkshop: null,
-    templateWorkshop: null,
-    addEnable: ENABLED.TRUE,
-    // principal: '',
+    isDisabled: IS_DISABLED.TRUE,
   });
   const rules = reactive<FormRules>({
     name: [
       { required: true, message: '车间名称不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 3 to 5', trigger: 'blur' },
+      { min: 1, max: 100, message: '最大输入不超过100字', trigger: 'blur' },
     ],
     seniorScene: [
       { required: true, message: '', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
-    ],
-    code: [
-      { required: true, message: '车间代码不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+      { min: 1, max: 100, message: '最大输入不超过100字', trigger: 'blur' },
     ],
-    tagWorkshop: [{ required: true, message: '请选择场景标签', trigger: 'blur' }],
-    templateWorkshop: [{ required: true, message: '请选择车间模板', trigger: 'blur' }],
   });
 
   //编辑时需要传入子组件的数据
@@ -165,10 +107,7 @@
     (data) => {
       ruleForm.name = data.name!;
       ruleForm.seniorScene = data.seniorScene!;
-      ruleForm.code = data.code!;
-      ruleForm.tagWorkshop = data.tagWorkshop;
-      ruleForm.templateWorkshop = data.templateWorkshop;
-      ruleForm.addEnable = data.addEnable;
+      ruleForm.isDisabled = data.isDisabled;
     },
     { immediate: true },
   );
@@ -181,36 +120,15 @@
         return;
       }
       const newAddData = {
-        code: ruleForm.code,
-        companyId: props.detail.id,
-        sceneLabelId: ruleForm.tagWorkshop!,
-        isDeleted: 0,
         name: ruleForm.name,
-        status: Number(ruleForm.addEnable),
-        serial: 0,
+        status: Number(ruleForm.isDisabled),
+        companyId: props.detail.companyId,
+        // orderNum: props.detail.orderNum,
       };
 
-      // if (props.allCodes.includes(ruleForm.code)) {
-      //   ElMessageBox.confirm('场景代码重复，请重新填写', '代码重复', {
-      //     confirmButtonText: '确认',
-      //     cancelButtonText: '取消',
-      //     type: 'error',
-      //   })
-      //     .then(() => {
-      //       console.log('场景代码重复，请重新填写');
-      //     })
-      //     .catch(() => {
-      //       console.log('取消删除物件');
-      //     });
-      // } else {
       addWorkshop(newAddData)
-        .then((res) => {
-          const newWorkshopModule = {
-            workshopId: res,
-            isDeleted: 0,
-            workshopModuleId: ruleForm.templateWorkshop!,
-          };
-          return addWorkshopModuleLabel(newWorkshopModule);
+        .then(() => {
+          console.log('成功添加车间');
         })
         .catch((err) => {
           console.log(err);
@@ -218,7 +136,6 @@
         .finally(() => {
           emit('onOk');
         });
-      // }
     });
   };
 
@@ -229,39 +146,15 @@
       if (!valid) {
         return;
       }
-      // if (props.allCodes.includes(ruleForm.code)) {
-      //   if (props.detail.code !== ruleForm.code) {
-      //     ElMessageBox.confirm('场景代码重复，请重新填写', '代码重复', {
-      //       confirmButtonText: '确认',
-      //       cancelButtonText: '取消',
-      //       type: 'error',
-      //     })
-      //       .then(() => {
-      //         console.log('代码重复');
-      //       })
-      //       .catch(() => {
-      //         console.log('取消删除物件');
-      //       });
-      //     return;
-      //   }
-      // }
-
       const editNewWorkshopData = {
-        code: ruleForm.code,
-        sceneLabelId: ruleForm.tagWorkshop!,
-        name: ruleForm.name,
-        status: Number(ruleForm.addEnable),
         id: props.detail.id,
+        name: ruleForm.name,
+        isDisabled: ruleForm.isDisabled,
       };
 
       editWorkshop(editNewWorkshopData)
         .then(() => {
-          const editWorkshopModule = {
-            isDeleted: 0,
-            workshopId: props.detail.id,
-            workshopModuleId: ruleForm.templateWorkshop!,
-          };
-          return editWorkshopModuleLabel(editWorkshopModule);
+          console.log('成功修改车间');
         })
         .catch((err) => {
           console.log(err);
@@ -275,10 +168,7 @@
   //重置编辑框
   const resetDraw = () => {
     ruleForm.name = '';
-    ruleForm.code = '';
-    ruleForm.addEnable = ENABLED.TRUE;
-    ruleForm.templateWorkshop = null;
-    ruleForm.tagWorkshop = null;
+    ruleForm.isDisabled = IS_DISABLED.FALSE;
   };
 </script>
 

src/views/system-config/scene-manage/components/WorkspaceDrawer-shangfei.vue

@@ -44,8 +44,8 @@
         <el-form-item label="状态">
           <el-switch
             v-model="ruleForm.addEnable"
-            :active-value="ENABLED.TRUE"
-            :inactive-value="ENABLED.FALSE"
+            :active-value="IS_DISABLED.TRUE"
+            :inactive-value="IS_DISABLED.FALSE"
             class="switchUse"
           />
         </el-form-item>
@@ -65,7 +65,7 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from '@/types/scene/constant.ts';
+  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import { addWorkspace, editWorkspace } from '@/api/scene/scene.ts';
   import { getWorkSpaceInfoList } from '@/api/workShopData';
@@ -78,7 +78,7 @@
       code?: string;
       seniorScene?: string;
       principal?: string;
-      addEnable?: ENABLED;
+      addEnable?: IS_DISABLED;
       workshopCode?: string;
     };
   }>();
@@ -121,14 +121,14 @@
     seniorScene: string; //上级场景
     code: string; //代码
     principal?: string; //负责人
-    addEnable?: ENABLED;
+    addEnable?: IS_DISABLED;
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     seniorScene: '',
     code: '',
     principal: '',
-    addEnable: ENABLED.TRUE,
+    addEnable: IS_DISABLED.TRUE,
   });
   const rules = reactive<FormRules>({
     name: [
@@ -256,7 +256,7 @@
   const resetDraw = () => {
     ruleForm.name = '';
     // ruleForm.code = '';
-    ruleForm.addEnable = ENABLED.TRUE;
+    ruleForm.addEnable = IS_DISABLED.TRUE;
     ruleForm.principal = '';
   };
 </script>

src/views/system-config/scene-manage/components/WorkspaceDrawer.vue

@@ -17,35 +17,32 @@
         label-width="120px"
         class="demo-ruleForm"
         size="default"
-        status-icon
+        isDisabled-icon
       >
         <el-form-item label="工位名称" prop="name">
           <el-input v-model="ruleForm.name" />
         </el-form-item>
-        <el-form-item label="上级场景" prop="seniorScene">
+        <el-form-item label="所属车间" prop="seniorScene">
           <el-input v-model="ruleForm.seniorScene" disabled />
         </el-form-item>
-        <el-form-item label="工位代码" prop="code">
-          <el-input v-model="ruleForm.code" />
-        </el-form-item>
         <el-form-item label="负责人" prop="principal">
           <el-input v-model="ruleForm.principal" />
         </el-form-item>
         <el-form-item label="状态">
           <el-switch
-            v-model="ruleForm.addEnable"
-            :active-value="ENABLED.TRUE"
-            :inactive-value="ENABLED.FALSE"
+            v-model="ruleForm.isDisabled"
+            :active-value="IS_DISABLED.FALSE"
+            :inactive-value="IS_DISABLED.TRUE"
             class="switchUse"
           />
         </el-form-item>
       </el-form>
       <div style="position: absolute; left: 108px; bottom: 67px">
-        <el-button v-if="!props.detail.principal" @click="resetDraw">重置</el-button>
-        <el-button v-if="!props.detail.principal" type="primary" @click="addNewType(ruleFormRef)">
+        <el-button v-if="!props.detail.id" @click="resetDraw">重置</el-button>
+        <el-button v-if="!props.detail.id" type="primary" @click="addNewType(ruleFormRef)">
           提交
         </el-button>
-        <el-button v-if="props.detail.principal" type="primary" @click="editedSub(ruleFormRef)">
+        <el-button v-if="props.detail.id" type="primary" @click="editedSub(ruleFormRef)">
           提交
         </el-button>
       </div>
@@ -55,7 +52,7 @@
 
 <script setup lang="ts">
   import { computed, reactive, ref, defineProps, defineEmits, watch } from 'vue';
-  import { ENABLED } from '@/types/scene/constant.ts';
+  import { IS_DISABLED } from '@/types/scene/constant.ts';
   import { type FormInstance, type FormRules } from 'element-plus';
   import { addWorkspace, editWorkspace } from '@/api/scene/scene.ts';
 
@@ -64,10 +61,11 @@
     detail: {
       id?: number;
       name?: string;
-      code?: string;
       seniorScene?: string;
       principal?: string;
-      addEnable?: ENABLED;
+      isDisabled?: IS_DISABLED;
+      workshopId?: number;
+      // orderNum?: number;
     };
   }>();
 
@@ -77,7 +75,7 @@
   }>();
 
   const title = computed(() => {
-    if (props.detail.principal) {
+    if (props.detail.id) {
       return '编辑工位';
     }
     return '添加工位';
@@ -88,34 +86,24 @@
 
   interface RuleForm {
     name: string; //名称
-    seniorScene: string; //上级场景
-    code: string; //代码
+    seniorScene: string; //所属车间
     principal?: string; //负责人
-    addEnable?: ENABLED;
+    isDisabled?: IS_DISABLED;
   }
   const ruleForm = reactive<RuleForm>({
     name: '',
     seniorScene: '',
-    code: '',
     principal: '',
-    addEnable: ENABLED.TRUE,
+    isDisabled: IS_DISABLED.FALSE,
   });
   const rules = reactive<FormRules>({
     name: [
       { required: true, message: '工位名称不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 3 to 5', trigger: 'blur' },
-    ],
-    seniorScene: [
-      { required: true, message: '', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
-    ],
-    code: [
-      { required: true, message: '工位代码不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+      { min: 1, max: 100, message: '最大输入不超过100字', trigger: 'blur' },
     ],
     principal: [
       { required: true, message: '负责人不能为空', trigger: 'blur' },
-      { min: 1, max: 100, message: 'Length should be 1 to 100', trigger: 'blur' },
+      { min: 1, max: 100, message: '最大输入不超过100字', trigger: 'blur' },
     ],
   });
 
@@ -124,9 +112,8 @@
     (data) => {
       ruleForm.name = data.name!;
       ruleForm.seniorScene = data.seniorScene!;
-      ruleForm.code = data.code!;
       ruleForm.principal = data.principal;
-      ruleForm.addEnable = data.addEnable;
+      ruleForm.isDisabled = data.isDisabled;
     },
     { immediate: true },
   );
@@ -139,31 +126,17 @@
       if (!valid) {
         return;
       }
-      // if (props.allCodes.indexOf(ruleForm.code) > -1) {
-      //   ElMessageBox.confirm('场景代码重复，请重新填写', '代码重复', {
-      //     confirmButtonText: '确认',
-      //     cancelButtonText: '取消',
-      //     type: 'error',
-      //   })
-      //     .then(() => {
-      //       console.log('场景代码重复，请重新填写');
-      //     })
-      //     .catch(() => {
-      //       console.log('取消删除物件');
-      //     });
-      // } else {
+
       const newAddData = {
-        code: ruleForm.code,
-        workshopId: props.detail.id,
-        isDeleted: 0,
         name: ruleForm.name,
-        principal: ruleForm.principal,
-        status: Number(ruleForm.addEnable),
-        serial: 0,
+        principalName: ruleForm.principal,
+        isDisabled: ruleForm.isDisabled,
+        workshopId: props.detail.workshopId,
+        // orderNum: props.detail.orderNum,
       };
       addWorkspace(newAddData)
-        .catch((err) => {
-          console.log(err);
+        .then(() => {
+          console.log('成功添加工位');
         })
         .catch((err) => {
           console.log(err);
@@ -171,7 +144,6 @@
         .finally(() => {
           emit('onOk');
         });
-      // }
     });
   };
 
@@ -183,35 +155,18 @@
       if (!valid) {
         return;
       }
-      // if (props.allCodes.indexOf(ruleForm.code) > -1) {
-      //   if (props.detail.code !== ruleForm.code) {
-      //     ElMessageBox.confirm('场景代码重复，请重新填写', '代码重复', {
-      //       confirmButtonText: '确认',
-      //       cancelButtonText: '取消',
-      //       type: 'error',
-      //     })
-      //       .then(() => {
-      //         console.log('代码重复');
-      //       })
-      //       .catch(() => {
-      //         console.log('取消删除物件');
-      //       });
-      //     return;
-      //   }
-      // }
 
       const editNewWorkspaceData = {
-        code: ruleForm.code,
-        name: ruleForm.name,
-        status: Number(ruleForm.addEnable),
         id: props.detail.id,
-        principal: ruleForm.principal,
+        name: ruleForm.name,
+        isDisabled: Number(ruleForm.isDisabled),
+        principalName: ruleForm.principal,
       };
 
       //编辑车间并上传
       editWorkspace(editNewWorkspaceData)
-        .catch((err) => {
-          console.log(err);
+        .then(() => {
+          console.log('成功编辑工位');
         })
         .catch((err) => {
           console.log(err);
@@ -225,8 +180,7 @@
   //重置编辑框
   const resetDraw = () => {
     ruleForm.name = '';
-    ruleForm.code = '';
-    ruleForm.addEnable = ENABLED.TRUE;
+    ruleForm.isDisabled = IS_DISABLED.FALSE;
     ruleForm.principal = '';
   };
 </script>