优化

src/views/material/product/components/CategoryDialog.vue

@@ -89,15 +89,18 @@ export default {
       this.pathList.unshift(this.current)
       const PathInfo = {
         categoryLevelPath: '',
-        categoryLevelPathId: []
+        categoryLevelPathId: [],
+        rootCategoryLevelId: null
       }
       const pathName = []
       this.pathList.map(item => {
         pathName.unshift(item.name)
         PathInfo.categoryLevelPathId.unshift(item.id)
+        PathInfo.rootCategoryLevelId = item.rootCategoryLevelId
       })
       PathInfo.categoryLevelPath = pathName.join('-')
       PathInfo.categoryLevelPathId = PathInfo.categoryLevelPathId.join(',')
+
       console.log(PathInfo)
       this.$emit('chooseCategory', this.current, this.title, PathInfo, ruleCode)
       this.handleClose()

src/views/material/product/detail.vue

@@ -95,7 +95,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="8" v-if="categoryLevelPathId == 1">
             <el-form-item label="是否消耗材" prop="isConsumable">
               <el-select v-model="form.isConsumable" size="small" style="width: 100%">
                 <el-option :value="1" label="是"></el-option>
@@ -222,6 +222,8 @@ export default {
       categoryWms: {
         isUnpack: 1
       },
+
+      categoryLevelPathId: null,
       // 表单验证规则
       rules: {
         categoryLevelGroupName: [
@@ -323,6 +325,7 @@ export default {
     // 确定分类
     async confirmCategory(node, title, PathInfo, ruleCode) {
       this.$set(this.form, 'code', null);
+      this.categoryLevelPathId = PathInfo.categoryLevelPathId
 
       if (title == '选择产品分类') {
         this.$set(this.form, 'productCategoryLevelName', node.name);

src/views/workforceManagement/schedule/detail.vue

@@ -177,7 +177,7 @@ export default {
         for (const [key, value] of Object.entries(n)) {
           if (key !== 'item') {
             teamQueueTime.push({
-              date: key,
+              date: key != 'null' ? key : null ,
               teamTimeSimple: value.map((el) => {
                 return {
                   id: el.id
@@ -295,6 +295,7 @@ export default {
         let teamQueueTime = [];
         for (const [key, value] of Object.entries(n)) {
           if (key !== 'item') {
+          
             teamQueueTime.push({
               date: key,
               teamTimeSimple: value.map((el) => {