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

pages/mes/prodReport/components/editFeeding.vue

@@ -20,7 +20,6 @@
                 style="margin-left: 10rpx"
                 icon="edit-pen"
                 @click="handleUpdate(scope.row)"
-                v-if="scope.row.status =='PREPARE'"
             >修改</u-button>
             <u-button
                 size="mini"
@@ -28,7 +27,6 @@
                 style="margin-left: 10rpx"
                 icon="trash"
                 @click="handleDelete(scope.row)"
-                v-if="scope.row.status =='PREPARE'"
             >删除</u-button>
             </template>
         </zb-table>

pages/mes/prodReport/components/userPersonnel.vue

@@ -2,7 +2,7 @@
   <view class="dmodel-table">
     <view class="search">
       <u-form :model="tableParams" labelAlign="right" class="tableForm">
-        <u-form-item label="编号" label-width="60px" name="userName">
+        <u-form-item label="工号" label-width="60px" name="userName">
           <uni-easyinput type="text" v-model="tableParams.userName" placeholder="请输入编号" />
         </u-form-item>
         <u-form-item label="名称" label-width="60px" name="nickName">
@@ -54,7 +54,7 @@ export default {
         },
         {
           name: 'nickName',
-          label: '名称',
+          label: '姓名',
           width: 200
         },