Merge branch 'master' of http://114.132.189.42:9002/r/zs-mes-before

zouyu

2023-11-17 1cf81a64af5bac57f2af8c419db0b22b3d5ba7c8

 src/views/plan/manufacturingorder/index.vue

@@ -22,9 +22,9 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :key="index"
                :command="item.command"
                v-for="item in taskTypeArr"
                v-for="(item,index) in taskTypeArr"
                :disabled="canCreateTask"
                >{{ item.label }}</el-dropdown-item
              >
@@ -41,20 +41,20 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :key="index"
                :command="item.command"
                v-for="item in stateTagArr"
                v-for="(item,index) in stateTagArr"
                :disabled="item.disabled"
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu>
          </el-dropdown>

          <el-dropdown
          <!-- <el-dropdown
            v-if="permissions.manufacturingorder_issue_material"
            @command="issueMaterialHandleCommand"
            style="margin-left:10px;"
          >
          > -->
            <!-- <el-button>
              发料<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button> -->
@@ -66,7 +66,7 @@
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu> -->
          </el-dropdown>
          <!-- </el-dropdown> -->
          <!-- <el-button
            v-if="permissions.manufacturingorder_orderto_ifs"
            @click="commitOrderIfs()"