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

王震

2023-11-18 c0af07698f215595362a06aec56186dc894a895b

 src/views/plan/manufacturingorder/index.vue

@@ -48,7 +48,7 @@
            </el-dropdown-menu>
          </el-dropdown>

          <el-dropdown
          <!-- <el-dropdown
            v-if="permissions.manufacturingorder_issue_material"
            @command="issueMaterialHandleCommand"
            style="margin-left:10px;"
@@ -64,7 +64,7 @@
                >{{ item.label }}</el-dropdown-item
              >
            </el-dropdown-menu>
          </el-dropdown>
          </el-dropdown> -->
          <!-- <el-button
            v-if="permissions.manufacturingorder_orderto_ifs"
            @click="commitOrderIfs()"
@@ -89,14 +89,14 @@
            :loading="loadingStructIfs"
            >物料同步ERP
          </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,13 +105,13 @@
            :loading="loadingExcel"
            >导出
          </el-button>
          <el-button
          <!-- <el-button
            v-if="permissions.manufacturingorder_update_orderno"
            @click="updateOrderNo"
            type="primary"
            style="margin-left:10px;"
            >更新订单号
          </el-button>
            >更新订单号 
          </el-button>-->
        </template>
      </ttable>
      <customerorder
@@ -324,7 +324,7 @@
            sort: true,
            isTrue: true,
            formatter: this.formatState,
            propVal: '01planned',
            propVal: '',
            isSearch: true,
            searchInfoType: 'select',
            optList: () => {
@@ -428,8 +428,8 @@
          },
          {
            minWidth: '120',
            prop: 'orderRemark',
            label: '销售订单备注',
            prop: 'remark',
            label: '备注',
            sort: true,
            isTrue: true,
            isSearch: true,
@@ -824,12 +824,12 @@
        ],
        toolbar: [],
        operator: [
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.searchStock
          }
          // {
          //   text: '查看库存',
          //   type: 'text',
          //   size: 'small',
          //   fun: this.searchStock
          // }
        ],
        operatorConfig: {
          fixed: 'right',
@@ -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
    //   })
    // }

    /**
     * {
@@ -1658,3 +1658,8 @@
  }
}
</script>
<style lang="scss">
.gantt-info {
  display: none !important;
}
</style>