优化

src/views/classifyManage/treeClassify/components/list-edit.vue

@@ -206,9 +206,14 @@
             params.parentId =
               this.rootId == this.data?.id ? 0 : this.parentData.id;
             params.type = this.parentData.type;
+
           }
           if (this.data?.id) {
             params.id = this.data.id;
+           
+          }
+          if(!this.rootId || ( this.data &&  this.data.id ==  this.rootId)) {
+            params.parentId = 0
           }
 
           saveOrUpdate(params)

src/views/classifyManage/treeClassify/index.vue

@@ -4,7 +4,7 @@
       <!-- 条件区 -->
       <classify-manage-search @search="reload" />
       <ele-pro-table ref="table" :columns="columns" :datasource="datasource">
-        <!-- <template v-slot:toolbar>
+        <template v-slot:toolbar>
           <el-button
             size="small"
             type="primary"
@@ -14,16 +14,26 @@
           >
             新建
           </el-button>
-        </template> -->
+        </template> 
         <!-- 操作列 -->
         <template v-slot:action="{ row }">
+
           <el-link
             type="primary"
             :underline="false"
             icon="el-icon-edit"
+            @click="openAddDialog(row)"
+          >
+           编辑
+          </el-link>
+
+          <el-link
+            type="primary"
+            :underline="false"
+           
             @click="junmpEdit(row)"
           >
-            编辑
+           下级分类
           </el-link>
           <el-popconfirm
             class="ele-action"
@@ -68,7 +78,7 @@
           {
             columnKey: 'action',
             label: '操作',
-            width: 150,
+            width: 250,
             align: 'center',
             slot: 'action',
             fixed: 'right'
@@ -86,7 +96,8 @@
       };
     },
     methods: {
-      openAddDialog (editData = null) {
+      openAddDialog (editData) {
+        editData.type = editData.type + ''
         this.$refs.editRef.open(editData);
       },
       reload (params) {

src/views/technology/production/components/user-edit.vue

@@ -98,12 +98,7 @@
         <el-col :span="8">
           <el-form-item label="节拍时间单位:" prop="workBeat.beatTimesUnit">
             <el-select v-model="form.workBeat.beatTimesUnit">
-              <el-option
-                v-for="item in timeType"
-                :key="item.code"
-                :label="item.label"
-                :value="item.code"
-              >
+              <el-option v-for="item in timeType2" :key="item.code" :label="item.label" :value="item.code">
               </el-option>
             </el-select>
           </el-form-item>
@@ -114,31 +109,26 @@
       <header-title title="工序间隔时间"></header-title>
 
       <el-row>
-        
-          <el-col :span="12">
-            <el-form-item label="间隔策略:" label-width="200px">
-              <el-select v-model="form.intervalTime.tactics" filterable>
-                <el-option v-for="item in tacticsType" :key="item.code" :label="item.label" :value="item.code">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
+
+        <el-col :span="12">
+          <el-form-item label="间隔策略:" label-width="200px">
+            <el-select v-model="form.intervalTime.tactics" filterable>
+              <el-option v-for="item in tacticsType" :key="item.code" :label="item.label" :value="item.code">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
           <el-form-item label="间隔时间单位:" prop="timeUnit">
             <el-select v-model="form.timeUnit">
-              <el-option
-                v-for="item in timeType"
-                :key="item.code"
-                :label="item.label"
-                :value="item.code"
-              >
+              <el-option v-for="item in timeType" :key="item.code" :label="item.label" :value="item.code">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
-  
+
         <el-col :span="12">
           <el-form-item label="下工序标准准备时间:" label-width="200px">
             <el-input v-model="form.intervalTime.nextStandardPreTime" placeholder="请输入" />
@@ -240,9 +230,16 @@ export default {
       form: defaultForm(),
 
       timeType: [
-          { code: 1, label: '分' },
-          { code: 2, label: '时' }
-        ],
+        { code: 1, label: '分' },
+        { code: 2, label: '时' }
+      ],
+
+
+      timeType2: [
+        { code: '1', label: '分' },
+        { code: '2', label: '时' }
+      ],
+
 
       tacticsType: [
         { code: 1, label: '标准时间' },
@@ -265,7 +262,7 @@ export default {
           { required: true, message: '请选择时间单位', trigger: 'change' }
         ],
         timeUnit: [
-        { required: true, message: '请选择间隔时间单位', trigger: 'change' }
+          { required: true, message: '请选择间隔时间单位', trigger: 'change' }
         ]
       },
       // 提交状态
@@ -338,7 +335,6 @@ export default {
     async visible(visible) {
       if (visible) {
         if (this.data) {
-          console.log(111111);
           const res = await producetask.getById(this.data.id);
           this.$util.assignObject(this.form, {
             ...res