优化bug

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

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="组合单号" prop="arrangeCode">
+      <el-form-item label="编排单号" prop="arrangeCode">
         <el-input
           v-model="queryParams.arrangeCode"
-          placeholder="请输入组合单号"
+          placeholder="请输入编排单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -154,8 +154,8 @@
     <!-- 添加或修改生产编排单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="组合单号" prop="arrangeCode">
-          <el-input v-model="form.arrangeCode" placeholder="请输入组合单号"/>
+        <el-form-item label="编排单号" prop="arrangeCode">
+          <el-input v-model="form.arrangeCode" placeholder="请输入编排单号"/>
         </el-form-item>
         <el-form-item label="序号" prop="arrangeSort">
           <el-input v-model="form.arrangeSort" placeholder="请输入序号"/>
@@ -173,7 +173,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="组合单明细" :visible.sync="arrangeOpen" width="800px" append-to-body @close="getList">
+    <el-dialog title="编排单明细" :visible.sync="arrangeOpen" width="800px" append-to-body @close="getList">
       <ArrangeInfo :arrangeCode="arrangeCode"></ArrangeInfo>
     </el-dialog>
   </div>
@@ -224,7 +224,7 @@ export default {
       // 表单校验
       rules: {
         arrangeCode: [
-          {required: true, message: "组合单号不能为空", trigger: "blur"}
+          {required: true, message: "编排单号不能为空", trigger: "blur"}
         ], arrangeSort: [
           {required: true, message: "序号不能为空", trigger: "blur"}
         ],

src/views/mes/pro/arrange/info.vue

 <template>
   <div class="app-container">
 <!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
-<!--      <el-form-item label="组合单号" prop="arrangeCode">-->
+<!--      <el-form-item label="编排单号" prop="arrangeCode">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.arrangeCode"-->
-<!--          placeholder="请输入组合单号"-->
+<!--          placeholder="请输入编排单号"-->
 <!--          clearable-->
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
@@ -104,7 +104,7 @@
     <el-table v-loading="loading" :data="arrangeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="生产工单编号" align="center" prop="arrangeId"/>
-      <el-table-column label="组合单号" align="center" prop="arrangeCode"/>
+      <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
       <el-table-column label="序号" align="center" prop="arrangeSort">
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.arrangeSort" @change="handleChangeSort(scope.row)" :min="0"
@@ -147,8 +147,8 @@
     <!-- 添加或修改生产编排单对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="组合单号" prop="arrangeCode">
-          <el-input v-model="form.arrangeCode" placeholder="请输入组合单号"/>
+        <el-form-item label="编排单号" prop="arrangeCode">
+          <el-input v-model="form.arrangeCode" placeholder="请输入编排单号"/>
         </el-form-item>
         <el-form-item label="序号" prop="arrangeSort">
           <el-input v-model="form.arrangeSort" placeholder="请输入序号"/>
@@ -223,7 +223,7 @@ export default {
       // 表单校验
       rules: {
         arrangeCode: [
-          {required: true, message: "组合单号不能为空", trigger: "blur"}
+          {required: true, message: "编排单号不能为空", trigger: "blur"}
         ], arrangeSort: [
           {required: true, message: "序号不能为空", trigger: "blur"}
         ],

src/views/mes/pro/combination/chooseWorkorderForComb.vue

@@ -295,11 +295,14 @@ export default {
       });
       if (!shouldExit) {
         batchAddCombination(params).then(response => {
-          this.$modal.msgSuccess("追加组合单成功");
+          if(response.length == 0){
+            this.$modal.msgWarning("不允许组合");
+          }else {
+            this.$modal.msgSuccess("追加组合单成功");
+          }
           this.getList();
         });
       }
-
     },
     /** 查询生产工单列表 */
     getList() {