diff --git a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
index 43dc16c..4665a75 100644
--- a/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
+++ b/src/views/claimAndreturn/picking/apply/component/AddPicking1.vue
@@ -214,6 +214,19 @@
               </template>
             </el-table-column>
             <el-table-column align="center" label="库存数量" prop="num" />
+            <el-table-column label="备注" align="center" prop="createTime">
+              <template slot-scope="scope">
+                <el-input
+                  v-if="isView"
+                  maxlength="100"
+                  v-model="scope.row.remark"
+                  placeholder="请输入备注"
+                  clearable
+                  style="width: 100%"
+                />
+                <span v-else>{{ scope.row.remark }}</span>
+              </template>
+           </el-table-column>
             <el-table-column align="center" label="是否管理库存">
               <template slot-scope="{ row }">
                 <el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
@@ -967,16 +980,18 @@ export default {
             const wholeTypeList = []
             this.wholeTypeNameList.forEach((i) => {
               i.childrenList.forEach((e) => {
+                console.log("uiiiiiiiiiiiiiiiii",e)
                 const items = {
                   companyId: '101',
                   guigeCn: e.deviceType,
-                  preNum: e.deviceNum,
+                  preNum: e.preNum,
                   typeCn: e.typeName,
-                  typeId: e.deviceTypeId,
+                  typeId: e.deviceTypeId ? e.deviceTypeId:e.typeId,
                   wholeTypeName: i.wholeTypeName,
                   isCt: 0,
                   ctParentId: i.id,
                   setsNum: i.wholeTypeNum,
+                  remark: e.remark,
                 }
 
                 // wholeTypeList.push(items)
@@ -1022,13 +1037,14 @@ export default {
                   const items = {
                     companyId: '101',
                     guigeCn: e.deviceType,
-                    preNum: e.deviceNum,
+                    preNum: e.preNum,
                     typeCn: e.typeName,
-                    typeId: e.deviceTypeId,
+                    typeId: e.deviceTypeId ? e.deviceTypeId:e.typeId,
                     wholeTypeName: i.wholeTypeName,
                     isCt: 0,
                     ctParentId: i.id,
                     setsNum: i.wholeTypeNum,
+                    remark: e.remark,
                   }
 
                   // wholeTypeList.push(items)