fix: 开发商品管理、BOM、生产管理、财务、调整出库入库部分字段

src/views/production/task/edit.vue

@@ -47,16 +47,14 @@
             >
                 <el-table-column label="商品信息">
                     <template #default="{ row }">
-                        <div>{{ row.item.itemName + (row.item.itemCode ? ('(' +  row.item.itemCode + ')') : '') }}</div>
-                        <div v-if="row.item.itemBrand">{{ row.item.itemBrand ? ('品牌：' + useWmsStore().itemBrandMap.get(row.item.itemBrand)?.brandName) : '' }}</div>
-                        <div v-if="row.item.itemCategory">{{ row.item.itemCategory ? ('分类：' + useWmsStore().itemCategoryMap.get(row.item.itemCategory)?.categoryName) : '' }}</div>
+                        <div>{{ row.itemName + (row.itemCode ? ('(' +  row.itemCode + ')') : '') }}</div>
+                        <div v-if="row.itemBrand">{{ row.itemBrand ? ('品牌：' + useWmsStore().itemBrandMap.get(row.itemBrand)?.brandName) : '' }}</div>
                     </template>
                 </el-table-column>
                 <el-table-column label="规格信息">
                     <template #default="{ row }">
-                        <div>{{ row.itemSku.skuName }}</div>
-                        <div v-if="row.itemSku.skuCode">编号：{{ row.itemSku.skuCode }}</div>
-                        <div v-if="row.itemSku.barcode">条码：{{ row.itemSku.barcode }}</div>
+                        <div>{{ row.skuName }}</div>
+                        <div v-if="row.skuCode">编号：{{ row.itemSku.skuCode }}</div>
                     </template>
                 </el-table-column>
                 <el-table-column prop="versionId" label="BOM版本">
@@ -316,7 +314,17 @@ const handleSelectCancel = () => {
     addItemShow.value = false
 }
 const handleSelectConfirm = () => {
-    addList.value = selected.value
+    addList.value = selected.value.map(item => {
+        return {
+            itemBrand: item.item.itemBrand,
+            itemCode: item.item.itemCode,
+            itemName: item.item.itemName,
+            quantity: item.quantity,
+            skuCode: item.itemSku.skuCode,
+            skuName: item.itemSku.skuName,
+            versionId: item.versionId
+        }
+    })
     addItemShow.value = false
 }
 const initList = () => {
@@ -324,7 +332,13 @@ const initList = () => {
     listItemSkuPage({
         ...itemForm.value
     }).then(res => {
-        itemList.value = res.rows
+        itemList.value = res.rows.map(item => {
+            return {
+                ...item,
+                versionId: '',
+                quantity: 0
+            }
+        })
         total.value = res.total
     })
 }
@@ -344,7 +358,11 @@ onMounted(() => {
     if(route.query.data) {
         detailTask(route.query.data).then(res => {
             if(res.code == 200){
-
+                addForm.value.taskCode = res.data.taskCode
+                addForm.value.startDate = res.data.startDate
+                addForm.value.endDate = res.data.endDate
+                addForm.value.remark = res.data.remark
+                addList.value = res.data.taskItemSkuDtoList
             }
         })
     }

src/views/wms/basic/product/index.vue

@@ -345,7 +345,7 @@
         <el-drawer title="物料清单" v-model="productShow" size="80%" append-to-body :close-on-click-modal="false">
             <el-form :model="BOMForm" label-width="120">
                 <el-form-item label="BOM版本">
-                    <el-select v-model="BOMForm.version" @change="handleShowProduct">
+                    <el-select v-model="BOMForm.version">
                         <el-option v-for="item in BOMList" :value="item.id" :label="item.version"></el-option>
                     </el-select>
                 </el-form-item>
@@ -380,11 +380,11 @@
                         {{ `${row.length?row.length:0}*${row.width?row.width:0}*${row.height?row.height:0}` }}
                     </template>
                 </el-table-column>
-                <el-table-column label="操作">
+<!--                <el-table-column label="操作">
                     <template #default="{ row }">
                         <el-button size="small" @click="configurate(row)">BOM配置</el-button>
                     </template>
-                </el-table-column>
+                </el-table-column>-->
             </el-table>
         </el-drawer>
         <el-drawer title="BOM配置" v-model="configurateShow" size="80%" append-to-body :close-on-click-modal="false">
@@ -1010,7 +1010,11 @@ const handleShowProduct = (row) => {
     BOMDataForm.value.itemType = row.item.itemType
     BOMDataForm.value.skuName = row.itemSku.itemName
     BOMDataForm.value.skuItemId = row.skuId
-    listItem().then(res => {
+    initBOMVersion(row.skuId)
+    bomList({
+        skuItemId: BOMDataForm.value.skuItemId,
+        bomVersionId: BOMDataForm.value.version
+    }).then(res => {
         if(res.code == 200) {
             productList.value = res.data
         }
@@ -1121,9 +1125,9 @@ const handleSearch = () => {
 }
 
 let BOMList = ref([])
-const initBOMVersion = () => {
+const initBOMVersion = (id) => {
     BOMVersion({
-        skuId: ''
+        skuId: id
     }).then(res => {
         BOMList.value = res.data
     })
@@ -1148,7 +1152,6 @@ const handleSelectConfirm = () => {
 onMounted(() => {
     nextTick(()=>{
         getList();
-        initBOMVersion()
         if (route.query.openDrawer) {
             handleAdd()
         }