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

Fixiaobai

2023-11-16 4bf457a5c8433c9ec6f0ec86b2c1c20c5e667391

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

 src/views/basic/log/index.vue

@@ -35,6 +35,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in documentTagArr"
                :disabled="item.disabled"

 src/views/plan/manufacturingorder/index.vue

@@ -22,6 +22,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in taskTypeArr"
                :disabled="canCreateTask"
@@ -40,6 +41,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in stateTagArr"
                :disabled="item.disabled"

 src/views/plan/masterproductionschedule/index.vue

@@ -9,7 +9,7 @@
              车间订单<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in orderTypeArr" :disabled="item.disabled">{{
              <el-dropdown-item :key="item" :command="item.command" v-for="item in orderTypeArr" :disabled="item.disabled">{{
                item.label }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
@@ -20,7 +20,7 @@
              状态改变<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in stateTagArr" :disabled="item.disabled">{{
              <el-dropdown-item :key="item" :command="item.command" v-for="item in stateTagArr" :disabled="item.disabled">{{
                item.label }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
@@ -31,7 +31,7 @@
              工艺文件<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in documentTagArr" :disabled="item.disabled">
              <el-dropdown-item :key="item" :command="item.command" v-for="item in documentTagArr" :disabled="item.disabled">
                {{ item.label }}
              </el-dropdown-item>
            </el-dropdown-menu>
@@ -43,7 +43,7 @@
              审核状态改变<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item :command="item.command" v-for="item in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
              <el-dropdown-item :key="item" :command="item.command" v-for="item in commitStateTagArr" :disabled="item.disabled">{{item.label }}</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
          <el-button v-if="permissions.masterproductionschedule_submit_oa" @click="commitOa()" type="primary"

 src/views/plan/mpsrequirements/index.vue

@@ -18,6 +18,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in stateTagArr"
                :disabled="item.disabled"

 src/views/plan/operationtask/index.vue

@@ -21,6 +21,7 @@
            </el-button>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :key="item"
                :command="item.command"
                v-for="item in stateTagArr"
                :disabled="item.disabled"

 src/views/plan/outsourcingorder/index.vue

@@ -21,9 +21,9 @@
                  <template v-for="item in stateTagArr">
                    <el-dropdown-item
                      :command="item.command"
                      :disabled="item.disabled"
                      >{{ item.eventName }}</el-dropdown-item
                    >
                      :disabled="item.disabled">
                      {{ item.eventName }}
                    </el-dropdown-item>
                  </template>
                </el-dropdown-menu>
              </el-dropdown>
@@ -33,7 +33,7 @@
                </el-button>
                <el-dropdown-menu slot="dropdown">
                  <template v-for="item in oaStateTagArr">
                    <el-dropdown-item :command="item.command" v-if="item.isShow"
                    <el-dropdown-item :key="item" :command="item.command" v-if="item.isShow"
                      >{{ item.eventName }}
                    </el-dropdown-item>
                  </template>

 src/views/quality/report/index.vue

@@ -81,10 +81,11 @@
                      </el-button>
                      <el-dropdown-menu slot="dropdown">
                        <el-dropdown-item
                          :key="item"
                          :command="item.ref"
                          v-for="item in toolbarIsQualified"
                          :disabled="item.disabled"
                          v-if="item.isShow"
                          v-show="item.isShow"
                          >{{ item.text }}
                        </el-dropdown-item>
                      </el-dropdown-menu>