55

src/views/productionPlan/index.vue

@@ -123,7 +123,7 @@
             重新发布
           </el-link>
           <el-link
-            v-if="row.splitBatch != 2 && !row.joinPlanCode"
+            v-if="row.splitBatch != 2 && !row.joinPlanCode && activeName == 'first'"
             type="primary"
             :underline="false"
             icon="el-icon-edit"

src/views/saleOrder/index.vue

@@ -204,7 +204,7 @@
             label: '型号',
             align: 'center',
             minWidth: 120,
-            sortable: true
+
           },
           {
             prop: 'priority',