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

王震

2023-11-22 711f1644225a5ff10afa24dec8cafb1eb5343e6a

 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()"
@@ -110,8 +110,8 @@
            @click="updateOrderNo"
            type="primary"
            style="margin-left:10px;"
            >更新订单号 -->
          </el-button>
            >更新订单号
          </el-button>-->
        </template>
      </ttable>
      <customerorder
@@ -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: '操作',
@@ -1658,3 +1651,8 @@
  }
}
</script>
<style lang="scss">
.gantt-info {
  display: none !important;
}
</style>