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

王震

2023-11-30 0f0d62f85d0e44c03161ef6d3043a4d70fe553dd

 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,
@@ -823,14 +823,7 @@
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '查看库存',
            type: 'text',
            size: 'small',
            fun: this.searchStock
          }
        ],
        operator: null,
        operatorConfig: {
          fixed: 'right',
          label: '操作',
@@ -934,12 +927,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
    //   })
    // }

    /**
     * {
@@ -1130,6 +1123,7 @@
                getByMoIds([this.orderPlan.id]).then((repsonse) => {
                  const resData = repsonse.data.data
                  const resCode = repsonse.data.code
                  console.log("resData-----",repsonse);
                  if (resCode === 0) {
                    const _that = this
                    for (const key in resData) {
@@ -1658,3 +1652,8 @@
  }
}
</script>
<style lang="scss">
.gantt-info {
  display: none !important;
}
</style>