From 0d2299702cfd6884b59f009528bd6f05ea0f5030 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 2 Aug 2024 17:53:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storagecost/WarehousePricingTemplate.js   |  2 +-
 .../Basicconfiguration.vue                    |  3 +
 .../WarehousePricingTemplate.vue              | 19 ++++--
 .../WarehouseTemplateHome.vue                 |  2 +-
 .../distributionStockListDetails.vue          | 66 +++++++++++++++++++
 5 files changed, 85 insertions(+), 7 deletions(-)

diff --git a/src/option/storagecost/WarehousePricingTemplate.js b/src/option/storagecost/WarehousePricingTemplate.js
index 4264252c..128a364f 100644
--- a/src/option/storagecost/WarehousePricingTemplate.js
+++ b/src/option/storagecost/WarehousePricingTemplate.js
@@ -48,7 +48,7 @@ export const columnList = [
       head: false,
     },
     {
-      prop: 'a4',
+      prop: 'updateUser',
       label: '修改人',
       type: 2,
       values: '',
diff --git a/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue b/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
index a2778e69..ab988aea 100644
--- a/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
+++ b/src/views/cost/Deliverycostmanagement/Basicconfiguration.vue
@@ -77,6 +77,9 @@ const nextstep = () => {
   };
   $_WarehouseTemplateHome(data).then(res => {
     console.log(res, '新增成功');
+    if(res.data.code ==200){
+      
+    }
   });
   return;
   emit('request-data', '给父页面传递的参数：'); //通知父页面传递数据
diff --git a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
index bcd3fe9d..6436d2c7 100644
--- a/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue
@@ -50,7 +50,10 @@
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
             <el-button type="primary" @click="AddInfo"
-              ><el-icon><Plus /></el-icon>导出</el-button
+              ><el-icon><Download /></el-icon>导出</el-button
+            >
+            <el-button type="primary" @click="lyadded"
+              ><el-icon><Plus /></el-icon>新增</el-button
             >
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -78,9 +81,7 @@
         >
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
-           
-                <el-text size="small" @click="EditTemplate">编 辑</el-text>
-            
+                <el-text size="small" @click="EditTemplate(slotProps.scope.row)">编 辑</el-text>
             </template>
           </template>
         </tablecmt>
@@ -334,9 +335,12 @@ const MyWarehouseList = () => {
   });
 };
 // 页面初始化方法
-const EditTemplate = () => {
+const EditTemplate = (row) => {
   $router.push({
     path: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
+    query:{
+      id:row.id
+    }
   });
 };
 const PageOnload = () => {
@@ -347,6 +351,11 @@ const PageOnload = () => {
 
 //页面初始化方法
 PageOnload();
+const lyadded=()=>{
+  $router.push({
+    path: '/cost/Deliverycostmanagement/WarehouseTemplateHome',
+  });
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
index bfe23ef6..bd9807a1 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
@@ -32,7 +32,7 @@
 <script setup>
 import { ref, defineAsyncComponent } from 'vue';
 import { ElMessage } from 'element-plus';
-import { $_getMyWarehouseList} from '@/api/storagecost/index.js';
+import { $_getMyWarehouseList } from '@/api/storagecost/index.js';
 const templateInfo=ref({a:'1'});//给子页面的数据
 const active = ref(1);
 //品类映射表
diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue
index 9a190f54..08896615 100644
--- a/src/views/distribution/inventory/distributionStockListDetails.vue
+++ b/src/views/distribution/inventory/distributionStockListDetails.vue
@@ -384,6 +384,72 @@ export default {
             sortable: true,
             head: false,
           },
+          {
+            prop: 'incomingBatch',
+            label: '入库批次',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'logisticsCompany',
+            label: '物流公司',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoUnit',
+            label: '物品单位',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'packageNumber',
+            label: '包装数量',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'cargoNorms',
+            label: '包装规格',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
+          {
+            prop: 'remark',
+            label: '备注',
+            type: 2,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+            head: false,
+          },
           {
             prop: 'orderCode',
             label: '订单自编号',