完善商品退货管理

yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnAdd.vue

@@ -139,6 +139,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售价" align="center" width="100" />
               <el-table-column prop="count" label="数量" align="center" width="100" />
@@ -191,6 +195,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售单价" align="center" width="100" />
               <el-table-column prop="currentCount" label="总数量" align="center" width="100" />
@@ -513,6 +521,14 @@ export default {
         goodsSkuTitle: row.goodsSpuName,
         goodsSkuCode: row.goodsSkuCode,
         unit: row.unit,
+        warehouseName: row.warehouseName,
+        warehouseSid: row.warehouseSid,
+        wareZoneName: row.wareZoneName,
+        wareZoneSid: row.wareZoneSid,
+        wareAreaName: row.wareAreaName,
+        wareAreaSid: row.wareAreaSid,
+        warehouseRackCode: row.warehouseRackCode,
+        warehouseRackSid: row.warehouseRackSid,
         goodsSkuOwnSpec: row.goodsSkuOwnSpec,
         currentCount: row.count,
         returnedCount: row.returnedCount,

yxt-as-ui/src/views/operation/merchandisereturn/merchandisereturnInfo.vue

@@ -128,6 +128,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售价" align="center" width="100" />
               <el-table-column prop="currentCount" label="总数量" align="center" width="100" />

yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnDaiBan.vue

@@ -131,6 +131,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售价" align="center" width="100" />
               <el-table-column prop="currentCount" label="总数量" align="center" width="100" />

yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnEdit.vue

@@ -138,6 +138,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售价" align="center" width="100" />
               <el-table-column prop="count" label="数量" align="center" width="100" />
@@ -191,6 +195,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售单价" align="center" width="100" />
               <el-table-column prop="currentCount" label="总数量" align="center" width="100" />
@@ -506,6 +514,14 @@ export default {
         goodsSkuTitle: '',
         goodsSkuCode: row.goodsSkuCode,
         unit: row.unit,
+        warehouseName: row.warehouseName,
+        warehouseSid: row.warehouseSid,
+        wareZoneName: row.wareZoneName,
+        wareZoneSid: row.wareZoneSid,
+        wareAreaName: row.wareAreaName,
+        wareAreaSid: row.wareAreaSid,
+        warehouseRackCode: row.warehouseRackCode,
+        warehouseRackSid: row.warehouseRackSid,
         goodsSkuOwnSpec: row.goodsSkuOwnSpec,
         currentCount: row.count,
         returnedCount: row.returnedCount,

yxt-as-ui/src/views/workFlow/shangpintuihuoFlow/merchandisereturnYiBan.vue

@@ -128,6 +128,10 @@
               <el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
               <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
               <el-table-column prop="unit" label="单位" align="center" width="100" />
+              <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+              <el-table-column prop="wareZoneName" label="区域" width="100" align="center" />
+              <el-table-column prop="wareAreaName" label="库区" width="100" align="center" />
+              <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
               <el-table-column prop="billObjName" label="供应商" align="center" width="100" />
               <el-table-column prop="price" label="销售价" align="center" width="100" />
               <el-table-column prop="currentCount" label="总数量" align="center" width="100" />