完善销售单

yxt-as-ui/src/views/operation/salesticket/salesticketAdd.vue

@@ -125,6 +125,8 @@
                       <el-table-column prop="price" label="销售单价" width="100" align="center" />
                       <el-table-column prop="billObjName" label="供应商" width="200" align="center" />
                       <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
+                      <el-table-column prop="wareZoneName" label="区域" width="150" align="center" />
+                      <el-table-column prop="wareAreaName" label="库区" width="150" align="center" />
                       <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
                       <el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
                       <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
@@ -140,7 +142,8 @@
             <el-table-column prop="unit" label="单位" align="center" width="100" />
             <el-table-column prop="billObjName" label="供应商" align="center" width="150" />
             <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
-            <el-table-column prop="areaName" label="库区" align="center" width="150" />
+            <el-table-column prop="wareZoneName" label="区域" width="150" align="center" />
+            <el-table-column prop="wareAreaName" label="库区" width="150" align="center" />
             <el-table-column prop="warehouseRackCode" label="库位" align="center" width="150" />
             <el-table-column prop="currentCount" label="库存" align="center" width="100" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />
@@ -533,8 +536,10 @@ export default {
         unit: '', // 计量单位
         warehouseName: '', // 仓库名称
         warehouseSid: '',
-        areaName: '', // 库区
-        areaSid: '',
+        wareZoneSid: '',
+        wareZoneName: '',
+        wareAreaSid: '',
+        wareAreaName: '',
         warehouseRackCode: '', // 库位编号
         warehouseRackSid: '',
         billObjName: '', // 供应商
@@ -585,8 +590,10 @@ export default {
       row.unit = value.unit
       row.warehouseName = value.warehouseName
       row.warehouseSid = value.warehouseSid
-      row.areaName = value.areaName
-      row.areaSid = value.areaSid
+      row.wareZoneSid = value.wareZoneSid
+      row.wareZoneName = value.wareZoneName
+      row.wareAreaSid = value.wareAreaSid
+      row.wareAreaName = value.wareAreaName
       row.warehouseRackCode = value.warehouseRackCode
       row.warehouseRackSid = value.warehouseRackSid
       row.billObjName = value.billObjName

yxt-as-ui/src/views/operation/salesticket/salesticketInfo.vue

@@ -86,7 +86,8 @@
             <el-table-column prop="unit" label="单位" width="100" align="center" />
             <el-table-column prop="billObjName" label="供应商" align="center" width="150" />
             <el-table-column prop="warehouseName" label="仓库" align="center" width="150" />
-            <el-table-column prop="areaName" label="库区" align="center" width="150" />
+            <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="库位" align="center" width="150" />
             <el-table-column prop="currentCount" label="库存" width="100" align="center" />
             <el-table-column prop="price" label="销售价" align="center" width="150" />