Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/api/mes/pro/combination.js

@@ -45,6 +45,15 @@ export function batchAddCombination(data) {
   })
 }
 
+// 生产组合单-新增-追加组合单
+export function insertCombination(data) {
+  return request({
+    url: '/pro/combination/insert',
+    method: 'post',
+    data: data
+  })
+}
+
 // 新增生产组合单
 export function batchAddCombinations(data) {
   return request({

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

@@ -116,7 +116,7 @@
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.width"/>
         </template>
       </el-table-column>
-        <el-table-column label="产品材料" align="center" prop="productMaterial" >
+        <el-table-column label="产品材质" align="center" prop="productMaterial" >
       <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.productMaterial"/>
         </template>
@@ -363,7 +363,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-     <el-form-item label="产品材料" label-width="120px">
+     <el-form-item label="产品材质" label-width="120px">
               <el-radio-group v-model="form.productMaterial" disabled v-if="optType=='view'">
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"