Merge remote-tracking branch 'origin/master'

src/views/modules/production/order.vue

@@ -472,7 +472,7 @@ export default {
       <el-table-column label="操作" align="center" width="80">
         <template slot-scope="{row,$index}">
           <el-link @click="handleEdit(row)">编辑</el-link>
-          <el-link @click="handleDelete(row)">删除</el-link>
+          <el-link @click="handleDelete(row)" v-if="row.status=== '已下达'">删除</el-link>
         </template>
       </el-table-column>
       <el-table-column