Merge remote-tracking branch 'origin/master'

zss

2023-11-17 2518e47a3ac999978fbf14612c967c3bbf421d25

 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"
@@ -53,19 +55,19 @@
            @command="issueMaterialHandleCommand"
            style="margin-left:10px;"
          >
            <el-button>
            <!-- <el-button>
              发料<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
            <el-dropdown-menu slot="dropdown">
            </el-button> -->
            <!-- <el-dropdown-menu slot="dropdown">
              <el-dropdown-item
                :command="item.command"
                v-for="item in issueMaterialArr"
                :disabled="item.disabled"
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu>
            </el-dropdown-menu> -->
          </el-dropdown>
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_orderto_ifs"
            @click="commitOrderIfs()"
            type="primary"
@@ -88,7 +90,7 @@
            style="margin-left:10px;"
            :loading="loadingStructIfs"
            >物料同步ERP
          </el-button>
          </el-button> -->
          <el-button
            v-if="permissions.manufacturingorder_refresh_ifsorder"
            @click="refreshIfsorder()"
@@ -230,7 +232,7 @@
      taskTypeArr: [],
      stateTagArr: [
        {
          label: '已计划',
          label: '待下达',
          command: 'PLAN',
          disabled: false,
          permitArr: ['03completed', '04canceled']
@@ -269,7 +271,7 @@
        }
      ],
      states: [
        { value: '01planned', label: '已计划' },
        { value: '01planned', label: '待下达' },
        { value: '02issued', label: '已下达' },
        {
          value: '03completed',
@@ -408,24 +410,24 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'printRequirement',
            label: '印字要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'lengthRequirement',
            label: '盘长要求',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'printRequirement',
          //   label: '印字要求',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'lengthRequirement',
          //   label: '盘长要求',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            minWidth: '120',
            prop: 'orderRemark',