diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 7483784..365c144 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -219,11 +219,16 @@
                             label="设备所属"
                             prop="deviceAscription"
                         />
-                        <el-table-column
-                            align="center"
-                            label="领用数量"
-                            prop="deviceNum"
-                        />
+                      <el-table-column label="预领数量1" align="center">
+                        <template slot-scope="scope">
+                          <span>{{ props.row.deviceNum }}</span>
+                        </template>
+                      </el-table-column>
+                      <el-table-column
+                        align="center"
+                        label="库存数量"
+                        prop="num"
+                      />
                     </el-table>
                 </template>
             </el-table-column>
@@ -232,7 +237,22 @@
                 align="center"
                 label="抱杆设备名称"
             />
-            <el-table-column align="center" label="操作" width="180">
+
+          <el-table-column label="预领数量" align="center">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.deviceNum"
+                placeholder="请输入预领数量"
+                type="number"
+                min="1"
+                @input="checkNum(scope.row)"
+                clearable
+                style="width: 40%"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" label="操作" width="180">
                 <template slot-scope="scope">
                     <el-button
                         size="mini"
@@ -478,6 +498,7 @@ export default {
                 unitCn: '', //显示的设备 单位
                 remark: '', //单条备注
                 preNum: 1, //预领数量
+                deviceNum: '',
             },
             //
             queryRules: {
@@ -797,6 +818,7 @@ export default {
             template.guigeCn = item.typeModelName
             template.remark = item.remark
             template.preNum = item.preNum
+            template.deviceNum = item.deviceNum
             template.status = item.status
             template.parenntId = item.parenntId
             template.num = item.num
diff --git a/src/views/warehouseManage/machinery/parts/index.vue b/src/views/warehouseManage/machinery/parts/index.vue
index e89b1c9..137ddcc 100644
--- a/src/views/warehouseManage/machinery/parts/index.vue
+++ b/src/views/warehouseManage/machinery/parts/index.vue
@@ -363,7 +363,7 @@ export default {
                 paName: [
                     {
                         required: true,
-                        message: '部门名称不能为空',
+                        message: '名称不能为空',
                         trigger: 'blur',
                     },
                 ],
diff --git a/src/views/warehouseManage/machinery/type/index.vue b/src/views/warehouseManage/machinery/type/index.vue
index 75a42c6..0c8784b 100644
--- a/src/views/warehouseManage/machinery/type/index.vue
+++ b/src/views/warehouseManage/machinery/type/index.vue
@@ -182,13 +182,13 @@
                         prop="buyPrice"
                         show-overflow-tooltip
                     />
-                    <el-table-column
-                        label="丢失赔偿"
-                        align="center"
-                        key="payPrice"
-                        prop="payPrice"
-                        show-overflow-tooltip
-                    />
+<!--                    <el-table-column-->
+<!--                        label="丢失赔偿"-->
+<!--                        align="center"-->
+<!--                        key="payPrice"-->
+<!--                        prop="payPrice"-->
+<!--                        show-overflow-tooltip-->
+<!--                    />-->
                     <el-table-column
                         label="库管员"
                         align="center"
@@ -213,13 +213,13 @@
                             >
                                 数量管理
                             </el-tag>
-                            <el-tag
-                                size="mini"
-                                type="warning"
-                                v-if="row.manageType == '2'"
-                            >
-                                成套管理
-                            </el-tag>
+<!--                            <el-tag-->
+<!--                                size="mini"-->
+<!--                                type="warning"-->
+<!--                                v-if="row.manageType == '2'"-->
+<!--                            >-->
+<!--                                成套管理-->
+<!--                            </el-tag>-->
                         </template>
                     </el-table-column>
                     <el-table-column
@@ -396,9 +396,9 @@
                                 <el-option value="1" label="数量管理"
                                     >数量管理</el-option
                                 >
-                                <el-option value="2" label="成套管理"
-                                    >成套管理</el-option
-                                >
+<!--                                <el-option value="2" label="成套管理"-->
+<!--                                    >成套管理</el-option-->
+<!--                                >-->
                             </el-select>
                         </el-form-item>
                     </el-col>
diff --git a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
index 2624366..d8944d3 100644
--- a/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
+++ b/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue
@@ -370,32 +370,32 @@
                             prop="purchaseNum"
                         />
 
-                        <el-table-column
-                            label="已验收数量"
-                            align="center"
-                            prop=""
-                        />
+<!--                        <el-table-column-->
+<!--                            label="已验收数量111"-->
+<!--                            align="center"-->
+<!--                            prop=""-->
+<!--                        />-->
                         <el-table-column
                             label="本次验收数量"
                             align="center"
                             prop="checkNum"
                         />
-                        <el-table-column
-                            label="累积验收数量"
-                            align="center"
-                            prop=""
-                        />
+<!--                        <el-table-column-->
+<!--                            label="累积验收数量"-->
+<!--                            align="center"-->
+<!--                            prop=""-->
+<!--                        />-->
                         <el-table-column
                             label="验收日期"
                             align="center"
-                            prop=""
+                            prop="updateTime"
                         />
-                        <el-table-column
-                            label="合格证及技术资料"
-                            align="center"
-                            prop=""
-                        />
-                        <el-table-column label="包装" align="center" prop="" />
+<!--                        <el-table-column-->
+<!--                            label="合格证及技术资料"-->
+<!--                            align="center"-->
+<!--                            prop=""-->
+<!--                        />-->
+<!--                        <el-table-column label="包装" align="center" prop="" />-->
                     </el-table>
 
                     <div
@@ -468,6 +468,7 @@ export default {
         return {
             // 遮罩层
             loading: true,
+            updateTime:"",
             // 选中数组
             ids: [],
             // 非单个禁用