From 17561f6ad12443cf5f28b6c3850382a4b3049b43 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 17 Apr 2025 16:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7(=E5=88=86=E5=85=AC=E5=8F=B8=E5=86=85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocationByBranchesAdd.vue               |  66 +-
 .../allocationByBranchesInfo.vue              | 222 +++---
 .../relation/chooseproducts.vue               | 234 +++---
 .../allocationByBranchesDaiBan.vue            | 685 +++++++++---------
 .../allocationByBranchesEdit.vue              |  66 +-
 .../allocationByBranchesYiBan.vue             | 305 ++++----
 .../relation/chooseproducts.vue               | 234 +++---
 7 files changed, 870 insertions(+), 942 deletions(-)

diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue
index 6e33a090ce..8f622acf1c 100644
--- a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue
+++ b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue
@@ -139,9 +139,10 @@
             <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
             <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
             <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-            <el-table-column prop="warehouseAreaName" label="库区" width="150" align="center" />
-            <el-table-column prop="warehouseRackCode" label="库位" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
+            <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
+            <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
+            <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
             <el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
             <!-- <el-table-column prop="taxPrice" label="单价" width="100" align="center" /> -->
             <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
@@ -447,36 +448,37 @@
         this.viewState = 1
         if (value.length > 0) {
           value.forEach((e) => {
-
             this.formobj.wmsInventoryAllocateBillDetailNewList.push({
-              "goodsSpuSid": e.goodsSpuSid,
-              "goodsSpuName": e.goodsSpuName,
-              "goodsSkuCode": e.goodsSkuCode,
-              "goodsSkuOwnSpec": e.goodsSkuOwnSpec,
-              "goodsSkuSid": e.goodsSkuSid,
-              "goodsSkuTitle": e.goodsSkuTitle,
-              "billSid": this.formobj.sid,
-              "inventorySid": e.inventorySid,
-              "warehouseSid": e.warehouseSid,
-              "warehouseName": e.warehouseName,
-              "warehouseAreaSid": e.warehouseAreaSid,
-              "warehouseArea": e.warehouseArea,
-              "warehouseRackSid": e.warehouseRackSid,
-              "warehouseRackCode": e.warehouseRackCode,
-              "taxPrice": e.taxPrice,
-              "stockCount": e.count,
-              "inWarehouseSid": '',
-              "inWarehouseName": '',
-              "inWarehouseRackSid": '',
-              "inWarehouseRackCode": '',
-              "count": 0,
-              "amount": 0,
-              "requAmount": e.taxPrice,
-              "markUpRatio": 0,
-              "unit": e.unit,
-              "goodsID": e.goodsID,
-              "manufacturerSid": e.manufacturerSid,
-              "manufacturerName": e.manufacturerName,
+              goodsSpuSid: e.goodsSpuSid,
+              goodsSpuName: e.goodsSpuName,
+              goodsSkuCode: e.goodsSkuCode,
+              goodsSkuOwnSpec: e.goodsSkuOwnSpec,
+              goodsSkuSid: e.goodsSkuSid,
+              goodsSkuTitle: e.goodsSkuTitle,
+              billSid: this.formobj.sid,
+              inventorySid: e.inventorySid,
+              warehouseSid: e.warehouseSid,
+              warehouseName: e.warehouseName,
+              warehouseZoneSid: e.warehouseZoneSid,
+              warehouseZoneName: e.warehouseZoneName,
+              warehouseAreaSid: e.warehouseAreaSid,
+              warehouseArea: e.warehouseArea,
+              warehouseRackSid: e.warehouseRackSid,
+              warehouseRackCode: e.warehouseRackCode,
+              taxPrice: e.taxPrice,
+              stockCount: e.count,
+              inWarehouseSid: '',
+              inWarehouseName: '',
+              inWarehouseRackSid: '',
+              inWarehouseRackCode: '',
+              count: 0,
+              amount: 0,
+              requAmount: e.taxPrice,
+              markUpRatio: 0,
+              unit: e.unit,
+              goodsID: e.goodsID,
+              manufacturerSid: e.manufacturerSid,
+              manufacturerName: e.manufacturerName
             })
           })
         }
diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue
index 82da4975ec..03875b1240 100644
--- a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue
+++ b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue
@@ -7,11 +7,8 @@
       </div>
     </div>
     <div class="listconadd">
-
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-
         <el-row class="first_row">
-
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -25,9 +22,7 @@
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-
           <el-col :span="8">
             <div class="span-sty">调出站</div>
             <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@@ -44,35 +39,29 @@
             <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-
-
-        <div class="title titleOne">
-          <div>调拨商品列表</div>
-        </div>
-
-        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
-          show-summary :summary-method="getSummaries">
-          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-          <el-table-column prop="goodsID" label="商品ID" align="center" />
-          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
-          <el-table-column prop="unit" label="单位" align="center" />
-          <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseArea" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-          <el-table-column prop="stockCount" label="库存数量" align="center" />
-          <el-table-column prop="markUpRatio" label="加价比例" align="center" />
-          <el-table-column prop="requAmount" label="调拨单价" align="center" />
-          <el-table-column prop="count" label="调拨数量" align="center" />
-          <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
+        <div class="title">调拨商品列表</div>
+        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column prop="goodsID" label="商品ID" align="center"/>
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+          <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
+          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
+          <el-table-column prop="unit" label="单位" align="center"/>
+          <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
+          <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
+          <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
+          <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
+          <el-table-column prop="stockCount" label="库存数量" align="center"/>
+          <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
+          <el-table-column prop="requAmount" label="调拨单价" align="center"/>
+          <el-table-column prop="count" label="调拨数量" align="center"/>
+          <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
         </el-table>
       </el-form>
     </div>
@@ -80,119 +69,80 @@
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  export default {
-    data() {
-      return {
-        index: 0,
-        formobj: {},
-      }
-    },
-
-    methods: {
-      // 合计
-      getSummaries(param) {
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-            return
-          }
-          const values = data.map(item => Number(item[column.property]))
-          if (column.property === 'count') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          } else if (column.property === 'amount') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          }
-        })
-        return sums
-      },
-
-
-      showAdd(sid) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.init(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-          }
-        })
-      },
-
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
+import req from '@/api/storage/allocation.js'
 
+export default {
+  data() {
+    return {
+      index: 0,
+      formobj: {}
+    }
+  },
+
+  methods: {
+    // 合计
+    getSummaries(param) {
+      const {
+        columns,
+        data
+      } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
         }
-        this.$emit('doback')
-      }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'count') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'amount') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        }
+      })
+      return sums
+    },
+    showAdd(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {}
+      this.$emit('doback')
     }
   }
+}
 </script>
 
 <style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
-  }
-
-
-  .first_row {
-    border-top: 1px solid #E0E3EB;
-  }
-
-  .titleOne {
-    padding: 7px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    align-items: center;
-  }
-
-  /deep/ .el-form-item__error {
-    margin-left: 180px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-    display: inline;
-    line-height: 1px;
-    vertical-align: middle;
-  }
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue
index a56f465ffa..597fd95465 100644
--- a/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue
@@ -14,13 +14,13 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
               <el-form-item label="商品ID" class="searchlist">
-                <el-input v-model="listQuery.params.goodsID" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsID" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品编码" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品名称" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable/>
               </el-form-item>
 
             </el-form>
@@ -35,26 +35,25 @@
           <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
         </div>
         <div class="">
-          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
-            @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center" />
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column prop="goodsID" label="商品ID" align="center" />
-            <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-            <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" align="center" />
-            <el-table-column prop="warehouseArea" label="库区" align="center" />
-            <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-            <el-table-column prop="count" label="库存数量" align="center" />
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="goodsID" label="商品ID" align="center"/>
+            <el-table-column prop="goodsSkuTitle" label="商品名称" align="center"/>
+            <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
+            <el-table-column prop="unit" label="单位" align="center"/>
+            <el-table-column prop="warehouseName" label="仓库" align="center"/>
+            <el-table-column prop="warehouseZoneName" label="区域" align="center"/>
+            <el-table-column prop="warehouseArea" label="库区" align="center"/>
+            <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
+            <el-table-column prop="count" label="库存数量" align="center"/>
           </el-table>
         </div>
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!-- 翻页 -->
-          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -62,111 +61,112 @@
 </template>
 
 <script>
-  import Pagination from '@/components/pagination'
-  import req from '@/api/storage/allocation.js'
-  export default {
-    name: 'SelectVehicle',
-    components: {
-      Pagination
-    },
-    data() {
-      return {
-        isSearchShow: false,
-        searchxianshitit: '隐藏查询条件',
-        tableKey: 0,
-        sids: [],
-        list: [],
-        number: '',
-        listLoading: false,
-        listQuery: {
-          current: 1,
-          size: 10,
-          params: {
-            deptSid: '',
-            goodsID: '',
-            goodsSkuTitle: '',
-            goodsSkuCode: '',
-          },
-          total: 0
-        }
+import Pagination from '@/components/pagination'
+import req from '@/api/storage/allocation.js'
+
+export default {
+  name: 'SelectVehicle',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          deptSid: '',
+          goodsID: '',
+          goodsSkuTitle: '',
+          goodsSkuCode: ''
+        },
+        total: 0
       }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
     },
-    methods: {
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.getGoods(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
         }
-      },
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      getList() {
-        this.listLoading = true
-        req.getGoods(this.listQuery).then((response) => {
-          this.listLoading = false
-          if (response.success) {
-            this.listQuery.total = response.data.total
-            this.list = response.data.records
-          }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 10
+      this.listQuery.total = 0
+      this.listQuery.params.goodsID = ''
+      this.listQuery.params.goodsSkuTitle = ''
+      this.listQuery.params.goodsSkuCode = ''
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = row
+    },
+    showData(value, deptSid) {
+      // const aa = []
+      // if (value.length > 0) {
+      //   for (var i = 0; i < value.length; i++) {
+      //     aa.push(value[i].saleVehSid)
+      //   }
+      //   this.listQuery.params.saleVehSids = aa
+      // } else {
+      //   this.listQuery.params.saleVehSids = []
+      // }``
+      this.listQuery.params.deptSid = deptSid
+      this.getList()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请至少选择一条记录进行操作',
+          type: 'error',
+          duration: 2000
         })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-      // 重置按钮
-      handleReset() {
-        this.listQuery.current = 1
-        this.listQuery.size = 10
-        this.listQuery.total = 0
-        this.listQuery.params.goodsID = ''
-        this.listQuery.params.goodsSkuTitle = ''
-        this.listQuery.params.goodsSkuCode = ''
-        this.getList()
-      },
-      handleSelectionChange(row) {
-        this.sids = row
-      },
-      showData(value, deptSid) {
-        // const aa = []
-        // if (value.length > 0) {
-        //   for (var i = 0; i < value.length; i++) {
-        //     aa.push(value[i].saleVehSid)
-        //   }
-        //   this.listQuery.params.saleVehSids = aa
-        // } else {
-        //   this.listQuery.params.saleVehSids = []
-        // }``
-        this.listQuery.params.deptSid = deptSid
-        this.getList()
-      },
-      // 添加修改返回
-      AddUpdateReturn() {
-        if (this.sids.length > 0) {
-          this.$emit('backData', this.sids)
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '请至少选择一条记录进行操作',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      },
-      // 返回
-      handleReturn() {
-        this.$emit('doback')
       }
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
     }
   }
+}
 </script>
 <style scoped>
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue
index bea3ddfd9c..4a57e5e01f 100644
--- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue
@@ -10,11 +10,8 @@
       </div>
     </div>
     <div class="">
-
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-
         <el-row style="border-top: 1px solid #e0e3eb">
-
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -28,9 +25,7 @@
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-
           <el-col :span="8">
             <div class="span-sty">调出站</div>
             <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@@ -47,40 +42,32 @@
             <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-
-
-        <div class="title titleOne">
-          <div>调拨商品列表</div>
-        </div>
-
-        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
-          show-summary :summary-method="getSummaries">
-          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-          <el-table-column prop="goodsID" label="商品ID" align="center" />
-          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
-          <el-table-column prop="unit" label="单位" align="center" />
-          <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseArea" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-          <el-table-column prop="stockCount" label="库存数量" align="center" />
-          <el-table-column prop="markUpRatio" label="加价比例" align="center" />
-          <el-table-column prop="requAmount" label="调拨单价" align="center" />
-          <el-table-column prop="count" label="调拨数量" align="center" />
-          <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
+        <div class="title ">调拨商品列表</div>
+        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column prop="goodsID" label="商品ID" align="center"/>
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+          <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
+          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
+          <el-table-column prop="unit" label="单位" align="center"/>
+          <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
+          <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
+          <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
+          <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
+          <el-table-column prop="stockCount" label="库存数量" align="center"/>
+          <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
+          <el-table-column prop="requAmount" label="调拨单价" align="center"/>
+          <el-table-column prop="count" label="调拨数量" align="center"/>
+          <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
         </el-table>
       </el-form>
     </div>
-
-
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
       <el-form class="formadd">
@@ -110,8 +97,9 @@
             <span>意见:</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw"
-                type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input></el-form-item>
+            <el-form-item>
+              <el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -125,349 +113,348 @@
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  import {
-    selectStaffListss
-  } from '@/api/Common/dictcommons'
-  export default {
-    data() {
-      return {
-        index: 0,
-        formobj: {},
-        options: [],
-        operation: '', // 点击操作按钮
-        dialogList: {
-          comment: ''
-        },
-        startTask: true,
-        current: {
-          taskDefKey: '',
-          taskName: '' // 当前环节名称
-        },
-        nextNode: {}, // 下一环节
-        nodeDialogVisible: false,
-        currentLink: true,
-        countersignLink: false,
-        // 环节所需参数
-        linkByParameter: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          orgSidPath: '',
-          taskDefKey: '',
-          userSid: ''
-        },
-        // 加签按钮所需参数
-        countersign: {
-          taskId: '',
-          assignee: '',
-          userSid: '',
-          instanceId: '',
-          views: ''
-        }
+import req from '@/api/storage/allocation.js'
+import {
+  selectStaffListss
+} from '@/api/Common/dictcommons'
+
+export default {
+  data() {
+    return {
+      index: 0,
+      formobj: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
       }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    // 合计
+    getSummaries(param) {
+      const {
+        columns,
+        data
+      } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'count') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'amount') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        }
+      })
+      return sums
     },
-    created() {
-      console.log('url:' + window.location.href)
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('iframe页面获取的obj:', obj)
-      // 点击（同意、终止、驳回、驳回）操作时所需的参数
-      this.linkByParameter.businessSid = obj.businessSid
-      this.linkByParameter.instanceId = obj.instanceId
-      this.linkByParameter.taskId = obj.taskId
-      this.linkByParameter.taskDefKey = obj.taskDefKey
-      // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
-      this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
-      this.current.taskDefKey = obj.taskDefKey
-      this.current.taskName = obj.taskName
-      // 加签参数
-      this.countersign.taskId = obj.taskId
-      this.countersign.userSid = window.sessionStorage.getItem('userSid')
-      this.countersign.instanceId = obj.instanceId
-      // 加载表单数据
-      this.showInfo(obj.businessSid)
-    },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 400 + 'px'
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+      selectStaffListss().then((res) => {
+        if (res.success) {
+          this.options = res.data
         }
-      }, '*')
+      })
     },
-    methods: {
-      // 合计
-      getSummaries(param) {
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-            return
-          }
-          const values = data.map(item => Number(item[column.property]))
-          if (column.property === 'count') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          } else if (column.property === 'amount') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          }
-        })
-        return sums
-      },
-
 
-      showInfo(sid) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.init(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-          }
-        })
-        selectStaffListss().then((res) => {
-          if (res.success) {
-            this.options = res.data
-          }
-        })
-      },
-
-      // 加签
-      openCountersign(val) {
-        this.operation = val
-        this.currentLink = true
-        this.countersignLink = true
-        this.dialogList.comment = ''
-        req.getNextNodesForSubmit({
-          taskDefKey: this.current.taskDefKey,
-          businessSid: this.linkByParameter.businessSid
-        }).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 同意
-      openAgree(val) {
-        this.operation = val
-        this.currentLink = true
-        this.countersignLink = false
-        this.dialogList.comment = '同意'
-        req.getNextNodesForSubmit({
-          taskDefKey: this.current.taskDefKey,
-          businessSid: this.linkByParameter.businessSid
-        }).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 驳回
-      openReject(val) {
-        this.operation = val
-        this.currentLink = true
-        this.countersignLink = false
-        this.dialogList.comment = ''
-        req.getPreviousNodesForReject({
-          taskDefKey: this.current.taskDefKey,
-          businessSid: this.linkByParameter.businessSid
-        }).then((resp) => {
-          if (resp.success) {
-            var arr = resp.data
-            this.nextNode = arr[0]
-            this.nodeDialogVisible = true
-          }
-          this.submitdisabled = false
-        })
-      },
-      // 终止
-      openStop(val) {
-        this.operation = val
-        this.currentLink = false
-        this.countersignLink = false
-        this.dialogList.comment = ''
-        this.nodeDialogVisible = true
-      },
-      reject() {
-        if (this.operation === '同意') {
-          this.handleAgree()
-        } else if (this.operation === '驳回') {
-          if (this.dialogList.comment === '') {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '请填写审批意见'
-            })
-          } else {
-            this.handleReject()
-          }
-        } else if (this.operation === '终止') {
-          if (this.dialogList.comment === '') {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '请填写审批意见'
-            })
-          } else {
-            this.handleStop()
-          }
-        } else if (this.operation === '加签') {
-          this.handleCountersign()
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({
+        taskDefKey: this.current.taskDefKey,
+        businessSid: this.linkByParameter.businessSid
+      }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
         }
-      },
-      /** 加签 */
-      handleCountersign() {
-        if (this.countersign.assignee === '') {
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({
+        taskDefKey: this.current.taskDefKey,
+        businessSid: this.linkByParameter.businessSid
+      }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({
+        taskDefKey: this.current.taskDefKey,
+        businessSid: this.linkByParameter.businessSid
+      }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
           this.$message({
             showClose: true,
             type: 'error',
-            message: '请选择加签人员'
+            message: '请填写审批意见'
           })
-          return
+        } else {
+          this.handleReject()
         }
+      } else if (this.operation === '终止') {
         if (this.dialogList.comment === '') {
           this.$message({
             showClose: true,
             type: 'error',
             message: '请填写审批意见'
           })
-          return
+        } else {
+          this.handleStop()
         }
-        this.countersign.views = this.dialogList.comment
-        req.delegate(this.countersign).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      },
-      /** 同意任务 */
-      handleAgree() {
-        this.linkByParameter.comment = this.dialogList.comment
-        req.complete(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      },
-      /** 驳回任务 */
-      handleReject() {
-        this.linkByParameter.comment = this.dialogList.comment
-        req.reject(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请选择加签人员'
         })
-      },
-      /** 终止任务 */
-      handleStop() {
-        this.linkByParameter.comment = this.dialogList.comment
-        req.breakProcess(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: '请填写审批意见'
         })
+        return
       }
-
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
     }
+
   }
+}
 </script>
 
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
+.addinputInfo {
+  margin-left: 120px !important;
+}
 
-  .rowClass {
-    border-top: 1px solid #E0E3EB;
-  }
+.rowClass {
+  border-top: 1px solid #E0E3EB;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue
index 2f945142c6..8e4f759bac 100644
--- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue
@@ -82,9 +82,10 @@
             <el-table-column prop="goodsSkuCode" label="商品编码" width="100" align="center" />
             <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
             <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-            <el-table-column prop="warehouseAreaName" label="库区" width="150" align="center" />
-            <el-table-column prop="warehouseRackCode" label="库位" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
+            <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
+            <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
+            <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
             <el-table-column prop="stockCount" label="库存数量" width="100" align="center" />
             <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
               <template slot-scope="scope">
@@ -365,36 +366,37 @@
         this.viewState = 1
         if (value.length > 0) {
           value.forEach((e) => {
-
             this.formobj.wmsInventoryAllocateBillDetailNewList.push({
-              "goodsSpuSid": e.goodsSpuSid,
-              "goodsSpuName": e.goodsSpuName,
-              "goodsSkuCode": e.goodsSkuCode,
-              "goodsSkuOwnSpec": e.goodsSkuOwnSpec,
-              "goodsSkuSid": e.goodsSkuSid,
-              "goodsSkuTitle": e.goodsSkuTitle,
-              "billSid": this.formobj.sid,
-              "inventorySid": e.inventorySid,
-              "warehouseSid": e.warehouseSid,
-              "warehouseName": e.warehouseName,
-              "warehouseAreaSid": e.warehouseAreaSid,
-              "warehouseArea": e.warehouseArea,
-              "warehouseRackSid": e.warehouseRackSid,
-              "warehouseRackCode": e.warehouseRackCode,
-              "taxPrice": e.taxPrice,
-              "stockCount": e.count,
-              "inWarehouseSid": '',
-              "inWarehouseName": '',
-              "inWarehouseRackSid": '',
-              "inWarehouseRackCode": '',
-              "count": 0,
-              "amount": 0,
-              "requAmount": e.taxPrice,
-              "markUpRatio": 0,
-              "unit": e.unit,
-              "goodsID": e.goodsID,
-              "manufacturerSid": e.manufacturerSid,
-              "manufacturerName": e.manufacturerName,
+              goodsSpuSid: e.goodsSpuSid,
+              goodsSpuName: e.goodsSpuName,
+              goodsSkuCode: e.goodsSkuCode,
+              goodsSkuOwnSpec: e.goodsSkuOwnSpec,
+              goodsSkuSid: e.goodsSkuSid,
+              goodsSkuTitle: e.goodsSkuTitle,
+              billSid: this.formobj.sid,
+              inventorySid: e.inventorySid,
+              warehouseSid: e.warehouseSid,
+              warehouseName: e.warehouseName,
+              warehouseZoneSid: e.warehouseZoneSid,
+              warehouseZoneName: e.warehouseZoneName,
+              warehouseAreaSid: e.warehouseAreaSid,
+              warehouseArea: e.warehouseArea,
+              warehouseRackSid: e.warehouseRackSid,
+              warehouseRackCode: e.warehouseRackCode,
+              taxPrice: e.taxPrice,
+              stockCount: e.count,
+              inWarehouseSid: '',
+              inWarehouseName: '',
+              inWarehouseRackSid: '',
+              inWarehouseRackCode: '',
+              count: 0,
+              amount: 0,
+              requAmount: e.taxPrice,
+              markUpRatio: 0,
+              unit: e.unit,
+              goodsID: e.goodsID,
+              manufacturerSid: e.manufacturerSid,
+              manufacturerName: e.manufacturerName
             })
           })
         }
diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue
index 0233e97887..0dbe38181c 100644
--- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesYiBan.vue
@@ -7,11 +7,8 @@
       </div>
     </div>
     <div class="">
-
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-
         <el-row style="border-top: 1px solid #e0e3eb">
-
           <el-col :span="8">
             <div class="span-sty">申请人</div>
             <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@@ -25,9 +22,7 @@
             <el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-
           <el-col :span="8">
             <div class="span-sty">调出站</div>
             <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
@@ -44,35 +39,29 @@
             <el-form-item><span class="addinputInfo">{{ formobj.confirmName }}</span></el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="24">
             <div class="span-sty">备注</div>
             <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
           </el-col>
         </el-row>
-
-
-        <div class="title titleOne">
-          <div>调拨商品列表</div>
-        </div>
-
-        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;"
-          show-summary :summary-method="getSummaries">
-          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
-          <el-table-column prop="goodsID" label="商品ID" align="center" />
-          <el-table-column prop="goodsSpuName" label="商品名称" align="center" />
-          <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
-          <el-table-column prop="unit" label="单位" align="center" />
-          <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseArea" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-          <el-table-column prop="stockCount" label="库存数量" align="center" />
-          <el-table-column prop="markUpRatio" label="加价比例" align="center" />
-          <el-table-column prop="requAmount" label="调拨单价" align="center" />
-          <el-table-column prop="count" label="调拨数量" align="center" />
-          <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
+        <div class="title">调拨商品列表</div>
+        <el-table :data="formobj.wmsInventoryAllocateBillDetailNewList" :index="index" border style="width: 100%;" show-summary :summary-method="getSummaries">
+          <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
+          <el-table-column prop="goodsID" label="商品ID" align="center"/>
+          <el-table-column prop="goodsSpuName" label="商品名称" align="center"/>
+          <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
+          <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center"/>
+          <el-table-column prop="unit" label="单位" align="center"/>
+          <el-table-column prop="warehouseName" label="仓库" width="150" align="center"/>
+          <el-table-column prop="warehouseZoneName" label="区域" width="150" align="center"/>
+          <el-table-column prop="warehouseArea" label="库区" width="150" align="center"/>
+          <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
+          <el-table-column prop="stockCount" label="库存数量" align="center"/>
+          <el-table-column prop="markUpRatio" label="加价比例" align="center"/>
+          <el-table-column prop="requAmount" label="调拨单价" align="center"/>
+          <el-table-column prop="count" label="调拨数量" align="center"/>
+          <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
         </el-table>
       </el-form>
     </div>
@@ -80,147 +69,145 @@
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  export default {
-    data() {
-      return {
-        index: 0,
-        formobj: {},
-        // 环节所需参数
-        linkByParameter: {
-          businessSid: '',
-          comment: '',
-          instanceId: '',
-          taskId: '',
-          orgSidPath: '',
-          taskDefKey: '',
-          userSid: ''
-        },
+import req from '@/api/storage/allocation.js'
+
+export default {
+  data() {
+    return {
+      index: 0,
+      formobj: {},
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
       }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    // 合计
+    getSummaries(param) {
+      const {
+        columns,
+        data
+      } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '合计'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (column.property === 'count') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        } else if (column.property === 'amount') {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ''
+        }
+      })
+      return sums
     },
-    created() {
-      console.log('url:' + window.location.href)
-      var one = window.location.href.indexOf('&data') + 6
-      const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
-      const obj = JSON.parse(decodeURIComponent(data))
-      console.log('iframe页面获取的obj:', obj)
-      // 点击（同意、终止、驳回、驳回）操作时所需的参数
-      this.linkByParameter.businessSid = obj.businessSid
-      this.linkByParameter.instanceId = obj.instanceId
-      this.linkByParameter.taskId = obj.taskId
-      this.linkByParameter.taskDefKey = obj.taskDefKey
-      this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
-      // 加载表单数据
-      this.showInfo(obj.businessSid)
-    },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 500 + 'px'
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
         }
-      }, '*')
+      })
     },
-    methods: {
-      // 合计
-      getSummaries(param) {
-        const {
-          columns,
-          data
-        } = param
-        const sums = []
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-            return
-          }
-          const values = data.map(item => Number(item[column.property]))
-          if (column.property === 'count') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          } else if (column.property === 'amount') {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return prev + curr
-              } else {
-                return prev
-              }
-            }, 0)
-            sums[index] += ''
-          }
-        })
-        return sums
-      },
-
-
-      showInfo(sid) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
         })
-        req.init(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-          }
-        })
-      },
-
-      /** 确认撤回任务 */
-      openRevoke() {
-        this.$confirm('是否确认执行撤回操作', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.handleRevoke()
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消撤回'
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
           })
-        })
-      },
-      /** 撤回任务 */
-      handleRevoke() {
-        req.revokeProcess(this.linkByParameter).then((response) => {
-          if (response.success) {
-            this.$notify({
-              title: '提示',
-              message: '执行成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.nodeDialogVisible = false
-            // 子页面向父级页面传递值
-            window.parent.postMessage({
-              cmd: 'returnHeight',
-              params: {
-                // 操作成功，告诉父级页面关闭弹框
-                code: 1
-              }
-            }, '*')
-          }
-        })
-      }
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
     }
   }
+}
 </script>
 
 <style scoped>
-  .span-sty {
-    width: 130px !important;
-  }
+.span-sty {
+  width: 130px !important;
+}
 
-  .addinputInfo {
-    margin-left: 120px !important;
-  }
+.addinputInfo {
+  margin-left: 120px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue
index a56f465ffa..597fd95465 100644
--- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue
@@ -14,13 +14,13 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
               <el-form-item label="商品ID" class="searchlist">
-                <el-input v-model="listQuery.params.goodsID" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsID" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品编码" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="商品名称" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable/>
               </el-form-item>
 
             </el-form>
@@ -35,26 +35,25 @@
           <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
         </div>
         <div class="">
-          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%"
-            @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center" />
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center" />
-            <el-table-column prop="goodsID" label="商品ID" align="center" />
-            <el-table-column prop="goodsSkuTitle" label="商品名称" align="center" />
-            <el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
-            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
-            <el-table-column prop="unit" label="单位" align="center" />
-            <el-table-column prop="warehouseName" label="仓库" align="center" />
-            <el-table-column prop="warehouseArea" label="库区" align="center" />
-            <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-            <el-table-column prop="count" label="库存数量" align="center" />
+          <el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column width="50px" type="selection" align="center"/>
+            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column prop="goodsID" label="商品ID" align="center"/>
+            <el-table-column prop="goodsSkuTitle" label="商品名称" align="center"/>
+            <el-table-column prop="goodsSkuCode" label="商品编码" align="center"/>
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center"/>
+            <el-table-column prop="unit" label="单位" align="center"/>
+            <el-table-column prop="warehouseName" label="仓库" align="center"/>
+            <el-table-column prop="warehouseZoneName" label="区域" align="center"/>
+            <el-table-column prop="warehouseArea" label="库区" align="center"/>
+            <el-table-column prop="warehouseRackCode" label="库位" align="center"/>
+            <el-table-column prop="count" label="库存数量" align="center"/>
           </el-table>
         </div>
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!-- 翻页 -->
-          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
@@ -62,111 +61,112 @@
 </template>
 
 <script>
-  import Pagination from '@/components/pagination'
-  import req from '@/api/storage/allocation.js'
-  export default {
-    name: 'SelectVehicle',
-    components: {
-      Pagination
-    },
-    data() {
-      return {
-        isSearchShow: false,
-        searchxianshitit: '隐藏查询条件',
-        tableKey: 0,
-        sids: [],
-        list: [],
-        number: '',
-        listLoading: false,
-        listQuery: {
-          current: 1,
-          size: 10,
-          params: {
-            deptSid: '',
-            goodsID: '',
-            goodsSkuTitle: '',
-            goodsSkuCode: '',
-          },
-          total: 0
-        }
+import Pagination from '@/components/pagination'
+import req from '@/api/storage/allocation.js'
+
+export default {
+  name: 'SelectVehicle',
+  components: {
+    Pagination
+  },
+  data() {
+    return {
+      isSearchShow: false,
+      searchxianshitit: '隐藏查询条件',
+      tableKey: 0,
+      sids: [],
+      list: [],
+      number: '',
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 10,
+        params: {
+          deptSid: '',
+          goodsID: '',
+          goodsSkuTitle: '',
+          goodsSkuCode: ''
+        },
+        total: 0
       }
+    }
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
     },
-    methods: {
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      req.getGoods(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.listQuery.total = response.data.total
+          this.list = response.data.records
         }
-      },
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      getList() {
-        this.listLoading = true
-        req.getGoods(this.listQuery).then((response) => {
-          this.listLoading = false
-          if (response.success) {
-            this.listQuery.total = response.data.total
-            this.list = response.data.records
-          }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 重置按钮
+    handleReset() {
+      this.listQuery.current = 1
+      this.listQuery.size = 10
+      this.listQuery.total = 0
+      this.listQuery.params.goodsID = ''
+      this.listQuery.params.goodsSkuTitle = ''
+      this.listQuery.params.goodsSkuCode = ''
+      this.getList()
+    },
+    handleSelectionChange(row) {
+      this.sids = row
+    },
+    showData(value, deptSid) {
+      // const aa = []
+      // if (value.length > 0) {
+      //   for (var i = 0; i < value.length; i++) {
+      //     aa.push(value[i].saleVehSid)
+      //   }
+      //   this.listQuery.params.saleVehSids = aa
+      // } else {
+      //   this.listQuery.params.saleVehSids = []
+      // }``
+      this.listQuery.params.deptSid = deptSid
+      this.getList()
+    },
+    // 添加修改返回
+    AddUpdateReturn() {
+      if (this.sids.length > 0) {
+        this.$emit('backData', this.sids)
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '请至少选择一条记录进行操作',
+          type: 'error',
+          duration: 2000
         })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-      // 重置按钮
-      handleReset() {
-        this.listQuery.current = 1
-        this.listQuery.size = 10
-        this.listQuery.total = 0
-        this.listQuery.params.goodsID = ''
-        this.listQuery.params.goodsSkuTitle = ''
-        this.listQuery.params.goodsSkuCode = ''
-        this.getList()
-      },
-      handleSelectionChange(row) {
-        this.sids = row
-      },
-      showData(value, deptSid) {
-        // const aa = []
-        // if (value.length > 0) {
-        //   for (var i = 0; i < value.length; i++) {
-        //     aa.push(value[i].saleVehSid)
-        //   }
-        //   this.listQuery.params.saleVehSids = aa
-        // } else {
-        //   this.listQuery.params.saleVehSids = []
-        // }``
-        this.listQuery.params.deptSid = deptSid
-        this.getList()
-      },
-      // 添加修改返回
-      AddUpdateReturn() {
-        if (this.sids.length > 0) {
-          this.$emit('backData', this.sids)
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '请至少选择一条记录进行操作',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      },
-      // 返回
-      handleReturn() {
-        this.$emit('doback')
       }
+    },
+    // 返回
+    handleReturn() {
+      this.$emit('doback')
     }
   }
+}
 </script>
 <style scoped>
 </style>