Merge remote-tracking branch 'origin/dev' into dev

src/api/mes/pro/combination.js

+import request from '@/utils/request'
+
+// 查询生产组合单列表
+export function listCombination(query) {
+  return request({
+    url: '/pro/combination/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询生产组合单列表
+export function combList(query) {
+  return request({
+    url: '/pro/combination/combList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询生产组合单详细
+export function getCombination(combinationId) {
+  return request({
+    url: '/pro/combination/' + combinationId,
+    method: 'get'
+  })
+}
+
+// 新增生产组合单
+export function addCombination(data) {
+  return request({
+    url: '/pro/combination',
+    method: 'post',
+    data: data
+  })
+}
+
+// 新增生产组合单
+export function batchAddCombination(data) {
+  return request({
+    url: '/pro/combination/batchAdd',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 修改生产组合单
+export function updateCombination(data) {
+  return request({
+    url: '/pro/combination',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除生产组合单
+export function delCombination(combinationId) {
+  return request({
+    url: '/pro/combination/' + combinationId,
+    method: 'delete'
+  })
+}

src/views/mes/pro/request/index.vue

@@ -60,7 +60,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="primary"
           plain
           icon="el-icon-plus"
@@ -99,7 +99,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['pro:materialRequest:export']"
-        >导出</el-button>
+        >导出</el-button> -->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>