改动

zss

2023-11-16 f3e8b1999c8e6142764def9d5b5427abb843e922

 src/views/plan/manufacturingorder/index.vue

@@ -65,7 +65,7 @@
              >
            </el-dropdown-menu>
          </el-dropdown>
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_orderto_ifs"
            @click="commitOrderIfs()"
            type="primary"
@@ -88,15 +88,15 @@
            style="margin-left:10px;"
            :loading="loadingStructIfs"
            >物料同步ERP
          </el-button>
          <el-button
          </el-button> -->
          <!-- <el-button
            v-if="permissions.manufacturingorder_refresh_ifsorder"
            @click="refreshIfsorder()"
            type="primary"
            style="margin-left:10px;"
            :loading="refreshIfsorderLoading"
            >刷新ifs车间订单号
          </el-button>
          </el-button> -->

          <el-button
            @click="exportExcel"
@@ -105,12 +105,12 @@
            :loading="loadingExcel"
            >导出
          </el-button>
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_update_orderno"
            @click="updateOrderNo"
            type="primary"
            style="margin-left:10px;"
            >更新订单号
            >更新订单号 -->
          </el-button>
        </template>
      </ttable>
@@ -324,7 +324,7 @@
            sort: true,
            isTrue: true,
            formatter: this.formatState,
            propVal: '01planned',
            propVal: '',
            isSearch: true,
            searchInfoType: 'select',
            optList: () => {
@@ -934,12 +934,12 @@
        fun: this.getOperationTaskByCustomer
      })
    }
    if (this.permissions.manufacturingorder_order_merge) {
      this.table.toolbar.push({
        text: '订单合并',
        fun: this.openOrderMerge
      })
    }
    // if (this.permissions.manufacturingorder_order_merge) {
    //   this.table.toolbar.push({
    //     text: '订单合并',
    //     fun: this.openOrderMerge
    //   })
    // }

    /**
     * {