Merge tag 'Hotfix-zh-258' into develop

Finish Hotfix-zh-258

src/views/supply/pickup/pickup_list.vue

@@ -138,7 +138,7 @@
             <el-table-column align="left" label="备注" prop="remark" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="100" fixed="right">
               <template slot-scope="scope">
-                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
+                <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && !scope.row.printNum">编辑</el-button>
                 <el-popconfirm
                   style="margin-left: 10px;"
                   :title="'确定' + (scope.row.printNum ? '作废' : '取消') +'吗？'"