Merge remote-tracking branch 'origin/master'

zss

2023-11-17 2518e47a3ac999978fbf14612c967c3bbf421d25

 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"
@@ -36,15 +37,24 @@
          >
            合并工单
          </el-button>
          <el-button style="margin-left:10px" @click="openTaskOrder">
            优先级
          </el-button>
          <el-button
          type="primary"
            v-if="permissions.operationtask_pallet_transport"
            style="margin-left:10px"
            @click="openTaskMaterial"
          >
            货盘运输
            打印模具领用清单
          </el-button>
          <el-button style="margin-left:10px" @click="openTaskOrder">
            优先级
          <el-button
          type="primary"
            v-if="permissions.operationtask_pallet_transport"
            style="margin-left:10px"
            @click="openTaskMaterial"
          >
            打印物料领用清单
          </el-button>
        </template>
      </ttable>
@@ -379,24 +389,24 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'discNum',
            label: '盘数',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'reelSpec',
            label: '载具规格',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // {
          //   minWidth: '120',
          //   prop: 'discNum',
          //   label: '盘数',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'reelSpec',
          //   label: '载具规格',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          {
            width: '130',
            prop: 'ratio',