完善调拨管理

yxt-as-ui/src/api/Common/dictcommons.js

@@ -35,7 +35,7 @@ export function getOrgSidByPath(data) {
   })
 }
 
-// 根据分公司sid查询分公司名称
+// 根据分公司sid查询分公司
 export function fetchBySid(sid) {
   return request({
     url: '/portal/v1/sysorganization/fetchBySid/' + sid,
@@ -60,12 +60,47 @@ export function getListDeptByOrgSid(data) {
   })
 }
 
+// 根据部门sid查询部门信息
+export function fetchByDepSid(data) {
+  return request({
+    url: '/portal/v1/sysorganization/selectBySid',
+    method: 'get',
+    params: data
+  })
+}
+
+//  调出一级站-调入当前一级站内所有二级站
+export function tranOne(data) {
+  return request({
+    // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+    url: '/portal/v1/sysorganization/tranOne/' + data,
+    method: 'GET'
+  })
+}
+
+//  调出一级站-调入当前分公司内所有一级站，不包含自身
+export function tranTwo(data) {
+  return request({
+    // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+    url: '/portal/v1/sysorganization/tranTwo/' + data,
+    method: 'GET'
+  })
+}
+
+//  调出一级站-调入当前选择分公司内所有一级站，不包含自身
+export function tranThree(data) {
+  return request({
+    // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+    url: '/portal/v1/sysorganization/tranThree/' + data.sid + "/" + data.deptSid,
+    method: 'GET',
+  })
+}
 
-// 根据分公司Sid获取分公司下所有的服务站
-export function getServiceStationByOrgSid(data) {
+//  调出二级站-调入上级一级站内所有二级站，不包含自身
+export function tranfour(data) {
   return request({
-    baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-    url: '/portal/v1/sysorganization/getServiceStationByOrgSid/' + data,
+    // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+    url: '/portal/v1/sysorganization/tranfour/' + data,
     method: 'GET'
   })
 }

yxt-as-ui/src/api/storage/allocation.js

@@ -31,7 +31,7 @@ export default {
   saveLogisticsInfo: function(data) {
     return request({
       // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/saveLogisticsInfo',
+      url: '/wms/v1/wmsinventoryallocatebilllogistics/saveLogisticsInfo',
       method: 'post',
       data: data,
       headers: {
@@ -65,7 +65,7 @@ export default {
   allocation: function(data) {
     return request({
       // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
-      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation',
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply',
       method: 'post',
       data: data,
       headers: {
@@ -78,7 +78,7 @@ export default {
   // 查询所有商品
   getGoods: function(params) {
     return request({
-      baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
       url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
       method: 'post',
       data: params,
@@ -113,4 +113,90 @@ export default {
     });
   },
 
+
+
+
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/complete',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delegate',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（转办）
+  assignTask: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/assignTask',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/reject',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/breakProcess',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  },
+
 }

yxt-as-ui/src/api/storage/allocationByBranches.js

@@ -0,0 +1,117 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  deleteBySids: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+  // 保存物流信息
+  saveLogisticsInfo: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventoryallocatebilllogistics/saveLogisticsInfo',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+  // 新增、保存
+  save: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  init: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data,
+      method: 'get'
+    });
+  },
+
+  // 调拨
+  allocation: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 查询所有商品
+  getGoods: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 查询所有仓库
+  getWarehouses: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+  // 根据仓库查询库位
+  getWarehouseareas: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+      method: 'get',
+      params: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+}

yxt-as-ui/src/api/storage/allocationByGroup.js

@@ -0,0 +1,117 @@
+import request from '@/utils/request'
+
+export default {
+
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  deleteBySids: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+  // 保存物流信息
+  saveLogisticsInfo: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/v1/wmsinventoryallocatebilllogistics/saveLogisticsInfo',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+  // 新增、保存
+  save: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/save',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  // 初始化
+  init: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data,
+      method: 'get'
+    });
+  },
+
+  // 调拨
+  allocation: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/submitApply',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+
+  // 查询所有商品
+  getGoods: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/4061550-0-default",
+      url: '/wms/apiadmin/inventory/wmsinventory/alloGoodsListPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 查询所有仓库
+  getWarehouses: function(params) {
+    return request({
+      url: '/wms/apiadmin/base/wmswarehouseinfo/listAll',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+
+  // 根据仓库查询库位
+  getWarehouseareas: function(data) {
+    return request({
+      url: '/wms/apiadmin/base/wmswarehousearea/selectAll',
+      method: 'get',
+      params: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+}

yxt-as-ui/src/router/index.js

@@ -473,7 +473,25 @@ export const constantRoutes = [{
         component: () => import('@/views/storage/allocation/index'),
         name: 'Allocation',
         meta: {
-          title: '调拨管理',
+          title: '调拨(一级站内)',
+          noCache: true
+        }
+      },
+      {
+        path: '/allocationByBranches/index',
+        component: () => import('@/views/storage/allocationByBranches/index'),
+        name: 'AllocationByBranches',
+        meta: {
+          title: '调拨(分公司内)',
+          noCache: true
+        }
+      },
+      {
+        path: '/allocationByGroup/index',
+        component: () => import('@/views/storage/allocationByGroup/index'),
+        name: 'AllocationByGroup',
+        meta: {
+          title: '调拨(集团内)',
           noCache: true
         }
       },

yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@@ -50,11 +50,11 @@
 
           <el-row>
 
-            <el-col :span="6">
+            <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="5">
+            <!-- <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">
@@ -62,9 +62,9 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <div class="span-sty2"><span class="must">*</span> 调入站点</div>
+            </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">
@@ -140,13 +140,13 @@
             <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" />
             <el-table-column prop="unit" label="单位" align="center" />
             <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-            <el-table-column prop="warehouseAreaName" label="库区" width="150" align="center" />
+            <el-table-column prop="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">
+            <el-table-column prop="markUpRatio" label="加价比例(%)" width="120" align="center">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.markupRatio" clearable placeholder=""
+                <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>
@@ -169,7 +169,7 @@
                 </el-select>
               </template>
             </el-table-column> -->
-            <el-table-column prop="transferPrice" 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
@@ -193,9 +193,14 @@
     getCurrentDate
   } from '@/utils/index.js'
   import {
+    getOrgSidByPath,
+    fetchBySid,
+    fetchByDepSid,
     selectOrgSidList,
     getServiceStationByOrgSid,
-    selAllByOrgSidPath
+    selAllByOrgSidPath,
+    tranOne, // 调出一级站-调入当前一级站内所有二级站
+    tranfour, // 调出二级站-调入上级一级站内所有二级站，不包含自身
   } from '@/api/Common/dictcommons'
   export default {
     components: {
@@ -219,16 +224,14 @@
           "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
             .getItem('defaultOrgPath').lastIndexOf('/') + 1),
           "createTime": getCurrentDate(),
-          "outOrgName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "outOrgSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "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": "",
+          "inOrgName": '',
+          "inOrgSid": '',
           "inPlatName": "",
           "inPlatSid": "",
           "inOrgAttributeKey": "",
@@ -236,6 +239,13 @@
           "confirmName": "",
           "confirmSid": "",
           "remarks": "",
+          "grade": "1",
+          "createOrgSid": "",
+          "procDefId": "",
+          "nodeId": "",
+          "procInstId": "",
+          "nodeState": "待提交",
+          "taskId": "",
           "wmsInventoryAllocateBillDetailNewList": []
         },
         rules: {
@@ -264,6 +274,54 @@
     },
     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);
@@ -280,19 +338,6 @@
           }
         })
 
-        // var parpams = {
-        //   orgPath: window.sessionStorage.getItem('defaultOrgPath'),
-        // }
-        // req.getWarehouses(parpams).then((res) => {
-        //   if (res.success) {
-        //     this.warehouseList = res.data
-
-        //     console.log("aaaaaa", this.warehouseList);
-
-        //   }
-        // })
-
-
       },
       // 合计
       getSummaries(param) {
@@ -439,13 +484,18 @@
 
             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.warehouseRackSid,
-              "warehouseAreaName": e.warehouseAreaName,
-              "warehouseRackSid": e.warehouseAreaSid,
+              "warehouseAreaSid": e.warehouseAreaSid,
+              "warehouseArea": e.warehouseArea,
+              "warehouseRackSid": e.warehouseRackSid,
               "warehouseRackCode": e.warehouseRackCode,
               "taxPrice": e.taxPrice,
               "stockCount": e.count,
@@ -455,13 +505,12 @@
               "inWarehouseRackCode": '',
               "count": 0,
               "amount": 0,
-              "transferPrice": e.taxPrice,
-              "markupRatio": 0,
-              "goodsSpuName": e.goodsSpuName,
-              "goodsSkuCode": e.goodsSkuCode,
-              "goodsSkuOwnSpec": e.goodsSkuOwnSpec,
+              "requAmount": e.taxPrice,
+              "markUpRatio": 0,
               "unit": e.unit,
-              "goodsID": e.goodsID
+              "goodsID": e.goodsID,
+              "manufacturerSid": e.manufacturerSid,
+              "manufacturerName": e.manufacturerName,
             })
           })
         }
@@ -475,14 +524,14 @@
       seleGoods() {
         this.viewState = 2
         const aa = []
-        this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
+        this.$refs['divSp'].showData(aa, this.formobj.deptSid)
       },
 
       // 计算调拨单、调拨金额
       commodityComputeYHAndXSJE(row) {
         console.log("commodityComputeYHAndXSJE", row);
-        row.transferPrice = (Number(row.taxPrice) * Number(1 + Number(row.markupRatio) / 100)).toFixed(2)
-        row.amount = (Number(row.count) * Number(row.transferPrice)).toFixed(2)
+        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) {
@@ -490,7 +539,7 @@
         if (Number(row.stockCount) < Number(row.count)) {
           row.count = Number(row.stockCount)
         } else {
-          row.amount = (Number(row.count) * Number(row.transferPrice)).toFixed(2)
+          row.amount = (Number(row.count) * Number(row.requAmount)).toFixed(2)
         }
 
       },
@@ -576,16 +625,14 @@
           "deptSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
             .getItem('defaultOrgPath').lastIndexOf('/') + 1),
           "createTime": getCurrentDate(),
-          "outOrgName": window.sessionStorage.getItem('defaultOrgPathName').substring(window
-            .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1),
-          "outOrgSid": window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
-            .getItem('defaultOrgPath').lastIndexOf('/') + 1),
+          "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": "",
+          "inOrgName": '',
+          "inOrgSid": '',
           "inPlatName": "",
           "inPlatSid": "",
           "inOrgAttributeKey": "",
@@ -593,6 +640,13 @@
           "confirmName": "",
           "confirmSid": "",
           "remarks": "",
+          "grade": "1",
+          "createOrgSid": "",
+          "procDefId": "",
+          "nodeId": "",
+          "procInstId": "",
+          "nodeState": "待提交",
+          "taskId": "",
           "wmsInventoryAllocateBillDetailNewList": []
         }
         this.submitdisabled = false

yxt-as-ui/src/views/storage/allocation/allocationInfo.vue

@@ -66,11 +66,11 @@
           <el-table-column prop="goodsSkuOwnSpec" label="型号" align="center" />
           <el-table-column prop="unit" label="单位" align="center" />
           <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-          <el-table-column prop="warehouseAreaName" label="仓库" width="150" align="center" />
+          <el-table-column prop="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="transferPrice" 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>

yxt-as-ui/src/views/storage/allocation/index.vue

@@ -72,10 +72,12 @@
             <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" @click="toRelevancy(scope.row)">办理</el-button>
+                <el-button type="primary" size="mini" :disabled="scope.row.nodeState!='待提交'"
+                  @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" />
@@ -264,7 +266,9 @@
             "outPlatName": "",
             "inOrgName": "",
             "inPlatName": "",
-            "confirmName": ""
+            "confirmName": "",
+            "grade": "1",
+
           }
         },
         sids: [],
@@ -385,7 +389,8 @@
             "outPlatName": "",
             "inOrgName": "",
             "inPlatName": "",
-            "confirmName": ""
+            "confirmName": "",
+            "grade": "1",
           }
         }
         this.loadList()
@@ -481,6 +486,18 @@
               showClose: true
             })
             this.loadList()
+            this.formobj = {
+              "sids": [],
+              "remarks": "",
+              "deliveryKey": "",
+              "deliveryName": "",
+              "expressBillNo": "",
+              "expressCompany": "",
+              "pickUpName": "",
+              "pickUpDate": "",
+              "deliveryPerson": "",
+              "deliveryDate": ""
+            }
           } else {
             // 根据resp.code进行异常情况处理
           }

yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue

@@ -20,7 +20,7 @@
                 <el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable />
               </el-form-item>
               <el-form-item label="商品名称" class="searchlist">
-                <el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable />
+                <el-input v-model="listQuery.params.goodsSkuTitle" placeholder="" clearable />
               </el-form-item>
 
             </el-form>
@@ -40,12 +40,12 @@
             <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="goodsSpuName" label="商品名称" 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="warehouseAreaName" 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>
@@ -82,8 +82,9 @@
           current: 1,
           size: 10,
           params: {
-            createOrgSid: '',
-            goodsSpuName: '',
+            deptSid: '',
+            goodsID: '',
+            goodsSkuTitle: '',
             goodsSkuCode: '',
           },
           total: 0
@@ -126,14 +127,15 @@
         this.listQuery.current = 1
         this.listQuery.size = 10
         this.listQuery.total = 0
-        this.listQuery.params.goodsSpuName = ''
+        this.listQuery.params.goodsID = ''
+        this.listQuery.params.goodsSkuTitle = ''
         this.listQuery.params.goodsSkuCode = ''
         this.getList()
       },
       handleSelectionChange(row) {
         this.sids = row
       },
-      showData(value, createOrgSid) {
+      showData(value, deptSid) {
         // const aa = []
         // if (value.length > 0) {
         //   for (var i = 0; i < value.length; i++) {
@@ -143,7 +145,7 @@
         // } else {
         //   this.listQuery.params.saleVehSids = []
         // }``
-        this.listQuery.params.createOrgSid = createOrgSid
+        this.listQuery.params.deptSid = deptSid
         this.getList()
       },
       // 添加修改返回

yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue

@@ -0,0 +1,691 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirm()">提交</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </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>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <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="5">
+              <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-option v-for="(item,i) in deptList" :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="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-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-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="warehouseAreaName" 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>
+              </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="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,'')" />
+              </template>
+            </el-table-column>
+            <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" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/allocation.js'
+  import chooseproducts from './relation/chooseproducts'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    getServiceStationByOrgSid,
+    selAllByOrgSidPath,
+    getOrgSidByPath,
+    fetchBySid,
+    tranTwo
+  } 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": "2",
+          "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
+              }
+            })
+          }
+        })
+
+        tranTwo(window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+          .getItem('defaultOrgPath').lastIndexOf('/') + 1)).then((resp) => {
+          if (resp.success) {
+            console.log("tranTwo", resp);
+            this.deptList = resp.data
+          }
+        })
+
+        selAllByOrgSidPath({
+          orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((res) => {
+          if (res.success) {
+            console.log("selAllByOrgSidPath", res);
+            this.operatorNameList = res.data
+          }
+        })
+      },
+      // 合计
+      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
+      },
+
+      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,
+            })
+          })
+        }
+      },
+      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: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      confirm() {
+        console.log("saveOrUpdate", this.formobj);
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+
+            if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
+              this.$message({
+                type: "warning",
+                showClose: true,
+                message: '调拨商品不能为空'
+              })
+              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": "2",
+          "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;
+  }
+</style>

yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>调拨详情</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </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>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <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="5">
+            <div class="span-sty">调入站</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.inOrgName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item><span style="width: 100%;">{{ formobj.inPlatName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">经办人</div>
+            <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" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/allocation.js'
+  export default {
+    data() {
+      return {
+        index: 0,
+        formobj: {},
+      }
+    },
+
+    methods: {
+      // 合计
+      getSummaries(param) {
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (column.property === 'count') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          } else if (column.property === 'amount') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          }
+        })
+        return sums
+      },
+
+
+      showAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+
+        }
+        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;
+  }
+</style>

yxt-as-ui/src/views/storage/allocationByBranches/index.vue

@@ -0,0 +1,562 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <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">
+            {{ searchxianshitit }}
+          </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-form-item>
+              <el-form-item label="申请人">
+                <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-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-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-form-item>
+              <el-form-item label="调出分公司">
+                <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-form-item>
+              <el-form-item label="调入分公司">
+                <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-form-item>
+              <el-form-item label="经办人">
+                <el-input v-model="queryParams.params.confirmName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">调拨列表</div>
+        </div>
+        <!-- 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-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" @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>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <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" />
+
+    <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-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-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-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-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-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-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-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-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-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-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/allocationByBranches.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './allocationByBranchesAdd.vue'
+  import divInfo from './allocationByBranchesInfo.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": "2",
+          }
+        },
+        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 = '显示查询条件'
+        }
+      },
+      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
+        }
+      },
+      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": "2",
+          }
+        }
+        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 => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            type: "warning",
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+
+      selectionLineChangeHandle(val) {
+        console.log("val", 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'].showAdd(row.sid)
+      },
+
+      toSupplement() {
+        if (this.sids.length > 0) {
+          this.dialogVisible = true
+
+          console.log("toSupplement", this.sids);
+
+        } 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: 'success',
+              message: resp.msg,
+              showClose: true
+            })
+            this.loadList()
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        }).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
+      },
+
+    }
+  }
+</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;
+  }
+</style>

yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择商品</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <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-form-item>
+              <el-form-item label="商品编码" class="searchlist">
+                <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-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>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </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>
+        </div>
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+      </div>
+    </div>
+  </div>
+</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
+        }
+      }
+    },
+    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
+      },
+      // 查询列表信息
+      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
+          })
+        }
+      },
+      // 返回
+      handleReturn() {
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>

yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue

@@ -0,0 +1,693 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="confirm()">提交</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </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>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">申请日期</div>
+              <span class="addinputInfo">{{ formobj.createTime }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="6">
+              <div class="span-sty">调出站</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.outPlatName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <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="5">
+              <div class="span-sty2"><span class="must">*</span> 调入站点</div>
+              <el-form-item prop="inPlatName">
+                <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>
+              </el-form-item>
+            </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-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-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-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="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>
+              </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="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,'')" />
+              </template>
+            </el-table-column>
+            <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" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/allocation.js'
+  import chooseproducts from './relation/chooseproducts'
+  import {
+    getCurrentDate
+  } from '@/utils/index.js'
+  import {
+    selectOrgSidList,
+    getOrgSidByPath,
+    selAllByOrgSidPath,
+    fetchBySid,
+    tranThree
+  } 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": "3",
+          "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.outOrgSid = resp.data
+            fetchBySid(resp.data).then((respsone) => {
+              if (respsone.success) {
+                this.formobj.outOrgName = respsone.data.name
+              }
+            })
+          }
+        })
+
+        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
+          }
+        })
+
+      },
+      // 合计
+      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
+      },
+
+      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
+
+        tranThree({
+          sid: choose[0].sid,
+          deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+            .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+        }).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,
+            })
+          })
+        }
+      },
+      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: '保存成功'
+                })
+                this.handleReturn('true')
+              } else {
+                this.submitdisabled = false
+              }
+            }).catch(() => {
+              this.submitdisabled = false
+            })
+          }
+        })
+      },
+      confirm() {
+        console.log("saveOrUpdate", this.formobj);
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+
+            if (this.formobj.wmsInventoryAllocateBillDetailNewList.length == 0) {
+              this.$message({
+                type: "warning",
+                showClose: true,
+                message: '调拨商品不能为空'
+              })
+              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": "3",
+          "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;
+  }
+</style>

yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>调拨详情</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </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>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请部门</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">申请日期</div>
+            <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="5">
+            <div class="span-sty">调入站</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.inOrgName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="3">
+            <el-form-item><span style="width: 100%;">{{ formobj.inPlatName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">经办人</div>
+            <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" />
+        </el-table>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/storage/allocation.js'
+  export default {
+    data() {
+      return {
+        index: 0,
+        formobj: {},
+      }
+    },
+
+    methods: {
+      // 合计
+      getSummaries(param) {
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
+          }
+          const values = data.map(item => Number(item[column.property]))
+          if (column.property === 'count') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          } else if (column.property === 'amount') {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0)
+            sums[index] += ''
+          }
+        })
+        return sums
+      },
+
+
+      showAdd(sid) {
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+
+        }
+        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;
+  }
+</style>

yxt-as-ui/src/views/storage/allocationByGroup/index.vue

@@ -0,0 +1,562 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <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">
+            {{ searchxianshitit }}
+          </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-form-item>
+              <el-form-item label="申请人">
+                <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-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-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-form-item>
+              <el-form-item label="调出分公司">
+                <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-form-item>
+              <el-form-item label="调入分公司">
+                <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-form-item>
+              <el-form-item label="经办人">
+                <el-input v-model="queryParams.params.confirmName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">调拨列表</div>
+        </div>
+        <!-- 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-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" @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>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <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" />
+
+    <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-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-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-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-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-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-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-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-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-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-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/allocationByGroup.js'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './allocationByGroupAdd.vue'
+  import divInfo from './allocationByGroupInfo.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": "3",
+          }
+        },
+        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 = '显示查询条件'
+        }
+      },
+      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
+        }
+      },
+      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": "3",
+          }
+        }
+        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 => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            type: "warning",
+            showClose: true,
+            message: '请至少选择一条记录进行删除操作'
+          })
+        }
+      },
+
+      selectionLineChangeHandle(val) {
+        console.log("val", 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'].showAdd(row.sid)
+      },
+
+      toSupplement() {
+        if (this.sids.length > 0) {
+          this.dialogVisible = true
+
+          console.log("toSupplement", this.sids);
+
+        } 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: 'success',
+              message: resp.msg,
+              showClose: true
+            })
+            this.loadList()
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        }).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
+      },
+
+    }
+  }
+</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;
+  }
+</style>

yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue

@@ -0,0 +1,172 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>选择商品</div>
+        <div>
+          <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <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-form-item>
+              <el-form-item label="商品编码" class="searchlist">
+                <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-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>
+              <el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
+            </div>
+          </div>
+        </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>
+        </div>
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+      </div>
+    </div>
+  </div>
+</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
+        }
+      }
+    },
+    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
+      },
+      // 查询列表信息
+      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
+          })
+        }
+      },
+      // 返回
+      handleReturn() {
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>