From 53b45a5648426a973574671543eb27113959eb43 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 17 Apr 2025 15:10:56 +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(=E4=B8=80=E7=BA=A7=E7=AB=99=E5=86=85)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../storage/allocation/allocationAdd.vue      | 989 +++++++-----------
 .../storage/allocation/allocationInfo.vue     | 282 ++---
 .../src/views/storage/allocation/index.vue    | 814 +++++++-------
 .../allocation/relation/chooseproducts.vue    | 235 +++--
 .../allocationFlow/allocationDaiBan.vue       | 672 ++++++------
 .../allocationFlow/allocationEdit.vue         | 849 ++++++---------
 .../allocationFlow/allocationYiBan.vue        | 304 +++---
 .../relation/chooseproducts.vue               | 236 +++--
 8 files changed, 1927 insertions(+), 2454 deletions(-)

diff --git a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
index 9d823ef5d4..2cb00f1ce9 100644
--- a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
+++ b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue
@@ -10,29 +10,8 @@
         </div>
       </div>
       <div class="listconadd">
-
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-          <!-- <div style="display: flex;flex-direction: row;align-items: center;padding: 10px;">
-
-            <div>
-              <span>调出门店：</span>
-              <el-select v-model="commodityQuery.params.inOrg" placeholder="请选择" @change="selectOutOrg">
-                <el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
-                </el-option>
-              </el-select>
-            </div>
-            <div style="margin-left: 30px;">
-              <span>调入门店：</span>
-              <el-select v-model="commodityQuery.params.outOrg" placeholder="请选择" @change="selectInOrg">
-                <el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
-                </el-option>
-              </el-select>
-            </div>
-
-          </div> -->
-
           <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>
@@ -43,31 +22,18 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">申请日期</div>
-              <span class="addinputInfo">{{ formobj.createTime }}</span>
-              </el-form-item>
+              <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>
             </el-col>
-            <!-- <el-col :span="4">
-              <div class="span-sty2"><span class="must">*</span> 调入分公司</div>
-              <el-form-item prop="inOrgName"> <el-select v-model="formobj.inOrgName" placeholder="请选择分公司"
-                  @change="selectInOrg" class="addinputInfo2 addinputw2">
-                  <el-option v-for="(item,i) in orgList" :key="i" :label="item.name" :value="item.sid">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 调入站点</div>
               <el-form-item prop="inPlatName">
-                <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName"
-                  class="addinputInfo addinputw">
+                <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName" class="addinputInfo addinputw">
                   <el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
@@ -75,651 +41,432 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 经办人</div>
-              <el-form-item prop="confirmName"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable
-                  @change="selectOperatorName" class="addinputInfo addinputw">
+              <el-form-item prop="confirmName">
+                <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable @change="selectOperatorName" class="addinputInfo addinputw">
                   <el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="24">
               <div class="span-sty">备注</div>
-              <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
-                  type="textarea" :rows="4" clearable /></el-form-item>
+              <el-form-item>
+                <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
+              </el-form-item>
             </el-col>
           </el-row>
-
-
           <div class="title titleOne">
             <div>调拨商品列表</div>
             <el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button>
           </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 align="center" width="70" :render-header="commodityHeader">
-              <template slot-scope="scope">
-                <i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
-              </template>
-            </el-table-column>
-            <el-table-column label="商品名称" align="center" min-width="200">
-              <template slot-scope="scope">
-                <el-popover placement="right" width="900" trigger="click">
-                  <div>
-                    <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
-                      @current-change="commodityCurrentChange($event, scope.row)">
-                      <el-table-column fixed 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="仓库" align="center" />
-                      <el-table-column prop="warehouseRackCode" label="库位" align="center" />
-                      <el-table-column prop="count" label="库存数量" align="center" />
-                    </el-table>
-                    <pagination v-show="commodityData.length > 0" :total="commodityQuery.total"
-                      :limit.sync="commodityQuery.size" class="pagination"
-                      @pagination="commodityInput(scope.row.goodsSpuName)" />
-                  </div>
-                  <el-input slot="reference" v-model="scope.row.goodsSpuName"
-                    @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称" />
-                </el-popover>
-              </template>
-            </el-table-column> -->
+          <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 fixed label="操作" wid align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="deleteGoods(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="goodsID" label="商品ID" width="100" align="center" />
-            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
-            <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="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="goodsID" label="商品ID" width="100" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center"/>
+            <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="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">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.markUpRatio" clearable placeholder=""
-                  oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')"
-                  @input="commodityComputeYHAndXSJE(scope.row)" />
-              </template>
-            </el-table-column>
-            <!-- <el-table-column label="调入仓库" align="center" width="200">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.inWarehouseName" placeholder="请选择"
-                  @change="selectWarehouseName(scope.row,$event)">
-                  <el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
-                  </el-option>
-                </el-select>
+                <el-input v-model="scope.row.markUpRatio" clearable placeholder="" oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')" @input="commodityComputeYHAndXSJE(scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="调入库位" align="center" width="150">
-              <template slot-scope="scope">
-                <el-select v-model="scope.row.inWarehouseRackCode" placeholder="请选择"
-                  @change="selectWarehouseAreaCode(scope.row,$event)">
-                  <el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column> -->
-            <el-table-column prop="requAmount" label="调拨单价" align="center" width="100" />
+            <el-table-column prop="requAmount" label="调拨单价" align="center" width="100"/>
             <el-table-column prop="count" label="调拨数量" width="120" align="center">
               <template slot-scope="scope">
-                <el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable
-                  placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+                <el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
               </template>
             </el-table-column>
-            <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
+            <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
           </el-table>
         </el-form>
       </div>
     </div>
     <!-- 选择商品 -->
-    <chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
+    <chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  import chooseproducts from './relation/chooseproducts'
-  import {
-    getCurrentDate
-  } from '@/utils/index.js'
-  import {
-    getOrgSidByPath,
-    fetchBySid,
-    fetchByDepSid,
-    selectOrgSidList,
-    getServiceStationByOrgSid,
-    selAllByOrgSidPath,
-    tranOne, // 调出一级站-调入当前一级站内所有二级站
-    tranfour, // 调出二级站-调入上级一级站内所有二级站，不包含自身
-  } from '@/api/Common/dictcommons'
-  export default {
-    components: {
-      chooseproducts,
-    },
-    data() {
-      return {
-        viewTitle: '',
-        viewState: 1,
-        submitdisabled: false,
-        activeNames: '1',
-        index: 0,
-        formobj: {
-          "sid": "",
-          "billNo": "",
-          "useOrgSid": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "outOrgName": '',
-          "outOrgSid": '',
-          "outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "inOrgName": '',
-          "inOrgSid": '',
-          "inPlatName": "",
-          "inPlatSid": "",
-          "inOrgAttributeKey": "",
-          "inOrgAttributeValue": "",
-          "confirmName": "",
-          "confirmSid": "",
-          "remarks": "",
-          "grade": "1",
-          "createOrgSid": "",
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "待提交",
-          "taskId": "",
-          "wmsInventoryAllocateBillDetailNewList": []
-        },
-        rules: {
-          inOrgName: [{
-            required: true,
-            message: '调入分公司不能为空',
-            trigger: 'change'
-          }],
-          inPlatName: [{
-            required: true,
-            message: '调入站点不能为空',
-            trigger: 'change'
-          }],
-          confirmName: [{
-            required: true,
-            message: '经办人不能为空',
-            trigger: 'change'
-          }],
-        },
-        orgList: [],
-        deptList: [],
-        operatorNameList: [],
-        warehouseList: [],
-        warehouseRackList: []
-      }
-    },
-    methods: {
-      init() {
-
-        getOrgSidByPath({
-          orgPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((resp) => {
-          if (resp.success) {
-            this.formobj.createOrgSid = resp.data
-            this.formobj.inOrgSid = resp.data
-            this.formobj.outOrgSid = resp.data
-            fetchBySid(resp.data).then((respsone) => {
-              if (respsone.success) {
-                this.formobj.inOrgName = respsone.data.name
-                this.formobj.outOrgName = respsone.data.name
-              }
-            })
-          }
-        })
-
-        fetchByDepSid({
-          sid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
-        }).then((respsone) => {
-          if (respsone.success) {
-            console.log("fetchByDepSid", respsone.data);
-
-            //  一级站
-            if (respsone.data.orgAttributeKey == 'fwz_001') {
-              // 调出一级站-调入当前一级站内所有二级站
-              tranOne(window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-                .getItem('defaultOrgPath').lastIndexOf('/') + 1)).then((resp) => {
-                if (resp.success) {
-                  console.log("tranOne", resp);
-                  this.deptList = resp.data
-                }
-              })
-            } else { //  二级站
-              // 调出二级站-调入上级一级站内所有二级站，不包含自身
-              tranfour(window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-                .getItem('defaultOrgPath').lastIndexOf('/') + 1)).then((resp) => {
-                if (resp.success) {
-                  console.log("tranfour", resp);
-                  this.deptList = resp.data
-                }
-              })
-            }
-
-          }
-        })
-
-        selectOrgSidList().then((res) => {
-          if (res.success) {
-            console.log("selectOrgSidList", res);
-            this.orgList = res.data
-          }
-        })
-
-        selAllByOrgSidPath({
-          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
-        }).then((res) => {
-          if (res.success) {
-            console.log("selAllByOrgSidPath", res);
-            this.operatorNameList = res.data
-          }
-        })
-
+import req from '@/api/storage/allocation.js'
+import chooseproducts from './relation/chooseproducts'
+import {
+  getCurrentDate
+} from '@/utils/index.js'
+import {
+  getOrgSidByPath,
+  fetchBySid,
+  fetchByDepSid,
+  selAllByOrgSidPath,
+  tranOne, // 调出一级站-调入当前一级站内所有二级站
+  tranfour // 调出二级站-调入上级一级站内所有二级站，不包含自身
+} from '@/api/Common/dictcommons'
+
+export default {
+  components: {
+    chooseproducts
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      activeNames: '1',
+      index: 0,
+      formobj: {
+        sid: '',
+        billNo: '',
+        useOrgSid: '',
+        createBySid: window.sessionStorage.getItem('userSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        createTime: getCurrentDate(),
+        outOrgName: '',
+        outOrgSid: '',
+        outPlatName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        outPlatSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        inOrgName: '',
+        inOrgSid: '',
+        inPlatName: '',
+        inPlatSid: '',
+        inOrgAttributeKey: '',
+        inOrgAttributeValue: '',
+        confirmName: '',
+        confirmSid: '',
+        remarks: '',
+        grade: '1',
+        createOrgSid: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '待提交',
+        taskId: '',
+        wmsInventoryAllocateBillDetailNewList: []
       },
-      // 合计
-      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
+      rules: {
+        inPlatName: [{ required: true, message: '调入站点不能为空', trigger: 'change' }],
+        confirmName: [{ required: true, message: '经办人不能为空', trigger: 'change' }]
+      },
+      deptList: [],
+      operatorNameList: []
+    }
+  },
+  methods: {
+    init() {
+      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+        if (resp.success) {
+          this.formobj.createOrgSid = resp.data
+          this.formobj.inOrgSid = resp.data
+          this.formobj.outOrgSid = resp.data
+          fetchBySid(resp.data).then((respsone) => {
+            if (respsone.success) {
+              this.formobj.inOrgName = respsone.data.name
+              this.formobj.outOrgName = respsone.data.name
+            }
+          })
+        }
+      })
+
+      fetchByDepSid({ sid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((respsone) => {
+        if (respsone.success) {
+          //  一级站
+          if (respsone.data.orgAttributeKey === 'fwz_001') {
+            // 调出一级站-调入当前一级站内所有二级站
+            tranOne(window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)).then((resp) => {
+              if (resp.success) {
+                this.deptList = resp.data
               }
-            }, 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
+            })
+          } else { //  二级站
+            // 调出二级站-调入上级一级站内所有二级站，不包含自身
+            tranfour(window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)).then((resp) => {
+              if (resp.success) {
+                this.deptList = resp.data
               }
-            }, 0)
-            sums[index] += ''
-          }
-        })
-        return sums
-      },
-
-      selectInOrg(val) {
-        console.log("selectInOrg", val);
-
-        const choose = this.orgList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        this.formobj.inOrgSid = choose[0].sid
-        this.formobj.inOrgName = choose[0].name
-
-        getServiceStationByOrgSid(choose[0].sid).then((res) => {
-          if (res.success) {
-            this.formobj.inDeptSid = ''
-            this.formobj.inDeptName = ''
-            this.formobj.inOrgAttributeKey = ''
-            this.formobj.inOrgAttributeValue = ''
-            console.log("getListDeptByOrgSid", res);
-            this.deptList = res.data
+            })
           }
-        })
-
-      },
-
-      selectInDeptName(val) {
-        console.log("selectInDeptName", val);
-
-        const choose = this.deptList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInDeptName', choose)
-        this.formobj.inPlatSid = choose[0].sid
-        this.formobj.inPlatName = choose[0].name
-        this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
-        this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
-
-      },
-      selectOperatorName(val) {
-        console.log("selectOperatorName", val);
-        const choose = this.operatorNameList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectOutOrg', choose)
-        this.formobj.confirmSid = choose[0].sid
-        this.formobj.confirmName = choose[0].name
-      },
-
-      getWarehouseAreaList(sid) {
-        var query = {
-          ckSid: sid
         }
-        req.getWarehouseareas(query).then((res) => {
-          if (res.success) {
-            this.warehouseRackList = res.data
-
-            console.log("aaaaaa", this.warehouseRackList);
-
-          }
-        })
-      },
-      selectWarehouseName(row, val) {
-        console.log("selectWarehouseName", row);
-        console.log("selectWarehouseName", val);
-
-        const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        row.inWarehouseSid = choose[0].sid
-        row.inWarehouseName = choose[0].warehouseName
-        row.inWarehouseRackSid = ''
-        row.inWarehouseRackCode = ''
-
-
-        this.getWarehouseAreaList(val)
-      },
-      selectWarehouseAreaCode(row, val) {
-        console.log("selectWarehouseAreaCode", row);
-        console.log("selectWarehouseAreaCode", val);
-
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        row.inWarehouseRackSid = choose[0].sid
-        row.inWarehouseRackCode = choose[0].areaCode
-
-      },
-      showAdd() {
-
-        this.init(),
-          this.viewTitle = '【新增】商品调拨申请'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-      },
-      showEdit(sid) {
-
-        this.init()
-
-        this.viewTitle = '【修改】商品调拨申请'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        req.init(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-          }
-        })
-      },
-
-      backData(value) {
-        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,
-            })
-          })
+      })
+      selAllByOrgSidPath({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.operatorNameList = res.data
         }
-      },
-      deleteGoods(index) {
-        this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      seleGoods() {
-        this.viewState = 2
-        const aa = []
-        this.$refs['divSp'].showData(aa, this.formobj.deptSid)
-      },
-
-      // 计算调拨单、调拨金额
-      commodityComputeYHAndXSJE(row) {
-        console.log("commodityComputeYHAndXSJE", row);
-        row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2)
-        row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
-      },
-      // 计算调拨金额
-      commodityComputeYHAndXSJE2(row) {
-
-        if (Number(row.stockCount) < Number(row.count)) {
-          row.count = Number(row.stockCount)
-        } else {
-          row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
+      })
+    },
+    // 合计
+    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
+    },
+    selectInDeptName(val) {
+      const choose = this.deptList.filter((item) => item.sid === val)
+      this.formobj.inPlatSid = choose[0].sid
+      this.formobj.inPlatName = choose[0].name
+      this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
+      this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
+    },
+    selectOperatorName(val) {
+      const choose = this.operatorNameList.filter((item) => item.sid === val)
+      this.formobj.confirmSid = choose[0].sid
+      this.formobj.confirmName = choose[0].name
+    },
+    showAdd() {
+      this.init()
+      this.viewTitle = '【新增】商品调拨申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+    },
+    showEdit(sid) {
+      this.init()
+      this.viewTitle = '【编辑】商品调拨申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+        }
+      })
+    },
 
-      },
-      saveOrUpdate() {
-        console.log("saveOrUpdate", this.formobj);
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.save(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
+    backData(value) {
+      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,
+            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
+          })
+        })
+      }
+    },
+    deleteGoods(index) {
+      this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    seleGoods() {
+      this.viewState = 2
+      const aa = []
+      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
+    },
+    // 计算调拨单、调拨金额
+    commodityComputeYHAndXSJE(row) {
+      row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2)
+      row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
+    },
+    // 计算调拨金额
+    commodityComputeYHAndXSJE2(row) {
+      if (Number(row.stockCount) < Number(row.count)) {
+        row.count = Number(row.stockCount)
+      } else {
+        row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              this.handleReturn('true')
+            } else {
               this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    confirm() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          if (this.formobj.wmsInventoryAllocateBillDetailNewList.length === 0) {
+            this.$message({
+              type: 'warning',
+              showClose: true,
+              message: '调拨商品不能为空'
             })
+            return
           }
-        })
-      },
-      confirm() {
-        console.log("saveOrUpdate", this.formobj);
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-
-            if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
+          for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
+            var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
+            if (Number(item.count) === 0) {
               this.$message({
-                type: "warning",
+                type: 'warning',
                 showClose: true,
-                message: '调拨商品不能为空'
+                message: '调拨数量不能为空或0'
               })
               return
             }
-
-            for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
-              var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
-
-              if (Number(item.count) == 0) {
-                this.$message({
-                  type: "warning",
-                  showClose: true,
-                  message: '调拨数量不能为空或0'
-                })
-                return
-              }
-
-            }
-
-            this.submitdisabled = true
-            req.allocation(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '调拨成功'
-                })
-                this.handleReturn('true')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
           }
-        })
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-          "sid": "",
-          "billNo": "",
-          "useOrgSid": "",
-          "createBySid": window.sessionStorage.getItem('userSid'),
-          "createByName": window.sessionStorage.getItem('name'),
-          "deptName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "createTime": getCurrentDate(),
-          "outOrgName": '',
-          "outOrgSid": '',
-          "outPlatName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "outPlatSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
-          "inOrgName": '',
-          "inOrgSid": '',
-          "inPlatName": "",
-          "inPlatSid": "",
-          "inOrgAttributeKey": "",
-          "inOrgAttributeValue": "",
-          "confirmName": "",
-          "confirmSid": "",
-          "remarks": "",
-          "grade": "1",
-          "createOrgSid": "",
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "待提交",
-          "taskId": "",
-          "wmsInventoryAllocateBillDetailNewList": []
+          this.submitdisabled = true
+          req.allocation(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '调拨成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
         }
-        this.submitdisabled = false
-        this.$emit('doback')
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sid: '',
+        billNo: '',
+        useOrgSid: '',
+        createBySid: window.sessionStorage.getItem('userSid'),
+        createByName: window.sessionStorage.getItem('name'),
+        deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        createTime: getCurrentDate(),
+        outOrgName: '',
+        outOrgSid: '',
+        outPlatName: window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
+        outPlatSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1),
+        inOrgName: '',
+        inOrgSid: '',
+        inPlatName: '',
+        inPlatSid: '',
+        inOrgAttributeKey: '',
+        inOrgAttributeValue: '',
+        confirmName: '',
+        confirmSid: '',
+        remarks: '',
+        grade: '1',
+        createOrgSid: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '待提交',
+        taskId: '',
+        wmsInventoryAllocateBillDetailNewList: []
       }
+      this.submitdisabled = false
+      this.$emit('doback')
     }
   }
+}
 </script>
 
 <style scoped>
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .span-sty2 {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    line-height: 42px;
-    text-align: right;
-    font-size: 14px;
-    color: #606266;
-    font-weight: 600;
-    width: 70px;
-    padding-right: 5px;
-    border-right: 1px solid #e0e3eb;
-    width: 110px !important;
-  }
-
-  .addinputInfo2 {
-    margin-left: 110px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw2 {
-    margin-left: 110px !important;
-    width: calc(100% - 105px);
-  }
-
-
-
-  .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;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-    display: inline;
-    line-height: 1px;
-    vertical-align: middle;
-  }
+.formaddcopy02 .el-row .el-col /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;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue b/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue
index 82da4975ec..7108018587 100644
--- a/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue
+++ b/yxt-as-ui/src/views/storage/allocation/allocationInfo.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,144 @@
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  export default {
-    data() {
-      return {
-        index: 0,
-        formobj: {},
+import req from '@/api/storage/allocation.js'
+
+export default {
+  data() {
+    return {
+      index: 0,
+      formobj: {
+        sid: '',
+        billNo: '',
+        useOrgSid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        outOrgName: '',
+        outOrgSid: '',
+        outPlatName: '',
+        outPlatSid: '',
+        inOrgName: '',
+        inOrgSid: '',
+        inPlatName: '',
+        inPlatSid: '',
+        inOrgAttributeKey: '',
+        inOrgAttributeValue: '',
+        confirmName: '',
+        confirmSid: '',
+        remarks: '',
+        grade: '',
+        createOrgSid: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        wmsInventoryAllocateBillDetailNewList: []
       }
+    }
+  },
+  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
     },
-
-    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 = {
-
+    showInfo(sid) {
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
         }
-        this.$emit('doback')
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        billNo: '',
+        useOrgSid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        outOrgName: '',
+        outOrgSid: '',
+        outPlatName: '',
+        outPlatSid: '',
+        inOrgName: '',
+        inOrgSid: '',
+        inPlatName: '',
+        inPlatSid: '',
+        inOrgAttributeKey: '',
+        inOrgAttributeValue: '',
+        confirmName: '',
+        confirmSid: '',
+        remarks: '',
+        grade: '',
+        createOrgSid: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        wmsInventoryAllocateBillDetailNewList: []
       }
+      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;
+}
+.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;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/allocation/index.vue b/yxt-as-ui/src/views/storage/allocation/index.vue
index 408dde9d32..82174d5fec 100644
--- a/yxt-as-ui/src/views/storage/allocation/index.vue
+++ b/yxt-as-ui/src/views/storage/allocation/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <button-bar ref="btnbar" view-title="调拨列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <button-bar ref="btnbar" view-title="调拨列表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="main-content">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">
@@ -9,48 +9,39 @@
           </el-button>
           <div v-show="isSearchShow" class="search">
             <el-form :inline="true" class="tab-header">
-
               <el-form-item label="申请部门">
-                <el-input v-model="queryParams.params.deptName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.deptName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请人">
-                <el-input v-model="queryParams.params.createByName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.createByName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="单据编号">
-                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="单据日期">
-                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
-                至
-                <el-date-picker v-model="queryParams.params.createDateStart" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker v-model="queryParams.params.createStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.createDateStart" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
               <el-form-item label="办结日期">
-                <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
-                至
-                <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
+                <el-date-picker v-model="queryParams.params.finishStartTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.finishEndTime" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
               </el-form-item>
               <el-form-item label="调出分公司">
-                <el-input v-model="queryParams.params.outOrgName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.outOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="调出站">
-                <el-input v-model="queryParams.params.outPlatName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.outPlatName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="调入分公司">
-                <el-input v-model="queryParams.params.inOrgName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.inOrgName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="调入站">
-                <el-input v-model="queryParams.params.inPlatName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.inPlatName" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="经办人">
-                <el-input v-model="queryParams.params.confirmName" placeholder="" clearable />
+                <el-input v-model="queryParams.params.confirmName" placeholder="" clearable/>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -66,510 +57,455 @@
         <!-- End 项目列表头部 -->
         <!-- Start 项目列表 -->
         <div class="">
-          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
-            @selection-change="selectionLineChangeHandle">
-            <el-table-column fixed width="50" type="selection" align="center" />
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
+            <el-table-column fixed width="50" type="selection" align="center"/>
             <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
             <el-table-column fixed label="操作" align="center" width="150">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
-                  @click="toRelevancy(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toRelevancy(scope.row)">办理
+                </el-button>
                 <el-button type="primary" size="mini" @click="toDetails(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="nodeState" label="流程状态" align="center" />
-            <el-table-column prop="billNo" label="单据编号" align="center" />
-            <el-table-column prop="createByName" label="申请人" align="center" />
-            <el-table-column prop="createTime" label="申请日期" align="center" />
-            <!-- <el-table-column prop="state" label="完成标志" align="center" /> -->
-            <!--      <el-table-column label="完成标志" align="center" width="180">
-              <template slot-scope="scope">
-                <span>{{scope.row.state=='1'?'未完成':'已完成'}}</span>
-              </template>
-            </el-table-column> -->
-            <el-table-column prop="finishTime" label="办结日期" align="center" />
-            <el-table-column prop="createOrgName" label="调出分公司" align="center" />
-            <el-table-column prop="outPlatName" label="调出站" align="center" />
-            <el-table-column prop="inOrgName" label="调入分公司" align="center" />
-            <el-table-column prop="inPlatName" label="调入站" align="center" />
-            <el-table-column prop="confirmName" label="经办人" align="center" />
-            <el-table-column prop="count" label="调拨数量" align="center" />
-            <el-table-column prop="amount" label="调拨金额" align="center" />
+            <el-table-column prop="nodeState" label="流程状态" align="center" width="100" />
+            <el-table-column prop="billNo" label="单据编号" align="center" width="180" />
+            <el-table-column prop="createByName" label="申请人" align="center" width="100" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
+            <el-table-column prop="createOrgName" label="调出分公司" align="center" width="150" />
+            <el-table-column prop="outPlatName" label="调出站" align="center" width="150" />
+            <el-table-column prop="inOrgName" label="调入分公司" align="center" width="150" />
+            <el-table-column prop="inPlatName" label="调入站" align="center" width="150" />
+            <el-table-column prop="confirmName" label="经办人" align="center" width="100" />
+            <el-table-column prop="count" label="调拨数量" align="center" width="120" />
+            <el-table-column prop="amount" label="调拨金额" align="center" width="120" />
           </el-table>
         </div>
         <!-- End 项目列表 -->
         <div class="pages">
-          <div class="tit" />
+          <div class="tit"/>
           <!--  翻页  -->
-          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
-            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
         </div>
       </div>
     </div>
     <!-- End 查询和其列表部分 -->
     <!-- 新增修改部分组件 -->
-    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
-    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList"/>
+    <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList"/>
 
-    <el-dialog title="补充物流信息" :visible.sync="dialogVisible" :before-close="handleClose"
-      style="width:120%;margin-left: -10%;">
+    <el-dialog title="补充物流信息" :visible.sync="dialogVisible" :before-close="handleClose" style="width:120%;margin-left: -10%;">
       <el-form ref="dataForm" class="formaddcopy02" style="margin-top: -40px;" :model="formobj">
         <el-row class="first_row">
           <el-col :span="24">
             <div class="span-sty">送货方式</div>
-            <el-form-item> <el-select v-model="formobj.deliveryKey" placeholder="请选择送货方式" @change="selectDeliveryKey"
-                class="addinputInfo">
+            <el-form-item>
+              <el-select v-model="formobj.deliveryKey" placeholder="请选择送货方式" @change="selectDeliveryKey" class="addinputInfo">
                 <el-option v-for="(item,i) in deliveryKeyList" :key="i" :label="item.name" :value="item.sid">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row v-show="formobj.deliveryKey==1">
           <el-col :span="8">
             <div class="span-sty">快递单号</div>
-            <el-form-item><el-input v-model="formobj.expressBillNo" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.expressBillNo" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">快递公司</div>
-            <el-form-item><el-input v-model="formobj.expressCompany" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.expressCompany" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">备注</div>
-            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
         </el-row>
-
         <el-row v-show="formobj.deliveryKey==2">
           <el-col :span="8">
             <div class="span-sty">取货人</div>
-            <el-form-item><el-input v-model="formobj.pickUpName" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.pickUpName" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">取货日期</div>
-            <el-form-item> <el-date-picker v-model="formobj.pickUpDate" type="date" class="addinputw addinputInfo"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
+            <el-form-item>
+              <el-date-picker v-model="formobj.pickUpDate" type="date" class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">备注</div>
-            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
         </el-row>
-
         <el-row v-show="formobj.deliveryKey==3">
           <el-col :span="8">
             <div class="span-sty">送货人</div>
-            <el-form-item><el-input v-model="formobj.deliveryPerson" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.deliveryPerson" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">送达日期</div>
-            <el-form-item> <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputw addinputInfo"
-                value-format="yyyy-MM-dd" placeholder="选择日期">
+            <el-form-item>
+              <el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">备注</div>
-            <el-form-item><el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
-                clearable /></el-form-item>
+            <el-form-item>
+              <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" clearable/>
+            </el-form-item>
           </el-col>
         </el-row>
-
       </el-form>
-
       <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
         <el-button type="primary" style="margin-top: 20px;" @click="saveData">确 定</el-button>
       </div>
-
     </el-dialog>
-
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  import ButtonBar from '@/components/ButtonBar'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import divAdd from './allocationAdd.vue'
-  import divInfo from './allocationInfo.vue'
-  export default {
-    components: {
-      ButtonBar,
-      Pagination,
-      pageye,
-      divAdd,
-      divInfo
-    },
-    data() {
-      return {
-        dialogVisible: false,
-        btndisabled: false,
-        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        tableLoading: false,
-        dataList: [],
-        btnList: [{
-            type: 'primary',
-            size: 'small',
-            icon: 'plus',
-            btnKey: 'toAdd',
-            btnLabel: '新增'
-          },
-
-          {
-            type: 'danger',
-            size: 'small',
-            icon: 'el-icon-delete',
-            btnKey: 'doDel',
-            btnLabel: '删除'
-          },
-          {
-            type: 'primary',
-            size: 'small',
-            icon: 'edit',
-            btnKey: 'toSupplement',
-            btnLabel: '补充物流信息'
-          },
-          {
-            type: 'info',
-            size: 'small',
-            icon: 'cross',
-            btnKey: 'doClose',
-            btnLabel: '关闭'
-          }
-        ],
-        queryParams: {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "outOrgName": "",
-            "deptName": "",
-            "createByName": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "finishStartTime": "",
-            "finishEndTime": "",
-            "outPlatName": "",
-            "inOrgName": "",
-            "inPlatName": "",
-            "confirmName": "",
-            "grade": "1",
-
-          }
+import req from '@/api/storage/allocation.js'
+import ButtonBar from '@/components/ButtonBar'
+import Pagination from '@/components/pagination'
+import divAdd from './allocationAdd.vue'
+import divInfo from './allocationInfo.vue'
+
+export default {
+  components: {
+    ButtonBar,
+    Pagination,
+    divAdd,
+    divInfo
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      btndisabled: false,
+      viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      tableLoading: false,
+      dataList: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
         },
-        sids: [],
-        selectionList: [],
-        deliveryKeyList: [{
-            name: '快递',
-            sid: 1
-          },
-          {
-            name: '对方自取',
-            sid: 2
-          },
-          {
-            name: '我方送货',
-            sid: 3
-          }
-        ],
-        formobj: {
-          "sids": [],
-          "remarks": "",
-          "deliveryKey": "",
-          "deliveryName": "",
-          "expressBillNo": "",
-          "expressCompany": "",
-          "pickUpName": "",
-          "pickUpDate": "",
-          "deliveryPerson": "",
-          "deliveryDate": ""
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'el-icon-delete',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'edit',
+          btnKey: 'toSupplement',
+          btnLabel: '补充物流信息'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      queryParams: {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          outOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          outPlatName: '',
+          inOrgName: '',
+          inPlatName: '',
+          confirmName: '',
+          grade: '1',
+          orgpath: '',
+          menuUrl: '',
+          userSid: ''
+        }
+      },
+      sids: [],
+      selectionList: [],
+      deliveryKeyList: [
+        {
+          name: '快递',
+          sid: 1
+        },
+        {
+          name: '对方自取',
+          sid: 2
+        },
+        {
+          name: '我方送货',
+          sid: 3
         }
+      ],
+      formobj: {
+        sids: [],
+        remarks: '',
+        deliveryKey: '',
+        deliveryName: '',
+        expressBillNo: '',
+        expressCompany: '',
+        pickUpName: '',
+        pickUpDate: '',
+        deliveryPerson: '',
+        deliveryDate: ''
+      }
+    }
+  },
+  mounted() {
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  created() {
+    this.loadList()
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
       }
     },
-    mounted() {
-      this.$refs['btnbar'].setButtonList(this.btnList)
-    },
-    created() {
-      this.loadList()
+    btnHandle(btnKey) {
+      switch (btnKey) {
+        case 'toAdd':
+          this.toAdd()
+          break
+        case 'doDel':
+          this.doDel()
+          break
+        case 'toSupplement':
+          this.toSupplement()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
     },
-    methods: {
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
+    loadList() {
+      this.tableLoading = true
+      this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
+      this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.queryParams.params.menuUrl = this.$route.path
+      req.listPage(this.queryParams).then((resp) => {
+        this.tableLoading = false
+        if (resp.success) {
+          const data = resp.data
+          this.queryParams.total = data.total
+          this.dataList = data.records
         } else {
-          this.searchxianshitit = '显示查询条件'
-        }
-      },
-      btnHandle(btnKey) {
-        switch (btnKey) {
-          case 'toAdd':
-            this.toAdd()
-            break
-          case 'doDel':
-            this.doDel()
-            break
-          case 'toSupplement':
-            this.toSupplement()
-            break
-          case 'doClose':
-            this.doClose()
-            break
-          default:
-            break
+          // 根据resp.code进行异常情况处理
+          this.dataList = []
+          this.queryParams.total = 0
         }
-      },
-      loadList() {
-        this.tableLoading = true
-        this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
-        this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        this.queryParams.params.menuUrl = this.$route.path
-        req.listPage(this.queryParams).then((resp) => {
-          this.tableLoading = false
-          if (resp.success) {
-            const data = resp.data
-            this.queryParams.total = data.total
-            this.dataList = data.records
-          } else {
-            // 根据resp.code进行异常情况处理
-            this.dataList = []
-            this.queryParams.total = 0
-          }
-        }).catch(() => {
-          this.tableLoading = false
-        })
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      selectTime1() {
-
-      },
-      selectTime2() {
-
-      },
-
-      dosearch() {
-        this.queryParams.current = 1
-        this.loadList()
-      },
-      resetQuery() {
-        this.queryParams = {
-          current: 1,
-          size: 10,
-          total: 0,
-          params: {
-            "outOrgName": "",
-            "deptName": "",
-            "createByName": "",
-            "billNo": "",
-            "createStartTime": "",
-            "createEndTime": "",
-            "finishStartTime": "",
-            "finishEndTime": "",
-            "outPlatName": "",
-            "inOrgName": "",
-            "inPlatName": "",
-            "confirmName": "",
-            "grade": "1",
-          }
+      }).catch(() => {
+        this.tableLoading = false
+      })
+    },
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    dosearch() {
+      this.queryParams.current = 1
+      this.loadList()
+    },
+    resetQuery() {
+      this.queryParams = {
+        current: 1,
+        size: 10,
+        total: 0,
+        params: {
+          outOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          outPlatName: '',
+          inOrgName: '',
+          inPlatName: '',
+          confirmName: '',
+          grade: '1',
+          orgpath: '',
+          menuUrl: '',
+          userSid: ''
         }
-        this.loadList()
-      },
-      toAdd() {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-      },
-      doDel() {
-
-        if (this.sids.length > 0) {
-          const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-          this.$confirm(tip, '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          }).then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: 'Loading',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            })
-            req.deleteBySids(this.sids).then((resp) => {
-              loading.close()
-              if (resp.success) {
-                this.$message({
-                  type: 'success',
-                  message: resp.msg,
-                  showClose: true
-                })
-                this.loadList()
-              } else {
-                loading.close()
-                // 根据resp.code进行异常情况处理
-              }
-            }).catch(e => {
+      }
+      this.loadList()
+    },
+    toAdd() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+    },
+    doDel() {
+      if (this.sids.length > 0) {
+        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.deleteBySids(this.sids).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
               loading.close()
-            })
-          }).catch(() => {})
-        } else {
-          this.$message({
-            type: "warning",
-            showClose: true,
-            message: '请至少选择一条记录进行删除操作'
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
           })
-        }
-      },
-
-      selectionLineChangeHandle(val) {
-        console.log("val", val);
-
-        this.selectionList = val
-        const aa = []
-        val.forEach(element => {
-          aa.push(element.sid)
+        }).catch(() => {
         })
-        this.sids = aa
-      },
-      toRelevancy(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row.sid)
-      },
-      toDetails(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showAdd(row.sid)
-      },
-
-      toSupplement() {
-        if (this.sids.length > 0) {
-          this.dialogVisible = true
-
-          console.log("toSupplement", this.sids);
-
-        } else {
+      } else {
+        this.$message({
+          type: 'warning',
+          showClose: true,
+          message: '请至少选择一条记录进行删除操作'
+        })
+      }
+    },
+    selectionLineChangeHandle(val) {
+      this.selectionList = val
+      const aa = []
+      val.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    toRelevancy(row) {
+      this.viewState = 3
+      this.$refs['divadd'].showEdit(row.sid)
+    },
+    toDetails(row) {
+      this.viewState = 4
+      this.$refs['divinfo'].showInfo(row.sid)
+    },
+    toSupplement() {
+      if (this.sids.length > 0) {
+        this.dialogVisible = true
+      } else {
+        this.$message({
+          type: 'warning',
+          showClose: true,
+          message: '请至少选择一条记录进行操作'
+        })
+      }
+    },
+    saveData() {
+      this.formobj.sids = this.sids
+      req.saveLogisticsInfo(this.formobj).then((resp) => {
+        if (resp.success) {
+          this.dialogVisible = false
           this.$message({
-            type: "warning",
-            showClose: true,
-            message: '请至少选择一条记录进行操作'
+            type: 'success',
+            message: resp.msg,
+            showClose: true
           })
-        }
-      },
-      saveData() {
-
-        this.formobj.sids = this.sids
-
-        req.saveLogisticsInfo(this.formobj).then((resp) => {
-          if (resp.success) {
-            this.dialogVisible = false
-            this.$message({
-              type: 'success',
-              message: resp.msg,
-              showClose: true
-            })
-            this.loadList()
-            this.formobj = {
-              "sids": [],
-              "remarks": "",
-              "deliveryKey": "",
-              "deliveryName": "",
-              "expressBillNo": "",
-              "expressCompany": "",
-              "pickUpName": "",
-              "pickUpDate": "",
-              "deliveryPerson": "",
-              "deliveryDate": ""
-            }
-          } else {
-            // 根据resp.code进行异常情况处理
+          this.loadList()
+          this.formobj = {
+            sids: [],
+            remarks: '',
+            deliveryKey: '',
+            deliveryName: '',
+            expressBillNo: '',
+            expressCompany: '',
+            pickUpName: '',
+            pickUpDate: '',
+            deliveryPerson: '',
+            deliveryDate: ''
           }
-        }).catch(e => {})
-
-
-      },
-      handleClose() {
-        this.dialogVisible = false
-      },
-      selectDeliveryKey(val) {
-        console.log("selectDeliveryKey", val);
-        const choose = this.deliveryKeyList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectDeliveryKey', choose)
-        this.formobj.deliveryName = choose[0].name
-        this.formobj.deliveryKey = choose[0].sid
-
-      },
-      doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
-      },
-
-      resetState() {
-        this.viewState = 1
-      },
-
+        } else {
+          // 根据resp.code进行异常情况处理
+        }
+      }).catch(e => {
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    selectDeliveryKey(val) {
+      const choose = this.deliveryKeyList.filter((item) => item.sid === val)
+      this.formobj.deliveryName = choose[0].name
+      this.formobj.deliveryKey = choose[0].sid
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    },
+    resetState() {
+      this.viewState = 1
     }
   }
+}
 </script>
 <style scoped>
-  /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 90px !important;
-  }
-
-  .addinputInfo {
-    margin-left: 80px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 80px !important;
-    width: calc(100% - 70px);
-  }
-
-
-  .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;
-  }
+.first_row {
+  border-top: 1px solid #E0E3EB;
+}
+.span-sty {
+  width: 90px !important;
+}
+.addinputInfo {
+  margin-left: 80px !important;
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 80px !important;
+  width: calc(100% - 70px);
+}
+/deep/ .el-form-item__error {
+  margin-left: 180px !important;
+}
 </style>
diff --git a/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue
index a56f465ffa..988b32bc54 100644
--- a/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/storage/allocation/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>
@@ -32,29 +32,27 @@
         </div>
         <div class="listtop">
           <div class="tit">商品列表</div>
-          <!--          <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 +60,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/allocationFlow/allocationDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.vue
index 12bd0759df..82ddef49be 100644
--- a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.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,39 +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">
@@ -109,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;">
@@ -119,354 +108,339 @@
         </div>
       </el-form>
     </el-dialog>
-
   </div>
 </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)
+    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
+        }
+      })
     },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 400 + 'px'
+    // 加签
+    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
+      })
     },
-    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()
+    // 同意
+    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
         }
-      },
-      /** 加签 */
-      handleCountersign() {
-        if (this.countersign.assignee === '') {
+        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/allocationFlow/allocationEdit.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue
index 954b5881b5..416ee61e3b 100644
--- a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue
@@ -9,11 +9,8 @@
         </div>
       </div>
       <div class="">
-
         <el-form ref="form_obj" :model="formobj" :rules="rules" 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>
@@ -24,13 +21,10 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty">申请日期</div>
-              <span class="addinputInfo">{{ formobj.createTime }}</span>
-              </el-form-item>
+              <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>
@@ -38,8 +32,7 @@
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 调入站点</div>
               <el-form-item prop="inPlatName">
-                <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName"
-                  class="addinputInfo addinputw">
+                <el-select v-model="formobj.inPlatName" placeholder="请选择调入站" @change="selectInDeptName" class="addinputInfo addinputw">
                   <el-option v-for="(item,i) in deptList" :key="i" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
@@ -47,571 +40,395 @@
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="must">*</span> 经办人</div>
-              <el-form-item prop="confirmName"> <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable
-                  @change="selectOperatorName" class="addinputInfo addinputw">
+              <el-form-item prop="confirmName">
+                <el-select v-model="formobj.confirmName" placeholder="请选择经办人" clearable @change="selectOperatorName" class="addinputInfo addinputw">
                   <el-option v-for="(item,i) in operatorNameList" :key="i" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="24">
               <div class="span-sty">备注</div>
-              <el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
-                  type="textarea" :rows="4" clearable /></el-form-item>
+              <el-form-item>
+                <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
+              </el-form-item>
             </el-col>
           </el-row>
-
-
           <div class="title titleOne">
             <div>调拨商品列表</div>
             <el-button type="primary" size="mini" class="btntopblueline" @click="seleGoods()">添加</el-button>
           </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 :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 fixed label="操作" wid align="center" width="100">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="deleteGoods(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="goodsID" label="商品ID" width="100" align="center" />
-            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center" />
-            <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="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="goodsID" label="商品ID" width="100" align="center"/>
+            <el-table-column prop="goodsSpuName" label="商品名称" width="100" align="center"/>
+            <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="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">
-                <el-input v-model="scope.row.markUpRatio" clearable placeholder=""
-                  oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')"
-                  @input="commodityComputeYHAndXSJE(scope.row)" />
+                <el-input v-model="scope.row.markUpRatio" clearable placeholder="" oninput="value=value.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')" @input="commodityComputeYHAndXSJE(scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column prop="requAmount" label="调拨单价" align="center" width="100" />
+            <el-table-column prop="requAmount" label="调拨单价" align="center" width="100"/>
             <el-table-column prop="count" label="调拨数量" width="120" align="center">
               <template slot-scope="scope">
-                <el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable
-                  placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+                <el-input @input="commodityComputeYHAndXSJE2(scope.row)" v-model="scope.row.count" clearable placeholder="" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"/>
               </template>
             </el-table-column>
-            <el-table-column prop="amount" label="调拨金额" align="center" width="100" />
+            <el-table-column prop="amount" label="调拨金额" align="center" width="100"/>
           </el-table>
         </el-form>
       </div>
     </div>
     <!-- 选择商品 -->
-    <chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
+    <chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState"/>
   </div>
 </template>
 
 <script>
-  import req from '@/api/storage/allocation.js'
-  import chooseproducts from './relation/chooseproducts'
-  import {
-    getCurrentDate
-  } from '@/utils/index.js'
-  import {
-    getOrgSidByPath,
-    fetchBySid,
-    fetchByDepSid,
-    selectOrgSidList,
-    getServiceStationByOrgSid,
-    selAllByOrgSidPath,
-    tranOne, // 调出一级站-调入当前一级站内所有二级站
-    tranfour, // 调出二级站-调入上级一级站内所有二级站，不包含自身
-  } from '@/api/Common/dictcommons'
-  export default {
-    components: {
-      chooseproducts,
-    },
-    data() {
-      return {
-        viewTitle: '',
-        viewState: 1,
-        submitdisabled: false,
-        activeNames: '1',
-        index: 0,
-        formobj: {
-          "sid": "",
-          "billNo": "",
-          "useOrgSid": "",
-          "createBySid": '',
-          "createByName": '',
-          "deptName": '',
-          "deptSid": '',
-          "createTime": getCurrentDate(),
-          "outOrgName": '',
-          "outOrgSid": '',
-          "outPlatName": '',
-          "outPlatSid": '',
-          "inOrgName": '',
-          "inOrgSid": '',
-          "inPlatName": "",
-          "inPlatSid": "",
-          "inOrgAttributeKey": "",
-          "inOrgAttributeValue": "",
-          "confirmName": "",
-          "confirmSid": "",
-          "remarks": "",
-          "grade": "1",
-          "createOrgSid": "",
-          "procDefId": "",
-          "nodeId": "",
-          "procInstId": "",
-          "nodeState": "待提交",
-          "taskId": "",
-          "wmsInventoryAllocateBillDetailNewList": []
-        },
-        rules: {
-          inOrgName: [{
-            required: true,
-            message: '调入分公司不能为空',
-            trigger: 'change'
-          }],
-          inPlatName: [{
-            required: true,
-            message: '调入站点不能为空',
-            trigger: 'change'
-          }],
-          confirmName: [{
-            required: true,
-            message: '经办人不能为空',
-            trigger: 'change'
-          }],
-        },
-        orgList: [],
-        deptList: [],
-        operatorNameList: [],
-        warehouseList: [],
-        warehouseRackList: []
+import req from '@/api/storage/allocation.js'
+import chooseproducts from './relation/chooseproducts'
+import {
+  fetchByDepSid,
+  selAllByOrgSidPath,
+  tranOne, // 调出一级站-调入当前一级站内所有二级站
+  tranfour // 调出二级站-调入上级一级站内所有二级站，不包含自身
+} from '@/api/Common/dictcommons'
+
+export default {
+  components: {
+    chooseproducts
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      activeNames: '1',
+      index: 0,
+      formobj: {
+        sid: '',
+        billNo: '',
+        useOrgSid: '',
+        createBySid: '',
+        createByName: '',
+        deptName: '',
+        deptSid: '',
+        createTime: '',
+        outOrgName: '',
+        outOrgSid: '',
+        outPlatName: '',
+        outPlatSid: '',
+        inOrgName: '',
+        inOrgSid: '',
+        inPlatName: '',
+        inPlatSid: '',
+        inOrgAttributeKey: '',
+        inOrgAttributeValue: '',
+        confirmName: '',
+        confirmSid: '',
+        remarks: '',
+        grade: '',
+        createOrgSid: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        wmsInventoryAllocateBillDetailNewList: []
+      },
+      rules: {
+        inPlatName: [{ required: true, message: '调入站点不能为空', trigger: 'change' }],
+        confirmName: [{ required: true, message: '经办人不能为空', trigger: 'change' }]
+      },
+      deptList: [],
+      operatorNameList: []
+    }
+  },
+  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))
+    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))
-      this.showInfo(obj.businessSid)
+    selectInDeptName(val) {
+      const choose = this.deptList.filter((item) => item.sid === val)
+      this.formobj.inPlatSid = choose[0].sid
+      this.formobj.inPlatName = choose[0].name
+      this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
+      this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
     },
-    mounted() {
-      window.parent.postMessage({
-        cmd: 'returnHeight',
-        params: {
-          // 告诉父级页面，子页面的弹框高度。
-          code: 2,
-          data: 500 + 'px'
-        }
-      }, '*')
+    selectOperatorName(val) {
+      const choose = this.operatorNameList.filter((item) => item.sid === val)
+      this.formobj.confirmSid = choose[0].sid
+      this.formobj.confirmName = choose[0].name
     },
-    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
+    showInfo(sid) {
+      this.viewTitle = '【编辑】商品调拨申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.init(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+          fetchByDepSid({
+            sid: this.formobj.deptSid
+          }).then((respsone) => {
+            if (respsone.success) {
+              //  一级站
+              if (respsone.data.orgAttributeKey === 'fwz_001') {
+                // 调出一级站-调入当前一级站内所有二级站
+                tranOne(this.formobj.deptSid).then((resp) => {
+                  if (resp.success) {
+                    this.deptList = resp.data
+                  }
+                })
+              } else { //  二级站
+                // 调出二级站-调入上级一级站内所有二级站，不包含自身
+                tranfour(this.formobj.deptSid).then((resp) => {
+                  if (resp.success) {
+                    this.deptList = resp.data
+                  }
+                })
               }
-            }, 0)
-            sums[index] += ''
-          }
-        })
-        return sums
-      },
-
-      selectInOrg(val) {
-        console.log("selectInOrg", val);
-
-        const choose = this.orgList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        this.formobj.inOrgSid = choose[0].sid
-        this.formobj.inOrgName = choose[0].name
-
-        getServiceStationByOrgSid(choose[0].sid).then((res) => {
-          if (res.success) {
-            this.formobj.inDeptSid = ''
-            this.formobj.inDeptName = ''
-            this.formobj.inOrgAttributeKey = ''
-            this.formobj.inOrgAttributeValue = ''
-            console.log("getListDeptByOrgSid", res);
-            this.deptList = res.data
-          }
-        })
-
-      },
-
-      selectInDeptName(val) {
-        console.log("selectInDeptName", val);
-
-        const choose = this.deptList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInDeptName', choose)
-        this.formobj.inPlatSid = choose[0].sid
-        this.formobj.inPlatName = choose[0].name
-        this.formobj.inOrgAttributeKey = choose[0].orgAttributeKey
-        this.formobj.inOrgAttributeValue = choose[0].orgAttributeValue
-
-      },
-      selectOperatorName(val) {
-        console.log("selectOperatorName", val);
-        const choose = this.operatorNameList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectOutOrg', choose)
-        this.formobj.confirmSid = choose[0].sid
-        this.formobj.confirmName = choose[0].name
-      },
-
-      getWarehouseAreaList(sid) {
-        var query = {
-          ckSid: sid
+            }
+          })
+          selAllByOrgSidPath({ orgSidPath: this.formobj.orgPath }).then((res) => {
+            if (res.success) {
+              this.operatorNameList = res.data
+            }
+          })
         }
-        req.getWarehouseareas(query).then((res) => {
-          if (res.success) {
-            this.warehouseRackList = res.data
-
-            console.log("aaaaaa", this.warehouseRackList);
-
-          }
-        })
-      },
-      selectWarehouseName(row, val) {
-        console.log("selectWarehouseName", row);
-        console.log("selectWarehouseName", val);
-
-        const choose = this.warehouseList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        row.inWarehouseSid = choose[0].sid
-        row.inWarehouseName = choose[0].warehouseName
-        row.inWarehouseRackSid = ''
-        row.inWarehouseRackCode = ''
-
-
-        this.getWarehouseAreaList(val)
-      },
-      selectWarehouseAreaCode(row, val) {
-        console.log("selectWarehouseAreaCode", row);
-        console.log("selectWarehouseAreaCode", val);
-
-        const choose = this.warehouseRackList.filter((item) => item.sid == val)
-        console.log('>>>>>>>>>selectInOrg', choose)
-        row.inWarehouseRackSid = choose[0].sid
-        row.inWarehouseRackCode = choose[0].areaCode
-
-      },
-      showAdd() {
-
-        this.viewTitle = '【新增】商品调拨申请'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-      },
-      showInfo(sid) {
-
-
-        this.viewTitle = '【修改】商品调拨申请'
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
+      })
+    },
+    backData(value) {
+      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,
+            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
+          })
         })
-        req.init(sid).then((res) => {
-          if (res.success) {
-            this.formobj = res.data
-            this.formobj.instanceId = res.data.procInstId
-
-            fetchByDepSid({
-              sid: this.formobj.deptSid
-            }).then((respsone) => {
-              if (respsone.success) {
-                console.log("fetchByDepSid", respsone.data);
-
-                //  一级站
-                if (respsone.data.orgAttributeKey == 'fwz_001') {
-                  // 调出一级站-调入当前一级站内所有二级站
-                  tranOne(this.formobj.deptSid).then((resp) => {
-                    if (resp.success) {
-                      console.log("tranOne", resp);
-                      this.deptList = resp.data
-                    }
-                  })
-                } else { //  二级站
-                  // 调出二级站-调入上级一级站内所有二级站，不包含自身
-                  tranfour(this.formobj.deptSid).then((resp) => {
-                    if (resp.success) {
-                      console.log("tranfour", resp);
-                      this.deptList = resp.data
-                    }
-                  })
+      }
+    },
+    deleteGoods(index) {
+      this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
+    },
+    resetState() {
+      this.viewState = 1
+    },
+    seleGoods() {
+      this.viewState = 2
+      const aa = []
+      this.$refs['divSp'].showData(aa, this.formobj.deptSid)
+    },
+    // 计算调拨单、调拨金额
+    commodityComputeYHAndXSJE(row) {
+      row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2)
+      row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
+    },
+    // 计算调拨金额
+    commodityComputeYHAndXSJE2(row) {
+      if (Number(row.stockCount) < Number(row.count)) {
+        row.count = Number(row.stockCount)
+      } else {
+        row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
+      }
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.save(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '保存成功'
+              })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
                 }
-
-              }
-            })
-
-            selectOrgSidList().then((res) => {
-              if (res.success) {
-                console.log("selectOrgSidList", res);
-                this.orgList = res.data
-              }
-            })
-
-            selAllByOrgSidPath({
-              orgSidPath: this.formobj.orgPath
-            }).then((res) => {
-              if (res.success) {
-                console.log("selAllByOrgSidPath", res);
-                this.operatorNameList = res.data
-              }
-            })
-
-
-          }
-        })
-      },
-
-      backData(value) {
-        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,
-            })
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
           })
         }
-      },
-      deleteGoods(index) {
-        this.formobj.wmsInventoryAllocateBillDetailNewList.splice(index, 1)
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      seleGoods() {
-        this.viewState = 2
-        const aa = []
-        this.$refs['divSp'].showData(aa, this.formobj.deptSid)
-      },
-
-      // 计算调拨单、调拨金额
-      commodityComputeYHAndXSJE(row) {
-        console.log("commodityComputeYHAndXSJE", row);
-        row.requAmount = (Number(row.taxPrice) * Number(1 + Number(row.markUpRatio) / 100)).toFixed(2)
-        row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
-      },
-      // 计算调拨金额
-      commodityComputeYHAndXSJE2(row) {
-
-        if (Number(row.stockCount) < Number(row.count)) {
-          row.count = Number(row.stockCount)
-        } else {
-          row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
-        }
-
-      },
-      saveOrUpdate() {
-        console.log("saveOrUpdate", this.formobj);
-
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-            this.submitdisabled = true
-            req.save(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '保存成功'
-                })
-                // 子页面向父级页面传递值(关闭弹框)
-                window.parent.postMessage({
-                  cmd: 'returnHeight',
-                  params: {
-                    // 操作成功，告诉父级页面关闭弹框
-                    code: 1
-                  }
-                }, '*')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+
+          if (this.formobj.wmsInventoryAllocateBillDetailNewList.length === 0) {
+            this.$message({
+              type: 'warning',
+              showClose: true,
+              message: '调拨商品不能为空'
             })
+            return
           }
-        })
-      },
-      submit() {
-        console.log("saveOrUpdate", this.formobj);
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
-
-            if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
+          for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
+            var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
+            if (Number(item.count) === 0) {
               this.$message({
-                type: "warning",
+                type: 'warning',
                 showClose: true,
-                message: '调拨商品不能为空'
+                message: '调拨数量不能为空或0'
               })
               return
             }
-
-            for (var i = 0; i < this.formobj.wmsInventoryAllocateBillDetailNewList.length; i++) {
-              var item = this.formobj.wmsInventoryAllocateBillDetailNewList[i]
-
-              if (Number(item.count) == 0) {
-                this.$message({
-                  type: "warning",
-                  showClose: true,
-                  message: '调拨数量不能为空或0'
-                })
-                return
-              }
-
-            }
-
-            this.submitdisabled = true
-            req.allocation(this.formobj).then((res) => {
-              if (res.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: '调拨成功'
-                })
-                // 子页面向父级页面传递值(关闭弹框)
-                window.parent.postMessage({
-                  cmd: 'returnHeight',
-                  params: {
-                    // 操作成功，告诉父级页面关闭弹框
-                    code: 1
-                  }
-                }, '*')
-              } else {
-                this.submitdisabled = false
-              }
-            }).catch(() => {
-              this.submitdisabled = false
-            })
           }
-        })
-      },
+          this.submitdisabled = true
+          req.allocation(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: '调拨成功'
+              })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
 
-    }
   }
+}
 </script>
 
 <style scoped>
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item__error {
-    margin-left: 120px !important;
-  }
-
-  .must {
-    color: #f00;
-  }
-
-  .span-sty {
-    width: 130px !important;
-  }
-
-  .span-sty2 {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    line-height: 42px;
-    text-align: right;
-    font-size: 14px;
-    color: #606266;
-    font-weight: 600;
-    width: 70px;
-    padding-right: 5px;
-    border-right: 1px solid #e0e3eb;
-    width: 110px !important;
-  }
-
-  .addinputInfo2 {
-    margin-left: 110px !important;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw2 {
-    margin-left: 110px !important;
-    width: calc(100% - 105px);
-  }
-
-
-
-  .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;
-  }
-
-  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
-    display: inline;
-    line-height: 1px;
-    vertical-align: middle;
-  }
+.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);
+}
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue
index 5d6dff2e67..0dbe38181c 100644
--- a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.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,146 +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'
 
-    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)
+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
     },
-    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] += ''
-          }
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
         })
-        return sums
-      },
-
-      showInfo(sid) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
-        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/allocationFlow/relation/chooseproducts.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue
index a56f465ffa..d473de9213 100644
--- a/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue
+++ b/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue
@@ -14,15 +14,14 @@
           <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>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -32,29 +31,27 @@
         </div>
         <div class="listtop">
           <div class="tit">商品列表</div>
-          <!--          <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 +59,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>