From b2f98a6c48ab729990529a414a43d5996f4837e5 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Fri, 12 Jul 2024 11:37:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=A5=E5=BA=93=E3=80=81?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E9=A2=86=E6=96=99=E6=A8=A1=E5=9D=97=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/maintenance/maintenanceReturnBound.js |  49 --
 .../maintenanceReceive.js}                    |  42 +-
 yxt-as-ui/src/api/storage/deliveryNotice.js   |  12 +
 yxt-as-ui/src/api/storage/receivingGoods.js   |  10 +-
 yxt-as-ui/src/router/index.js                 | 404 ++++++++---
 .../relation/chooseproducts.vue               | 205 ------
 .../src/views/maintenanceReceive/index.vue    | 392 +++++++++++
 .../maintenanceReceive/maintenanceConfirm.vue | 323 +++++++++
 .../maintenanceOutbound.vue}                  | 118 +++-
 .../maintenanceReturnBound.vue}               |  89 ++-
 .../relation/chooseproducts.vue               |   0
 .../maintenanceReceive/repairbillInfo.vue     | 638 ++++++++++++++++++
 .../views/storage/deliveryNotice/index.vue    | 112 ++-
 .../deliveryNotice/procurementInfo.vue        | 389 +++++++++++
 .../storage/deliveryNotice/receiptAdd.vue     |  66 +-
 .../storage/deliveryNotice/receiptInfo.vue    |  24 +-
 .../maintenanceOutboundInfo.vue               |  10 +-
 .../maintenanceReturnBoundInfo.vue            |  52 +-
 .../views/storage/receivingGoods/index.vue    | 128 +++-
 .../receivingGoods/receivingGoodsAdd.vue      |  98 ++-
 .../receivingGoods/receivingGoodsInfo.vue     | 248 +++----
 21 files changed, 2756 insertions(+), 653 deletions(-)
 delete mode 100644 yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
 rename yxt-as-ui/src/api/{maintenance/maintenanceOutbound.js => maintenanceReceive/maintenanceReceive.js} (51%)
 delete mode 100644 yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
 create mode 100644 yxt-as-ui/src/views/maintenanceReceive/index.vue
 create mode 100644 yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue
 rename yxt-as-ui/src/views/{maintenance/maintenanceOutbound/index.vue => maintenanceReceive/maintenanceOutbound.vue} (86%)
 rename yxt-as-ui/src/views/{maintenance/maintenanceReturnBound/index.vue => maintenanceReceive/maintenanceReturnBound.vue} (88%)
 rename yxt-as-ui/src/views/{maintenance/maintenanceOutbound => maintenanceReceive}/relation/chooseproducts.vue (100%)
 create mode 100644 yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue
 create mode 100644 yxt-as-ui/src/views/storage/deliveryNotice/procurementInfo.vue

diff --git a/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js b/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
deleted file mode 100644
index 215f5d0bc3..0000000000
--- a/yxt-as-ui/src/api/maintenance/maintenanceReturnBound.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import request from '@/utils/request'
-
-export default {
-
-  // 选择工单初始化数据
-  initBill: function(data) {
-    return request({
-      url: '/as/v1/AsBusrepairInventorybill/init',
-      method: 'get',
-      params: data
-    });
-  },
-
-
-  // 查询分页列表
-  getGoodsListPage: function(params) {
-    return request({
-      url: '/wms/apiadmin/WmsOutBill/getInventoryList',
-      method: 'post',
-      data: params,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
-  },
-
-  // 新增、保存
-  saveBill: function(data) {
-    return request({
-      url: '/as/v1/AsBusrepairInventorybill/quitBill',
-      method: 'post',
-      data: data,
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    });
-  },
-
-
-  // 详情
-  detailsBill: function(data) {
-    return request({
-      url: '/as/v1/AsBusrepairInventorybill/details',
-      method: 'get',
-      params: data
-    });
-  },
-
-}
diff --git a/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js b/yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js
similarity index 51%
rename from yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
rename to yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js
index 178a0a52c5..220ae34173 100644
--- a/yxt-as-ui/src/api/maintenance/maintenanceOutbound.js
+++ b/yxt-as-ui/src/api/maintenanceReceive/maintenanceReceive.js
@@ -2,6 +2,18 @@ import request from '@/utils/request'
 
 export default {
 
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
   // 选择工单初始化数据
   initBill: function(data) {
     return request({
@@ -11,8 +23,7 @@ export default {
     });
   },
 
-
-  // 查询分页列表
+  // 模糊查询 商品列表
   getGoodsListPage: function(params) {
     return request({
       url: '/wms/apiadmin/WmsOutBill/getInventoryList',
@@ -24,8 +35,8 @@ export default {
     })
   },
 
-  // 新增、保存
-  saveBill: function(data) {
+  // 新增、保存领料出库
+  saveOutBill: function(data) {
     return request({
       url: '/as/v1/AsBusrepairInventorybill/outBill',
       method: 'post',
@@ -36,6 +47,29 @@ export default {
     });
   },
 
+  // 新增、保存 领料退库
+  saveQuitBill: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/quitBill',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
+  saveConfirm: function(data) {
+    return request({
+      url: '/as/v1/AsBusrepairInventorybill/saveConfirm',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+  },
+
 
   // 详情
   detailsBill: function(data) {
diff --git a/yxt-as-ui/src/api/storage/deliveryNotice.js b/yxt-as-ui/src/api/storage/deliveryNotice.js
index fc11c9105a..5747aa07f5 100644
--- a/yxt-as-ui/src/api/storage/deliveryNotice.js
+++ b/yxt-as-ui/src/api/storage/deliveryNotice.js
@@ -14,6 +14,18 @@ export default {
     })
   },
 
+  // 终止逾期到货通知单
+  billToEnd: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/billToEndBySids',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
   // 详情初始化
   init: function(data) {
     return request({
diff --git a/yxt-as-ui/src/api/storage/receivingGoods.js b/yxt-as-ui/src/api/storage/receivingGoods.js
index 62e017ab4d..cbe6915344 100644
--- a/yxt-as-ui/src/api/storage/receivingGoods.js
+++ b/yxt-as-ui/src/api/storage/receivingGoods.js
@@ -14,6 +14,15 @@ export default {
     })
   },
 
+  // 根据收货单sid 获取上架单列表
+  getUpShlefList: function(data) {
+    return request({
+      url: '/wms/apiadmin/inventory/WmsReceiptBill/getUpShlefListBySid/' + data,
+      method: 'get'
+    });
+  },
+
+
   // 初始化
   init: function(data) {
     return request({
@@ -22,7 +31,6 @@ export default {
     });
   },
 
-
   // 新增、保存
   save: function(data) {
     return request({
diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index a7cbf95d45..4508e87a06 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -49,153 +49,229 @@ export const constantRoutes = [{
     meta: {
       title: '业务'
     },
-    children: [
-      {
+    children: [{
         path: '/preregistration/preregistration',
         component: () => import('@/views/operation/preregistration/preregistration.vue'),
         name: 'Preregistration',
-        meta: { title: '预约单管理', noCache: true }
+        meta: {
+          title: '预约单管理',
+          noCache: true
+        }
       },
       {
         path: '/repairbill/repairbill',
         component: () => import('@/views/operation/repairbill/repairbill.vue'),
         name: 'RepairBill',
-        meta: { title: '维修单管理(登记)', noCache: true }
+        meta: {
+          title: '维修单管理(登记)',
+          noCache: true
+        }
       },
       {
         path: '/repairbill/repairbillBySendWork',
         component: () => import('@/views/operation/repairbill/repairbillBySendWork.vue'),
         name: 'RepairBillBySendWork',
-        meta: { title: '维修单管理(派工)', noCache: true }
+        meta: {
+          title: '维修单管理(派工)',
+          noCache: true
+        }
       },
       {
         path: '/repairbill/repairbillByMaintain',
         component: () => import('@/views/operation/repairbill/repairbillByMaintain.vue'),
         name: 'RepairBillByMaintain',
-        meta: { title: '维修单管理(维修)', noCache: true }
+        meta: {
+          title: '维修单管理(维修)',
+          noCache: true
+        }
       },
       {
         path: '/repairbill/repairbillByBeCompleted',
         component: () => import('@/views/operation/repairbill/repairbillByBeCompleted.vue'),
         name: 'RepairBillByBeCompleted',
-        meta: { title: '维修单管理(竣工)', noCache: true }
+        meta: {
+          title: '维修单管理(竣工)',
+          noCache: true
+        }
       },
       {
         path: '/repairbill/repairbillBySettleAccounts',
         component: () => import('@/views/operation/repairbill/repairbillBySettleAccounts.vue'),
         name: 'RepairBillBySettleAccounts',
-        meta: { title: '维修单管理(结算)', noCache: true }
+        meta: {
+          title: '维修单管理(结算)',
+          noCache: true
+        }
       },
       {
         path: '/repairbill/repairbillBYLeaveFactory',
         component: () => import('@/views/operation/repairbill/repairbillBYLeaveFactory.vue'),
         name: 'RepairBillBYLeaveFactory',
-        meta: { title: '维修单管理(出厂)', noCache: true }
+        meta: {
+          title: '维修单管理(出厂)',
+          noCache: true
+        }
       },
       {
         path: '/workorderquery/workorderquery',
         component: () => import('@/views/operation/workorderquery/workorderquery.vue'),
         name: 'WorkOrderQuery',
-        meta: { title: '工单查询', noCache: true }
+        meta: {
+          title: '工单查询',
+          noCache: true
+        }
       },
       {
         path: '/workorderinvoicing/workorderinvoicing',
         component: () => import('@/views/operation/workorderinvoicing/workorderinvoicing.vue'),
         name: 'WorkOrderInvoicing',
-        meta: { title: '保外工单开票管理', noCache: true }
+        meta: {
+          title: '保外工单开票管理',
+          noCache: true
+        }
       },
       {
         path: '/workorderreceivable/workorderreceivable',
         component: () => import('@/views/operation/workorderreceivable/workorderreceivable.vue'),
         name: 'WorkOrderReceivable',
-        meta: { title: '工单应收调差管理', noCache: true }
+        meta: {
+          title: '工单应收调差管理',
+          noCache: true
+        }
       },
       {
         path: '/arrearsleavefactory/arrearsleavefactory',
         component: () => import('@/views/operation/arrearsleavefactory/arrearsleavefactory.vue'),
         name: 'ArrearsLeaveFactory',
-        meta: { title: '保外欠款出厂管理', noCache: true }
+        meta: {
+          title: '保外欠款出厂管理',
+          noCache: true
+        }
       },
       {
         path: '/pendingclaim/pendingclaim',
         component: () => import('@/views/operation/pendingclaim/pendingclaim.vue'),
         name: 'PendingClaim',
-        meta: { title: '待索赔维修工单', noCache: true }
+        meta: {
+          title: '待索赔维修工单',
+          noCache: true
+        }
       },
       {
         path: '/claimstatement/claimstatement',
         component: () => import('@/views/operation/claimstatement/claimstatement.vue'),
         name: 'ClaimStatement',
-        meta: { title: '厂家索赔单管理', noCache: true }
+        meta: {
+          title: '厂家索赔单管理',
+          noCache: true
+        }
       },
       {
         path: '/claimbilling/claimbilling',
         component: () => import('@/views/operation/claimbilling/claimbilling.vue'),
         name: 'ClaimBilling',
-        meta: { title: '索赔单开票管理', noCache: true }
+        meta: {
+          title: '索赔单开票管理',
+          noCache: true
+        }
       },
       {
         path: '/claimpendingverification/claimpendingverification',
         component: () => import('@/views/operation/claimpendingverification/claimpendingverification.vue'),
         name: 'ClaimPendingVerification',
-        meta: { title: '工单索赔待核对', noCache: true }
+        meta: {
+          title: '工单索赔待核对',
+          noCache: true
+        }
       },
       {
         path: '/claimadjustment/claimadjustment',
         component: () => import('@/views/operation/claimadjustment/claimadjustment.vue'),
         name: 'ClaimAdjustment',
-        meta: { title: '工单索赔调整', noCache: true }
+        meta: {
+          title: '工单索赔调整',
+          noCache: true
+        }
       },
       {
         path: '/workslrsettlement/workslrsettlement',
         component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'),
         name: 'WorkSLRSettlement',
-        meta: { title: '工单反结算管理', noCache: true }
+        meta: {
+          title: '工单反结算管理',
+          noCache: true
+        }
       },
       {
         path: '/workorderreturnvisit/workorderreturnvisit',
         component: () => import('@/views/operation/workorderreturnvisit/workorderreturnvisit.vue'),
         name: 'WorkOrderReturnVisit',
-        meta: { title: '工单回访管理', noCache: true }
+        meta: {
+          title: '工单回访管理',
+          noCache: true
+        }
       },
       {
         path: '/salesticket/salesticket',
         component: () => import('@/views/operation/salesticket/salesticket.vue'),
         name: 'SalesTicket',
-        meta: { title: '销售单管理', noCache: true }
+        meta: {
+          title: '销售单管理',
+          noCache: true
+        }
       },
       {
         path: '/merchandisereturn/merchandisereturn',
         component: () => import('@/views/operation/merchandisereturn/merchandisereturn.vue'),
         name: 'MerchandiseReturn',
-        meta: { title: '商品退货管理', noCache: true }
+        meta: {
+          title: '商品退货管理',
+          noCache: true
+        }
       },
     ]
   },
 
   {
-    path: '/maintenance',
+    path: '/maintenanceReceive',
     component: Layout,
-    redirect: '/maintenance',
+    redirect: '/maintenanceReceive',
     meta: {
       title: '维修领料'
     },
     children: [
+
       {
-        path: '/maintenanceOutbound/index',
-        component: () => import('@/views/maintenance/maintenanceOutbound/index.vue'),
+        path: '/maintenanceReceive/index',
+        component: () => import('@/views/maintenanceReceive/index.vue'),
+        name: 'MaintenanceReceive',
+        meta: {
+          title: '维修领料',
+          noCache: true
+        }
+      },
+      {
+        path: '/maintenanceReceive/maintenanceOutbound',
+        component: () => import('@/views/maintenanceReceive/maintenanceOutbound.vue'),
         name: 'MaintenanceOutbound',
-        meta: { title: '维修出库', noCache: true }
+        meta: {
+          title: '维修出库',
+          noCache: true
+        }
       },
       {
-        path: '/maintenanceReturnBound/index',
-        component: () => import('@/views/maintenance/maintenanceReturnBound/index.vue'),
+        path: '/maintenanceReceive/maintenanceReturnBound',
+        component: () => import('@/views/maintenanceReceive/maintenanceReturnBound.vue'),
         name: 'MaintenanceReturnBound',
-        meta: { title: '维修退库', noCache: true }
+        meta: {
+          title: '维修退库',
+          noCache: true
+        }
       },
     ]
   },
 
+
   {
     path: '/warehouse',
     component: Layout,
@@ -203,30 +279,41 @@ export const constantRoutes = [{
     meta: {
       title: '仓库管理'
     },
-    children: [
-      {
+    children: [{
         path: '/goodsShelves/index',
         component: () => import('@/views/warehouse/goodsShelves/index.vue'),
         name: 'GoodsShelves',
-        meta: { title: '库位管理', noCache: true }
+        meta: {
+          title: '库位管理',
+          noCache: true
+        }
       },
       {
         path: '/warehouseArea/index',
         component: () => import('@/views/warehouse/warehouseArea/index.vue'),
         name: 'WarehouseArea',
-        meta: { title: '库区管理', noCache: true }
+        meta: {
+          title: '库区管理',
+          noCache: true
+        }
       },
       {
         path: '/warehouseAreaType/index',
         component: () => import('@/views/warehouse/warehouseAreaType/index.vue'),
         name: 'WarehouseAreaType',
-        meta: { title: '库区类型管理', noCache: true }
+        meta: {
+          title: '库区类型管理',
+          noCache: true
+        }
       },
       {
         path: '/warehouse/index',
         component: () => import('@/views/warehouse/warehouse/index.vue'),
         name: 'Warehouse',
-        meta: { title: '仓库管理', noCache: true }
+        meta: {
+          title: '仓库管理',
+          noCache: true
+        }
       }
     ]
   },
@@ -238,36 +325,50 @@ export const constantRoutes = [{
     meta: {
       title: '商品管理'
     },
-    children: [
-      {
+    children: [{
         path: '/brands/index',
         component: () => import('@/views/goods/brands/index.vue'),
         name: 'Brands',
-        meta: { title: '品牌管理', noCache: true }
+        meta: {
+          title: '品牌管理',
+          noCache: true
+        }
       },
       {
         path: '/category/index',
         component: () => import('@/views/goods/category/index.vue'),
         name: 'Category',
-        meta: { title: '商品类别', noCache: true }
+        meta: {
+          title: '商品类别',
+          noCache: true
+        }
       },
       {
         path: '/factory/index',
         component: () => import('@/views/goods/factory/index.vue'),
         name: 'Factory',
-        meta: { title: '厂家管理', noCache: true }
+        meta: {
+          title: '厂家管理',
+          noCache: true
+        }
       },
       {
         path: '/goods/index',
         component: () => import('@/views/goods/goods/index.vue'),
         name: 'Goods',
-        meta: { title: '商品管理', noCache: true }
+        meta: {
+          title: '商品管理',
+          noCache: true
+        }
       },
       {
         path: '/unit/index',
         component: () => import('@/views/goods/unit/index.vue'),
         name: 'Unit',
-        meta: { title: '计量单位', noCache: true }
+        meta: {
+          title: '计量单位',
+          noCache: true
+        }
       }
     ]
   },
@@ -278,126 +379,185 @@ export const constantRoutes = [{
     meta: {
       title: '仓储'
     },
-    children: [
-      {
+    children: [{
         path: '/outStorage/index',
         component: () => import('@/views/storage/outStorage/index'),
         name: 'OutStorage',
-        meta: { title: '出库管理', noCache: true }
+        meta: {
+          title: '出库管理',
+          noCache: true
+        }
       },
       {
         path: '/inventory/inventory',
         component: () => import('@/views/storage/inventory/inventory.vue'),
         name: 'Inventory',
-        meta: { title: '库存查询', noCache: true }
+        meta: {
+          title: '库存查询',
+          noCache: true
+        }
       },
       {
         path: '/inventory/inventoryRefer',
         component: () => import('@/views/storage/inventory/inventoryRefer.vue'),
         name: 'InventoryRefer',
-        meta: { title: '出入库查询', noCache: true }
+        meta: {
+          title: '出入库查询',
+          noCache: true
+        }
       },
-       {
+      {
         path: '/adjustment/index',
         component: () => import('@/views/storage/adjustment/index.vue'),
         name: 'Adjustment',
-        meta: { title: '定/调价', noCache: true }
+        meta: {
+          title: '定/调价',
+          noCache: true
+        }
       },
       {
         path: '/maintenanceInOrOutBound/index',
         component: () => import('@/views/storage/maintenanceInOrOutBound/index.vue'),
         name: 'MaintenanceInOrOutBound',
-        meta: { title: '维修出入库查询', noCache: true }
+        meta: {
+          title: '维修出入库查询',
+          noCache: true
+        }
       },
       {
         path: '/stocktaking/index',
         component: () => import('@/views/storage/stocktaking/index'),
         name: 'Stocktaking',
-        meta: { title: '盘点管理', noCache: true }
+        meta: {
+          title: '盘点管理',
+          noCache: true
+        }
       },
       {
         path: '/allocation/index',
         component: () => import('@/views/storage/allocation/index'),
         name: 'Allocation',
-        meta: { title: '调拨管理', noCache: true }
+        meta: {
+          title: '调拨管理',
+          noCache: true
+        }
       },
       {
         path: '/deliveryNotice/index',
         component: () => import('@/views/storage/deliveryNotice/index'),
         name: 'DeliveryNotice',
-        meta: { title: '到货通知单', noCache: true }
+        meta: {
+          title: '到货通知单',
+          noCache: true
+        }
       },
       {
         path: '/receivingGoods/index',
         component: () => import('@/views/storage/receivingGoods/index'),
         name: 'ReceivingGoods',
-        meta: { title: '收货单管理', noCache: true }
+        meta: {
+          title: '收货单管理',
+          noCache: true
+        }
       },
       {
         path: '/upShelf/index',
         component: () => import('@/views/storage/upShelf/index'),
         name: 'UpShelf',
-        meta: { title: '上架单管理', noCache: true }
+        meta: {
+          title: '上架单管理',
+          noCache: true
+        }
       },
       {
         path: '/oldPartsFactory/index',
         component: () => import('@/views/storage/oldPartsFactory/index'),
         name: 'OldPartsFactory',
-        meta: { title: '旧件返厂', noCache: true }
+        meta: {
+          title: '旧件返厂',
+          noCache: true
+        }
       },
       {
         path: '/manufacturerconfirm/index',
         component: () => import('@/views/storage/manufacturerconfirm/index'),
         name: 'Manufacturerconfirm',
-        meta: { title: '厂家确认', noCache: true }
+        meta: {
+          title: '厂家确认',
+          noCache: true
+        }
       },
       {
         path: '/oldPartsCope/index',
         component: () => import('@/views/storage/oldPartsCope/index'),
         name: 'OldPartsCope',
-        meta: { title: '旧件处理', noCache: true }
+        meta: {
+          title: '旧件处理',
+          noCache: true
+        }
       },
       {
         path: '/oldPartsRecovery/index',
         component: () => import('@/views/storage/oldPartsRecovery/index'),
         name: 'OldPartsRecovery',
-        meta: { title: '旧件回收', noCache: true }
+        meta: {
+          title: '旧件回收',
+          noCache: true
+        }
       },
       {
         path: '/oldPartsInStorage/index',
         component: () => import('@/views/storage/oldPartsInStorage/index'),
         name: 'OldPartsInStorage',
-        meta: { title: '旧件入库', noCache: true }
+        meta: {
+          title: '旧件入库',
+          noCache: true
+        }
       },
       {
         path: '/oldPartsInvertory/index',
         component: () => import('@/views/storage/oldPartsInvertory/index'),
         name: 'OldPartsInvertory',
-        meta: { title: '旧件库存', noCache: true }
+        meta: {
+          title: '旧件库存',
+          noCache: true
+        }
       },
       {
         path: '/oldPartsInAndOutStorage/index',
         component: () => import('@/views/storage/oldPartsInAndOutStorage/index'),
         name: 'OldPartsInAndOutStorage',
-        meta: { title: '旧件出入库查询', noCache: true }
+        meta: {
+          title: '旧件出入库查询',
+          noCache: true
+        }
       },
       {
         path: '/storageage/storageage',
         component: () => import('@/views/storage/storageage/storageage'),
         name: 'StorageAge',
-        meta: { title: '库龄查询', noCache: true }
+        meta: {
+          title: '库龄查询',
+          noCache: true
+        }
       },
       {
         path: '/carryover/carryoverstock',
         component: () => import('@/views/storage/carryover/carryoverstock'),
         name: 'CarryoverStock',
-        meta: { title: '结转库存查询', noCache: true }
+        meta: {
+          title: '结转库存查询',
+          noCache: true
+        }
       },
       {
         path: '/carryover/carryforwardrecord',
         component: () => import('@/views/storage/carryover/carryforwardrecord'),
         name: 'CarryForwardRecord',
-        meta: { title: '结转记录查询', noCache: true }
+        meta: {
+          title: '结转记录查询',
+          noCache: true
+        }
       }
     ]
   },
@@ -408,18 +568,23 @@ export const constantRoutes = [{
     meta: {
       title: '客户'
     },
-    children: [
-      {
+    children: [{
         path: '/customermanagement/customermanagement',
         component: () => import('@/views/client/customermanagement/customermanagement.vue'),
         name: 'CustomerManagement',
-        meta: { title: '客户管理', noCache: true }
+        meta: {
+          title: '客户管理',
+          noCache: true
+        }
       },
       {
         path: '/customerunit/customerunit',
         component: () => import('@/views/client/customerunit/customerunit.vue'),
         name: 'CustomerUnit',
-        meta: { title: '客户单位管理', noCache: true }
+        meta: {
+          title: '客户单位管理',
+          noCache: true
+        }
       }
     ]
   },
@@ -430,18 +595,23 @@ export const constantRoutes = [{
     meta: {
       title: '采购'
     },
-    children: [
-      {
+    children: [{
         path: '/procurement/procurement',
         component: () => import('@/views/purchase/procurement/procurement.vue'),
         name: 'Procurement',
-        meta: { title: '采购单管理', noCache: true }
+        meta: {
+          title: '采购单管理',
+          noCache: true
+        }
       },
       {
         path: '/purchasereturn/purchasereturn',
         component: () => import('@/views/purchase/purchasereturn/purchasereturn.vue'),
         name: 'PurchaseReturn',
-        meta: { title: '采购退货', noCache: true }
+        meta: {
+          title: '采购退货',
+          noCache: true
+        }
       }
     ]
   },
@@ -452,48 +622,68 @@ export const constantRoutes = [{
     meta: {
       title: '报表'
     },
-    children: [
-      {
+    children: [{
         path: '/salesstatement/merchandisesalesdetail',
         component: () => import('@/views/statement/salesstatement/merchandisesalesdetail.vue'),
         name: 'MerchandiseSalesDetail',
-        meta: { title: '销售明细商品', noCache: true }
+        meta: {
+          title: '销售明细商品',
+          noCache: true
+        }
       },
       {
         path: '/salesstatement/merchandisesalessummary',
         component: () => import('@/views/statement/salesstatement/merchandisesalessummary.vue'),
         name: 'MerchandiseSalesSummary',
-        meta: { title: '销售汇总商品', noCache: true }
+        meta: {
+          title: '销售汇总商品',
+          noCache: true
+        }
       },
       {
         path: '/salesstatement/salestrendreport',
         component: () => import('@/views/statement/salesstatement/salestrendreport.vue'),
         name: 'SalesTrendReport',
-        meta: { title: '销售价趋势报表', noCache: true }
+        meta: {
+          title: '销售价趋势报表',
+          noCache: true
+        }
       },
       {
         path: '/warehousereport/inventorystatistics',
         component: () => import('@/views/statement/warehousereport/inventorystatistics.vue'),
         name: 'InventoryStatistics',
-        meta: { title: '库存统计', noCache: true }
+        meta: {
+          title: '库存统计',
+          noCache: true
+        }
       },
       {
         path: '/warehousereport/receiptandreceiptrecord',
         component: () => import('@/views/statement/warehousereport/receiptandreceiptrecord.vue'),
         name: 'ReceiptAndReceiptRecord',
-        meta: { title: '收发存明细报表', noCache: true }
+        meta: {
+          title: '收发存明细报表',
+          noCache: true
+        }
       },
       {
         path: '/purchasereport/detailedpurchasereport',
         component: () => import('@/views/statement/purchasereport/detailedpurchasereport.vue'),
         name: 'DetailedPurchaseReport',
-        meta: { title: '采购明细报表', noCache: true }
+        meta: {
+          title: '采购明细报表',
+          noCache: true
+        }
       },
       {
         path: '/purchasereport/purchasesummaryreport',
         component: () => import('@/views/statement/purchasereport/purchasesummaryreport.vue'),
         name: 'PurchaseSummaryReport',
-        meta: { title: '采购汇总报表', noCache: true }
+        meta: {
+          title: '采购汇总报表',
+          noCache: true
+        }
       }
     ]
   },
@@ -504,60 +694,86 @@ export const constantRoutes = [{
     meta: {
       title: '基础信息'
     },
-    children: [
-      {
+    children: [{
         path: '/maintenanceitem/maintenanceitem',
         component: () => import('@/views/basicinformation/maintenanceitem/maintenanceitem.vue'),
         name: 'MaintenanceItem',
-        meta: { title: '维修项目管理', noCache: true }
+        meta: {
+          title: '维修项目管理',
+          noCache: true
+        }
       },
       {
         path: '/additionitem/additionitem',
         component: () => import('@/views/basicinformation/additionitem/additionitem.vue'),
         name: 'AdditionItem',
-        meta: { title: '附加项目管理', noCache: true }
+        meta: {
+          title: '附加项目管理',
+          noCache: true
+        }
       },
       {
         path: '/setmeal/setmeal',
         component: () => import('@/views/basicinformation/setmeal/setmeal.vue'),
         name: 'Setmeal',
-        meta: { title: '套餐管理', noCache: true }
+        meta: {
+          title: '套餐管理',
+          noCache: true
+        }
       },
       {
         path: '/profession/profession',
         component: () => import('@/views/basicinformation/profession/profession.vue'),
         name: 'Profession',
-        meta: { title: '工种管理', noCache: true }
+        meta: {
+          title: '工种管理',
+          noCache: true
+        }
       },
       {
         path: '/subjects/subjects',
         component: () => import('@/views/basicinformation/subjects/subjects.vue'),
         name: 'Subjects',
-        meta: { title: '科目管理', noCache: true }
+        meta: {
+          title: '科目管理',
+          noCache: true
+        }
       },
       {
         path: '/team/team',
         component: () => import('@/views/basicinformation/team/team.vue'),
         name: 'Team',
-        meta: { title: '班组管理', noCache: true }
+        meta: {
+          title: '班组管理',
+          noCache: true
+        }
       },
       {
         path: '/suppliertype/suppliertype',
         component: () => import('@/views/basicinformation/suppliertype/suppliertype.vue'),
         name: 'SupplierType',
-        meta: { title: '供应商类型管理', noCache: true }
+        meta: {
+          title: '供应商类型管理',
+          noCache: true
+        }
       },
       {
         path: '/supplier/supplier',
         component: () => import('@/views/basicinformation/supplier/supplier.vue'),
         name: 'Supplier',
-        meta: { title: '供应商管理', noCache: true }
+        meta: {
+          title: '供应商管理',
+          noCache: true
+        }
       },
       {
         path: '/claimantManufacturer/claimantManufacturer',
         component: () => import('@/views/basicinformation/claimantManufacturer/claimantManufacturer.vue'),
         name: 'ClaimantManufacturer',
-        meta: { title: '索赔厂家管理', noCache: true }
+        meta: {
+          title: '索赔厂家管理',
+          noCache: true
+        }
       },
     ]
   },
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue b/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
deleted file mode 100644
index 1141cc140a..0000000000
--- a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/relation/chooseproducts.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<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="工单编号" class="searchlist">
-                <el-input v-model="listQuery.params.billNo" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="客户名称" class="searchlist">
-                <el-input v-model="listQuery.params.customerName" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="车牌号" class="searchlist">
-                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable />
-              </el-form-item>
-              <el-form-item label="进厂日期">
-                <el-date-picker v-model="listQuery.params.entryStartTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>至
-                <el-date-picker v-model="listQuery.params.entryEndTime" type="date" placeholder="选择日期"
-                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
-                </el-date-picker>
-              </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 fixed label="操作" width="100" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toInfo(scope.row)">确认</el-button>
-              </template>
-            </el-table-column>
-            <el-table-column prop="billNo" label="工单编号" align="center" />
-            <el-table-column prop="billType" label="工单类型" align="center" />
-            <el-table-column prop="customerName" label="客户名称" align="center" />
-            <el-table-column prop="mobile" label="联系电话" align="center" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
-            <el-table-column prop="vehMark" label="车牌号" align="center" />
-            <el-table-column prop="entryTime" 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 {
-    getAsBusrepairBill
-  } from '@/api/Common/dictcommons'
-
-  export default {
-    name: 'SelectVehicle',
-    components: {
-      Pagination
-    },
-    data() {
-      return {
-        isSearchShow: false,
-        searchxianshitit: '隐藏查询条件',
-        tableKey: 0,
-        sids: [],
-        list: [],
-        number: '',
-        listLoading: false,
-        listQuery: {
-          current: 1,
-          size: 10,
-          params: {
-            nodeCode: 3,
-            billNo: '',
-            customerName: '',
-            vehMark: '',
-            entryStartTime: '',
-            entryEndTime: ''
-          },
-          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
-        this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
-        this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
-        // this.listQuery.params.menuUrl = this.$route.path
-        this.listQuery.params.menuUrl = ""
-        getAsBusrepairBill(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,
-          size: 10,
-          params: {
-            nodeCode: 3,
-            billNo: '',
-            customerName: '',
-            vehMark: '',
-            entryStartTime: '',
-            entryEndTime: ''
-          },
-          total: 0
-        }
-        this.getList()
-      },
-      handleSelectionChange(row) {
-        this.sids = row
-      },
-      showData(value, createOrgSid) {
-        // 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.createOrgSid = createOrgSid
-        this.listQuery.current = 1
-        this.listQuery.size = 10
-        this.listQuery.total = 0
-        this.getList()
-      },
-      // 添加修改返回
-      AddUpdateReturn() {
-        if (this.sids.length > 0) {
-          this.$emit('backData', this.sids)
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '请至少选择一条记录进行操作',
-            type: 'error',
-            duration: 2000
-          })
-        }
-      },
-
-      toInfo(row){
-         this.$emit('backData', row.sid)
-      },
-      // 返回
-      handleReturn() {
-        this.$emit('doback')
-      }
-    }
-  }
-</script>
-<style scoped>
-</style>
diff --git a/yxt-as-ui/src/views/maintenanceReceive/index.vue b/yxt-as-ui/src/views/maintenanceReceive/index.vue
new file mode 100644
index 0000000000..cc9d7b7253
--- /dev/null
+++ b/yxt-as-ui/src/views/maintenanceReceive/index.vue
@@ -0,0 +1,392 @@
+<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-select v-model="queryParams.params.repairState" filterable clearable placeholder="请选择"
+                  style="width:100%">
+                  <el-option v-for="item in repairTypeList" :key="item.sid" :label="item.name" :value="item.name">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="工单编号">
+                <el-input v-model="queryParams.params.billNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="queryParams.params.billType" filterable clearable placeholder="请选择"
+                  style="width:100%">
+                  <el-option v-for="item in billTypeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictValue">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="科目">
+                <el-select v-model="queryParams.params.subject" filterable clearable placeholder="请选择"
+                  style="width:100%">
+                  <el-option v-for="item in subjectList" :key="item.subjectSid" :label="item.subject"
+                    :value="item.subject">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="queryParams.params.customerName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="queryParams.params.vehMark" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="queryParams.params.vinNo" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="进厂日期">
+                <el-date-picker v-model="queryParams.params.createTimeStart" 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.createTimeEnd" type="date" placeholder="选择日期"
+                  format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
+                </el-date-picker>
+              </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="80" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column prop="repairState" label="维修状态" align="center" />
+            <el-table-column label="工单编号" align="center">
+              <template slot-scope="scope">
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showResult(scope.row)">
+                  {{ scope.row.billNo }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billTypeValue" label="工单类型" align="center" />
+            <el-table-column prop="subjectValue" label="科目" align="center" />
+            <el-table-column prop="isGoOut" label="是否外出" align="center" />
+            <el-table-column prop="customerName" label="客户名称" align="center" />
+            <el-table-column prop="mobile" label="联系电话" align="center" />
+            <el-table-column prop="vehMark" label="车架号" align="center" />
+            <el-table-column prop="vinNo" label="车牌号" align="center" />
+            <el-table-column prop="entryTime" 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 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divOutInfo v-show="viewState == 2 " ref="divOutInfo" @doback="resetState" @reloadlist="loadList" />
+    <divReturnInfo v-show="viewState == 3" ref="divReturnInfo" @doback="resetState" @reloadlist="loadList" />
+    <divConfirmInfo v-show="viewState ==4" ref="divConfirmInfo" @doback="resetState" @reloadlist="loadList" />
+    <divInfo v-show="viewState == 5" ref="divInfo" @doback="resetState" @reloadlist="loadList" />
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
+  import {
+    selSubjectInfo,
+    typeValues
+  } from '@/api/Common/dictcommons'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divOutInfo from './maintenanceOutbound.vue'
+  import divReturnInfo from './maintenanceReturnBound.vue'
+  import divConfirmInfo from './maintenanceConfirm.vue'
+  import divInfo from './repairbillInfo.vue'
+  export default {
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divOutInfo,
+      divReturnInfo,
+      divConfirmInfo,
+      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: 'toOut',
+            btnLabel: '领料出库'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toReturn',
+            btnLabel: '领料退库'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toConfirm',
+            btnLabel: '商品出库确认'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "repairState": "",
+            "billNo": "",
+            "billType": "",
+            "subject": "",
+            "customerName": "",
+            "vehMark": "",
+            "vinNo": "",
+            "createTimeStart": "",
+            "createTimeEnd": "",
+          }
+        },
+
+        sids: [],
+        selectionList: [],
+        repairTypeList: [{
+            name: "维修中",
+            sid: "1"
+          },
+          {
+            name: "维修完成",
+            sid: "2"
+          }
+        ],
+        billTypeList: [],
+        subjectList: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+      this.init()
+    },
+    methods: {
+
+      init() {
+        typeValues({
+          type: 'billType'
+        }).then((res) => {
+          if (res.success) {
+            this.billTypeList = res.data
+          }
+        })
+        selSubjectInfo({
+          useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem(
+            'defaultOrgPath').lastIndexOf('/') + 1)
+        }).then((resp) => {
+          if (resp.success) {
+            this.subjectList = resp.data
+          }
+        })
+
+      },
+
+      selectionLineChangeHandle(val) {
+        console.log("val", val);
+
+        this.selectionList = val
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+
+      },
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toOut':
+            this.toOut()
+            break
+          case 'toReturn':
+            this.toReturn()
+            break
+          case 'toConfirm':
+            this.toConfirm()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+
+      toOut() {
+        // this.$refs['divOutInfo'].showAdd('236195bd-2c76-4e39-aacb-e6ed89b4ca3d')
+        // this.viewState = 2
+        if (this.sids.length === 1) {
+          this.viewState = 2
+          this.$refs['divOutInfo'].showAdd(this.sids[0])
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '请选择一条记录进行操作'
+          })
+        }
+      },
+      toReturn() {
+        // this.$refs['divReturnInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50')
+        // this.viewState = 3
+        if (this.sids.length === 1) {
+          this.viewState = 3
+          this.$refs['divReturnInfo'].showAdd(this.sids[0])
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '请选择一条记录进行操作'
+          })
+        }
+      },
+      toConfirm() {
+        // this.viewState = 4
+        // this.$refs['divConfirmInfo'].showAdd('4e2b2a7d-d86c-415f-aa69-65e311a73c50')
+        if (this.sids.length === 1) {
+
+          if (this.selectionList[0].repairState == '2') {
+
+            this.viewState = 4
+            this.$refs['divConfirmInfo'].showAdd(this.sids[0])
+          } else {
+            this.$message({
+              showClose: true,
+              type: 'warning',
+              message: '只能选择维修完成的工单'
+            })
+          }
+
+        } else {
+          this.$message({
+            showClose: true,
+            type: 'warning',
+            message: '请选择一条记录进行操作'
+          })
+        }
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+
+      loadList() {
+        this.tableLoading = true
+        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
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "repairState": "",
+            "billNo": "",
+            "billType": "",
+            "subject": "",
+            "customerName": "",
+            "vehMark": "",
+            "vinNo": "",
+            "createTimeStart": "",
+            "createTimeEnd": "",
+          }
+        }
+        this.loadList()
+      },
+
+      resetState() {
+        this.viewState = 1
+      },
+
+      showResult(row) {
+        this.viewState = 5
+        this.$refs['divAdd'].showAdd(row.sid)
+      },
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue
new file mode 100644
index 0000000000..82d2f5ef28
--- /dev/null
+++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceConfirm.vue
@@ -0,0 +1,323 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>商品出库确认</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">确认</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
+      </div>
+
+      <div class="listconadd">
+
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+          <!-- <div class="title">
+          <div>基础信息</div>
+        </div> -->
+          <el-row class="first_row">
+
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item>
+                <el-input v-model="confirmInfo.remarks" placeholder="备注" class="addinputw addinputInfo" clearable />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <div class="title titleOne">
+            <div>维修工单</div>
+          </div>
+
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.sourceBillNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">单据日期</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.billDate}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">服务顾问</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.waitorName }}</span></el-form-item>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.billType}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.subject}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">是否外出</div>
+              <el-form-item>
+                <el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.customerName}}</span>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item>
+                <span class="addinputw addinputInfo">{{formobj.vehMark}}/{{formobj.vinNo}}</span>
+              </el-form-item>
+            </el-col>
+
+            <!-- <el-col :span="8">
+              <div class="span-sty">客户单位</div>
+              <el-form-item>
+                <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
+              </el-form-item>
+            </el-col> -->
+          </el-row>
+
+          <div class="title titleOne">
+            <div>服务项目</div>
+          </div>
+          <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="服务项目" prop="serviceItem" align="center" />
+            <el-table-column label="工种" prop="serviceType" align="center" />
+            <el-table-column label="科目" prop="subject" align="center" />
+            <el-table-column label="维修人" prop="repairerName" align="center" />
+            <el-table-column label="工时提成" prop="examineHourPrice" align="center" />
+            <el-table-column label="工时单价" prop="hourPrice" align="center" />
+            <el-table-column label="工时数" prop="hours" align="center" />
+            <el-table-column label="销售价" prop="price" align="center" />
+            <el-table-column label="折扣" prop="discount" align="center" />
+            <el-table-column label="优惠" prop="discountAmount" align="center" />
+            <el-table-column label="金额" prop="amount" align="center" />
+            <el-table-column label="备注" prop="remarks" align="center" />
+          </el-table>
+
+          <div class="title titleOne">
+            <div>商品列表</div>
+          </div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
+              <el-form-item><el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks"
+                  clearable placeholder="" :disabled="true" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-table v-loading="listLoading" :data="formobj.detailList" border>
+            <!-- <el-table-column type="selection" align="center" width="50"/> -->
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="项目名称" prop="serviceItem" align="center" />
+            <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+            <el-table-column label="单位" prop="unit" align="center" />
+            <el-table-column label="仓库" prop="warehouseName" align="center" />
+            <el-table-column label="库位" prop="warehouseRackCode" align="center" />
+
+            <!-- <el-table-column label="仓库" align="center" width="180">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
+                  @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="180">
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.warehouseRackCode" :disabled="scope.row.warehouseName==''" clearable
+                  @focus="getWarehouseAreaList(scope.row.warehouseSid)" 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 label="销售单价" prop="price" align="center" />
+            <el-table-column label="库存数量" prop="inventoryNum" align="center" />
+            <el-table-column label="出库数量" prop="outboundCount" align="center" />
+            <el-table-column label="备注" prop="remarks" align="center" />
+            <!-- <el-table-column label="出库数量" align="center" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.count" clearable placeholder=""
+                  oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center" width="220">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.remarks" clearable placeholder="" />
+              </template>
+            </el-table-column> -->
+          </el-table>
+
+        </el-form>
+
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
+  export default {
+    components: {},
+    data() {
+      return {
+        viewState: 1,
+        listLoading: false,
+        submitdisabled: false,
+        formobj: {},
+        confirmInfo: {
+          sid: "",
+          remarks: ""
+        }
+      }
+    },
+    created() {},
+    methods: {
+      showAdd(sid) {
+
+        this.confirmInfo.sid = sid
+
+        var params = {
+          sid: sid
+        }
+        req.initBill(params)
+          .then(resp => {
+            if (resp.success) {
+              console.log('>>>>>>>>>initBill', resp)
+
+              this.formobj = resp.data
+
+
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+
+      resetState() {
+        this.viewState = 1
+      },
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.confirmInfo)
+
+        req.saveConfirm(this.confirmInfo)
+          .then(resp => {
+            if (resp.success) {
+              this.$message({
+                showClose: true,
+                type: 'success',
+                message: resp.msg
+              })
+              this.handleReturn('true')
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {}
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+      indexMethod(index) {
+        return index + 1
+      },
+
+    }
+
+  }
+</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;
+  }
+
+  .el-radio /deep/ .el-radio__label {
+
+    font-size: 14px !important;
+
+  }
+
+  .addinputInfo-one {
+    margin-left: 170px !important;
+  }
+
+  .span-sty-one {
+    width: 180px !important;
+  }
+</style>
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue
similarity index 86%
rename from yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
rename to yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue
index 306e9f19ea..f95e36cf91 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/index.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceOutbound.vue
@@ -7,7 +7,7 @@
         <div>【新增】维修出库</div>
         <!-- start 添加修改按钮 -->
         <div>
-          <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button>
+          <!-- <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button> -->
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">出库</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
@@ -115,7 +115,10 @@
             <el-col :span="8">
               <div class="span-sty">是否外出</div>
               <el-form-item>
-                <el-form-item><span class="addinputw addinputInfo">{{formobj.subject}}</span></el-form-item>
+                <el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
           </el-row>
@@ -136,12 +139,12 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <div class="span-sty">客户单位</div>
               <el-form-item>
                 <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
 
           <div class="title titleOne">
@@ -159,7 +162,7 @@
             <el-table-column label="工种" prop="serviceType" align="center" />
             <el-table-column label="科目" prop="subject" align="center" />
             <el-table-column label="维修人" prop="repairerName" align="center" />
-            <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
+            <el-table-column label="工时提成" prop="examineHourPrice" align="center" />
             <el-table-column label="工时单价" prop="hourPrice" align="center" />
             <el-table-column label="工时数" prop="hours" align="center" />
             <el-table-column label="销售价" prop="price" align="center" />
@@ -172,6 +175,13 @@
           <div class="title titleOne">
             <div>商品列表</div>
           </div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
+              <el-form-item><el-input class="addinputInfo-one" style="width: 70%" v-model="formobj.registerRemarks"
+                  clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
           <el-table v-loading="listLoading" :data="formobj.detailList" border>
             <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
@@ -180,25 +190,25 @@
                 <el-button type="primary" size="mini" @click="deleteGoods(scope.row)">删除</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="项目名称" prop="serviceItem"width="120" align="center" />
+            <el-table-column label="项目名称" prop="serviceItem" width="120" align="center" />
             <!-- <el-table-column label="商品名称" prop="goodsSpuName" align="center" /> -->
 
-            <el-table-column label="商品名称" align="center" min-width="120">
+            <el-table-column label="商品名称" align="center" min-width="180">
               <template slot-scope="scope">
-                <el-popover placement="right" width="1000" trigger="click">
+                <el-popover placement="right" width="800" trigger="click">
                   <div>
                     <el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row
                       @current-change="commodityCurrentChange($event, scope.row)">
-                      <el-table-column fixed prop="goodsID" label="商品ID" width="150" align="center" />
                       <el-table-column fixed prop="goodsSpuName" label="商品名称" width="180" align="center" />
                       <el-table-column fixed prop="goodsSkuCode" label="商品图号" width="100" align="center" />
-                      <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
+                      <el-table-column prop="count" label="库存数量" width="100" align="center" />
                       <el-table-column prop="unit" label="单位" align="center" />
-                      <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
-                      <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
                       <el-table-column prop="money" label="入库单价" width="100" align="center" />
-                      <el-table-column prop="count" label="库存数量" width="100" align="center" />
                       <el-table-column prop="supplierName" label="供应商" width="200" align="center" />
+                      <el-table-column prop="warehouseName" label="仓库" width="150" align="center" />
+                      <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
+                      <el-table-column prop="goodsID" label="商品ID" width="150" align="center" />
+                      <el-table-column prop="goodsSkuOwnSpec" label="规格" width="100" align="center" />
                     </el-table>
 
                     <pagination v-show="commodityData.length > 0" :total="commodityQuery.total"
@@ -213,15 +223,14 @@
                 </el-popover>
               </template>
             </el-table-column>
-
-
-            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+            <el-table-column label="商品编码" prop="goodsSkuCode" width="100" align="center" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" width="120" align="center" />
             <el-table-column label="单位" prop="unit" align="center" />
-            <el-table-column label="仓库" prop="warehouseName"width="150" align="center" />
+            <el-table-column label="仓库" prop="warehouseName" width="150" align="center" />
             <el-table-column label="库位" prop="warehouseRackCode" align="center" />
-            <el-table-column label="销售单价" prop="price" align="center" />
-            <el-table-column label="已出数量" prop="outboundCount" align="center" />
+            <el-table-column label="销售单价" prop="price" width="120" align="center" />
+            <el-table-column label="已出数量" prop="outboundCount" width="120" align="center" />
+            <el-table-column label="库存数量" prop="inventoryNum" width="120" align="center" />
             <el-table-column label="出库数量" align="center" width="120">
               <template slot-scope="scope">
                 <el-input @input="commodityComputeYHAndXSJE(scope.row,$event)" v-model="scope.row.count" clearable
@@ -248,7 +257,7 @@
 </template>
 
 <script>
-  import req from '@/api/maintenance/maintenanceOutbound.js'
+  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
   import chooseproducts from './relation/chooseproducts'
   import {
     getOrgSidByPath,
@@ -338,10 +347,6 @@
       }
     },
     created() {
-      this.initData()
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
 
     },
     methods: {
@@ -358,6 +363,50 @@
           }
         })
 
+      },
+
+      showAdd(sid) {
+        this.initData()
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        var params = {
+          sid: sid
+        }
+        req.initBill(params)
+          .then(resp => {
+            if (resp.success) {
+              console.log('>>>>>>>>>initBill', resp)
+
+              this.formobj = resp.data
+              this.formobj.detailList = []
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+              this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+              this.formobj.createByName = window.sessionStorage.getItem('name')
+              this.formobj.createTime = getCurrentDate()
+
+              getOrgSidByPath({
+                orgPath: window.sessionStorage.getItem('defaultOrgPath')
+              }).then((res) => {
+                if (res.success) {
+                  this.formobj.createOrgSid = res.data
+                  this.formobj.useOrgSid = res.data
+                  // this.commodityQuery.params.useOrgSid = res.data
+                }
+              })
+
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
+
+
       },
       backData(value) {
         this.viewState = 1
@@ -463,9 +512,7 @@
         })
       },
       handleReturn(isreload) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
+        if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
           "sid": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
@@ -497,6 +544,8 @@
 
           ]
         }
+        this.submitdisabled = false
+        this.$emit('doback')
       },
       indexMethod(index) {
         return index + 1
@@ -545,8 +594,9 @@
         row.warehouseName = value.warehouseName
         row.warehouseRackSid = value.warehouseRackSid
         row.warehouseRackCode = value.warehouseRackCode
-        row.outboundCount = value.outboundCount
-        row.count = 0
+        row.outboundCount = value.outboundCount // 已出库数量
+        row.inventoryNum = value.count // 库存数量
+        row.count = 0 //出库数量
         row.amount = 0.00
         row.price = value.price
         row.remarks = ''
@@ -641,4 +691,12 @@
     font-size: 14px !important;
 
   }
+
+  .addinputInfo-one {
+    margin-left: 170px !important;
+  }
+
+  .span-sty-one {
+    width: 180px !important;
+  }
 </style>
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
similarity index 88%
rename from yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
rename to yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
index 7d4e11ea9a..5ade9acb5f 100644
--- a/yxt-as-ui/src/views/maintenance/maintenanceReturnBound/index.vue
+++ b/yxt-as-ui/src/views/maintenanceReceive/maintenanceReturnBound.vue
@@ -7,8 +7,8 @@
         <div>【新增】维修退库</div>
         <!-- start 添加修改按钮 -->
         <div>
-          <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button>
-          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">退库</el-button>
+          <!-- <el-button type="primary" size="small" @click="seleMaintenance">选择维修工单</el-button> -->
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">入库</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
         <!-- end 添加修改按钮 -->
@@ -24,21 +24,21 @@
           <el-row class="first_row">
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 操作人</div>
+              <div class="span-sty"><span class="must">*</span> 申请人</div>
               <el-form-item prop="createByName">
                 <span class="addinputw addinputInfo">{{formobj.createByName}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 操作部门</div>
+              <div class="span-sty"><span class="must">*</span> 申请部门</div>
               <el-form-item prop="deptName">
                 <span class="addinputw addinputInfo">{{formobj.deptName}}</span>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
-              <div class="span-sty">操作日期</div>
+              <div class="span-sty">申请日期</div>
               <el-form-item prop="createByName">
                 <el-form-item><span class="addinputw addinputInfo">{{ formobj.createTime }}</span></el-form-item>
               </el-form-item>
@@ -49,7 +49,7 @@
           <el-row>
 
             <el-col :span="8">
-              <div class="span-sty"><span class="must">*</span> 领料人</div>
+              <div class="span-sty"><span class="must">*</span> 退料人</div>
               <el-form-item prop="warehouseManager">
                 <el-select v-model="formobj.warehouseManager" filterable clearable placeholder="请选择"
                   class="addinputw addinputInfo" @change="receivePerSelect">
@@ -115,7 +115,11 @@
             <el-col :span="8">
               <div class="span-sty">是否外出</div>
               <el-form-item>
-                <el-form-item><span class="addinputw addinputInfo">{{formobj.subject}}</span></el-form-item>
+                <el-radio-group class="addinputw addinputInfo" :disabled="true" v-model="formobj.isGoOut">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+
               </el-form-item>
             </el-col>
           </el-row>
@@ -136,12 +140,12 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <div class="span-sty">客户单位</div>
               <el-form-item>
                 <el-form-item><span class="addinputw addinputInfo">{{ formobj.customerOrg }}</span></el-form-item>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
 
           <div class="title titleOne">
@@ -154,7 +158,7 @@
             <el-table-column label="工种" prop="serviceType" align="center" />
             <el-table-column label="科目" prop="subject" align="center" />
             <el-table-column label="维修人" prop="repairerName" align="center" />
-            <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
+            <el-table-column label="工时提成" prop="examineHourPrice" align="center" />
             <el-table-column label="工时单价" prop="hourPrice" align="center" />
             <el-table-column label="工时数" prop="hours" align="center" />
             <el-table-column label="销售价" prop="price" align="center" />
@@ -171,7 +175,7 @@
           <el-table v-loading="listLoading" :data="formobj.detailList" border>
             <!-- <el-table-column type="selection" align="center" width="50"/> -->
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column label="项目名称" prop="serviceItem" align="center" />
+            <!-- <el-table-column label="项目名称" prop="serviceItem" align="center" /> -->
             <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
             <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
             <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
@@ -226,7 +230,7 @@
 </template>
 
 <script>
-  import req from '@/api/maintenance/maintenanceReturnBound.js'
+  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
   import req2 from '@/api/storage/allocation.js'
   import chooseproducts from './relation/chooseproducts'
   import {
@@ -305,13 +309,7 @@
         }
       }
     },
-    created() {
-      this.initData()
-      this.$nextTick(() => {
-        this.$refs['form_obj'].clearValidate()
-      })
-
-    },
+    created() {},
     methods: {
       initData() {
         selAllByOrgSidPath({
@@ -321,11 +319,54 @@
             this.receivePerList = res.data
 
             console.log("aaaaaa", this.receivePerList);
-
           }
         })
 
+
+
+      },
+
+      showAdd(sid) {
         this.getWarehouseList()
+        this.initData()
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+
+        var params = {
+          sid: sid
+        }
+        req.initBill(params)
+          .then(resp => {
+            if (resp.success) {
+              console.log('>>>>>>>>>initBill', resp)
+
+              this.formobj = resp.data
+
+              this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
+                .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+              this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
+                .getItem('defaultOrgPath').lastIndexOf('/') + 1)
+              this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+              this.formobj.createByName = window.sessionStorage.getItem('name')
+              this.formobj.createTime = getCurrentDate()
+
+
+              getOrgSidByPath({
+                orgPath: window.sessionStorage.getItem('defaultOrgPath')
+              }).then((res) => {
+                if (res.success) {
+                  this.formobj.createOrgSid = res.data
+                  this.formobj.useOrgSid = res.data
+                }
+              })
+
+
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          })
+          .catch(() => {})
 
       },
       backData(value) {
@@ -401,9 +442,7 @@
         })
       },
       handleReturn(isreload) {
-        this.$nextTick(() => {
-          this.$refs['form_obj'].clearValidate()
-        })
+        if (isreload === 'true') this.$emit('reloadlist')
         this.formobj = {
           "sid": "",
           "createBySid": window.sessionStorage.getItem('userSid'),
@@ -435,6 +474,8 @@
 
           ]
         }
+        this.submitdisabled = false
+        this.$emit('doback')
       },
       indexMethod(index) {
         return index + 1
@@ -447,10 +488,12 @@
       },
 
       getWarehouseList() {
+        console.log("getWarehouseList>>>>>>>>>>>>>");
         var parpams = {
           orgPath: window.sessionStorage.getItem('defaultOrgPath'),
         }
 
+        console.log("getWarehouseList", parpams);
         req2.getWarehouses(parpams).then((res) => {
           if (res.success) {
             this.warehouseList = res.data
diff --git a/yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue b/yxt-as-ui/src/views/maintenanceReceive/relation/chooseproducts.vue
similarity index 100%
rename from yxt-as-ui/src/views/maintenance/maintenanceOutbound/relation/chooseproducts.vue
rename to yxt-as-ui/src/views/maintenanceReceive/relation/chooseproducts.vue
diff --git a/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue b/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue
new file mode 100644
index 0000000000..901dce0e41
--- /dev/null
+++ b/yxt-as-ui/src/views/maintenanceReceive/repairbillInfo.vue
@@ -0,0 +1,638 @@
+<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" @click="negativeSettlement()">反结算</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">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">制单人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </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.createDate }}</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.billType }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">科目</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">索赔厂家</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</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.isGoOut == '1' ? '是' : '否' }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">进厂时间</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.entryTime }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计完工</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.estimatedFinishTime }}</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.waitorName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">班组</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.groupName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">主修人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.mainRepairers }}</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.printRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">特殊标注</div>
+              <el-form-item><span
+                  class="addinputInfo">{{ formobj.isSpecialSign == '1' ? '有' : '否' }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-collapse v-model="activeNames">
+            <el-collapse-item title="客户信息" name="1">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">客户</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">联系电话</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">客户来源</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.customerSource }}</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.vehMark }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">车架号</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">车型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.vehModel }}</span></el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <div class="span-sty">行驶里程(Km)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.mileage }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">油量(L)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.oil }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">当前里程(Km)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.currentMileage }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="对接人信息" name="2">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">对接人姓名</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.dockingPeople }}</span></el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <div class="span-sty">对接人电话</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.dockingPhone }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+            <el-collapse-item title="保险信息" name="3">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">责任划分</div>
+                  <el-form-item><span
+                      class="addinputInfo">{{ formobj.insuranceVo.responsibility }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">责任比例</div>
+                  <el-form-item><span
+                      class="addinputInfo">{{ formobj.insuranceVo.responsibilityRatio }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">是否存在人伤</div>
+                  <el-form-item><span
+                      class="addinputInfo">{{ formobj.insuranceVo.isPersonInjuries == '1' ? '是' : formobj.insuranceVo.isPersonInjuries == '0' ? '否' : ''  }}</span></el-form-item>
+                </el-col>
+              </el-row>
+              <el-table :key="insuranceKey" :data="formobj.insuranceVo.insuranceList" :index="index" border
+                style="width: 100%">
+                <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+                <el-table-column prop="useInsurer" label="使用保险方" align="center" min-width="150" />
+                <el-table-column prop="insuranceType" label="使用险种" align="center" min-width="150" />
+                <el-table-column prop="insuranceCompany" label="保险公司" align="center" min-width="150" />
+                <el-table-column prop="claimBillNo" label="报案号" align="center" min-width="180" />
+                <el-table-column prop="investigator" label="勘察员及电话" align="center" min-width="220" />
+                <el-table-column prop="lossAdjuster" label="定损员及电话" align="center" min-width="220" />
+              </el-table>
+            </el-collapse-item>
+            <el-collapse-item title="发票信息" name="4">
+              <el-row style="border-top: 1px solid #e0e3eb">
+                <el-col :span="8">
+                  <div class="span-sty">是否开发票</div>
+                  <el-form-item><span
+                      class="addinputInfo">{{ formobj.invoiceVo.isInvoicing == '1' ? '是' : formobj.invoiceVo.isInvoicing == '0' ? '否' : '' }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">发票类型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceType }}</span></el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <div class="span-sty">开票单位</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.invoiceVo.invoiceCompany }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </el-collapse-item>
+          </el-collapse>
+          <div class="title">服务项目</div>
+          <el-table :key="serviceKey" :data="formobj.sitemVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="serviceItem" label="服务项目" align="center" width="200" />
+            <el-table-column prop="serviceType" label="工种" align="center" width="150" />
+            <el-table-column prop="repairerName" label="维修人" width="200" align="center" />
+            <el-table-column prop="examineHourPrice" label="工时提成" align="center" width="100" />
+            <el-table-column prop="hourPrice" label="工时单价" align="center" width="150" />
+            <el-table-column prop="hours" label="工时数" align="center" width="100" />
+            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="discount" label="折扣" align="center" width="100" />
+            <el-table-column prop="discountAmount" label="优惠" align="center" width="150" />
+            <el-table-column prop="amount" label="金额" align="center" width="150" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
+          </el-table>
+          <div class="title">商品</div>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty span-sty-one" style="width: 300px;!important;">前台登记时对商品要求备注</div>
+              <el-form-item><span class="addinputInfo-one">{{ formobj.registerRemarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" 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="规格" width="100" align="center" />
+            <el-table-column prop="unit" label="单位" width="100" align="center" />
+            <el-table-column prop="warehouseName" label="仓库" width="100" align="center" />
+            <el-table-column prop="warehouseRackCode" label="库位" width="100" align="center" />
+            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="count" label="数量" width="100" align="center" />
+            <el-table-column prop="discount" label="折扣" align="center" width="100" />
+            <el-table-column prop="discountAmount" label="优惠" width="100" align="center" />
+            <el-table-column prop="amount" label="金额" width="100" align="center" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
+          </el-table>
+          <div class="title">附加项目</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">外出费(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.outAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.outRemarks }}</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.subsidyAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.subsidyRemarks }}</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.rescueAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rescueRemarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <span></span>
+            </el-col>
+          </el-row>
+          <el-table :key="subjoinKey" :data="formobj.aitemVos" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="aitemName" label="其它附加项目" align="center" width="200" />
+            <el-table-column prop="price" label="销售价" align="center" width="150" />
+            <el-table-column prop="remarks" label="备注" align="center" min-width="200" />
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="border-right: 0px">应收合计：</div>
+              <el-form-item><span class="addinputInfo">{{ ysTotal }} = 工时费：{{ gsfTotal }} + 材料费：{{ clfTotal }} +
+                  附加费：{{ fjfTotal }} + 税额：0</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="border-right: 0px">实收合计：</div>
+              <el-form-item><span class="addinputInfo">{{ ssTotal }} = 应收合计：{{ ysTotal }} -
+                  优惠：{{ yhTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- <workslrsettlementAdd v-show="viewState == 2" ref="divFJS" @doback="resetState" /> -->
+  </div>
+</template>
+
+<script>
+  import req from '@/api/operation/repairbill'
+  // import workslrsettlementAdd from '../workslrsettlement/workslrsettlementAdd'
+
+  export default {
+    name: 'RepairBillInfo',
+    components: {
+      // workslrsettlementAdd
+    },
+    data() {
+      return {
+        viewTitle: '',
+        viewState: 1,
+        activeNames: '1',
+        tableKey: 0,
+        index: 0,
+        // service服务
+        serviceKey: 1,
+        // subjoin附加项目
+        subjoinKey: 2,
+        // insuranceKey保险信息
+        insuranceKey: 3,
+        formobj: {
+          sid: '',
+          registerRemarks: '',
+          billNo: '',
+          createByName: '',
+          deptName: '',
+          createDate: '',
+          billTypeKey: '',
+          billType: '',
+          subjectSid: '',
+          subject: '',
+          claimManufacturerSid: '',
+          claimManufacturer: '',
+          isGoOut: '',
+          estimatedFinishTime: '',
+          entryTime: '',
+          nodeName: '',
+          waitorName: '',
+          waitorSid: '',
+          groupSid: '',
+          groupName: '',
+          mainRepairers: '',
+          printRemarks: '',
+          remarks: '',
+          isSpecialSign: '',
+          discountAmount: '',
+          coupon: '',
+          scoreDeduct: '',
+          nodeTime: '',
+          outDoorState: '',
+          outDoorTime: '',
+          customerSid: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          customerSource: '',
+          memberCardSid: '',
+          memberCarNumber: '',
+          vehMark: '',
+          vinNo: '',
+          vehModel: '',
+          mileage: '',
+          oil: '',
+          currentMileage: '',
+          dockingPeopleSid: '',
+          dockingPeople: '',
+          dockingPhone: '',
+          invoiceVo: {
+            isInvoicing: '',
+            invoiceType: '',
+            invoiceTypeKey: '',
+            invoiceCompanySid: '',
+            invoiceCompany: ''
+          },
+          insuranceVo: {
+            responsibility: '',
+            responsibilityKey: '',
+            isPersonInjuries: '',
+            responsibilityRatioKey: '',
+            responsibilityRatio: '',
+            insuranceList: []
+          },
+          sitemVos: [],
+          aitemVos: [],
+          goodsDetailsVos: [],
+          createBySid: '',
+          operatorSid: '',
+          nodeCode: '',
+          settleVo: {
+            payerNo: '',
+            payerName: '',
+            receivableAmount: '',
+            depositdeductAmount: '',
+            settleKey: '',
+            settleValue: '',
+            settleAmount: '',
+            otherSettleKey: '',
+            otherSettleValue: '',
+            debts: '',
+            settleTime: '',
+            otherSettleAmount: ''
+          },
+          showReSettleBtn: true,
+          hourAmount: '',
+          otherAmount: '',
+          goodsAmount: '',
+          addAmount: '',
+          taxAmount: '',
+          outAmount: '',
+          subsidyAmount: '',
+          rescueAmount: '',
+          actualAmount: '',
+          receivableAmount: '',
+          subsidyRemarks: '',
+          rescueRemarks: '',
+          outRemarks: '',
+          fileName: '',
+          operator: '',
+          useOrgSid: '',
+          createOrgSid: ''
+        },
+        rules: {}
+      }
+    },
+    computed: {
+      // 计算工时费 = 服务项目列表中所有销售价之和
+      gsfTotal() {
+        let gsf = '0'
+        if (this.formobj.sitemVos.length > 0) {
+          this.formobj.sitemVos.forEach((e) => {
+            if (e.serviceItem !== '') {
+              gsf = Math.round((parseFloat(gsf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+            }
+          })
+        }
+        return gsf
+      },
+      // 计算材料费 = 商品列表中所有销售价 * 数量的和
+      clfTotal() {
+        let clf = '0'
+        if (this.formobj.goodsDetailsVos.length > 0) {
+          this.formobj.goodsDetailsVos.forEach((e) => {
+            if (e.goodsSpuName !== '') {
+              clf = Math.round((parseFloat(clf) + (parseFloat(e.price !== '' ? e.price : '0') * parseFloat(e
+                .count !== '' ? e.count : '0'))) * 100) / 100
+            }
+          })
+        }
+        return clf
+      },
+      // 计算附加费 == 外出费 + 厂家补助 + 施救费 + 附加项目列表中所有销售价之和
+      fjfTotal() {
+        let fjf = '0'
+        fjf = parseFloat(this.formobj.outAmount !== '' ? this.formobj.outAmount : '0') + parseFloat(this.formobj
+          .subsidyAmount !== '' ? this.formobj.subsidyAmount : '0') + parseFloat(this.formobj.rescueAmount !== '' ?
+          this.formobj.rescueAmount : '0')
+        if (this.formobj.aitemVos.length > 0) {
+          this.formobj.aitemVos.forEach((e) => {
+            if (e.aitemName !== '') {
+              fjf = Math.round((parseFloat(fjf) + parseFloat(e.price !== '' ? e.price : '0')) * 100) / 100
+            }
+          })
+        }
+        return fjf
+      },
+      // 计算应收合计 = 工时费 + 材料费 + 附加费 + 税额
+      ysTotal() {
+        let ys = '0'
+        ys = Math.round((parseFloat(ys) + parseFloat(this.gsfTotal) + parseFloat(this.clfTotal) + parseFloat(this
+          .fjfTotal)) * 100) / 100
+        return ys
+      },
+      // 优惠 = 服务项目列表中的所有优惠之和 + 商品列表中所有优惠之和
+      yhTotal() {
+        let yh = '0'
+        if (this.formobj.sitemVos.length > 0) {
+          this.formobj.sitemVos.forEach((e) => {
+            if (e.serviceItem !== '') {
+              yh = Math.round((parseFloat(yh) + parseFloat(e.discountAmount !== '' ? e.discountAmount : '0')) *
+                100) / 100
+            }
+          })
+        }
+        if (this.formobj.goodsDetailsVos.length > 0) {
+          this.formobj.goodsDetailsVos.forEach((e) => {
+            if (e.goodsSpuName !== '') {
+              yh = Math.round((parseFloat(yh) + parseFloat(e.discountAmount !== '' ? e.discountAmount : '0')) *
+                100) / 100
+            }
+          })
+        }
+        return yh
+      },
+      // 计算实收合计 = 应收合计 - 优惠
+      ssTotal() {
+        let ysje = '0'
+        ysje = Math.round((parseFloat(ysje) + parseFloat(this.ysTotal) - parseFloat(this.yhTotal)) * 100) / 100
+        return ysje
+      }
+    },
+    methods: {
+      showInfo(sid) {
+        this.viewTitle = '维修单详情'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        req.fetchBySid(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+            if (this.formobj.sitemVos.length > 0) {
+              this.formobj.sitemVos.forEach((e) => {
+                if (e.staffNameList.length > 0) {
+                  e.repairerName = e.staffNameList.join(',')
+                }
+              })
+            }
+          }
+        })
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      negativeSettlement() {
+        this.viewState = 2
+        this.$refs['divFJS'].showAdd(this.formobj.sid)
+      },
+      handleReturn() {
+        this.formobj = {
+          sid: '',
+          registerRemarks: '',
+          billNo: '',
+          createByName: '',
+          deptName: '',
+          createDate: '',
+          billTypeKey: '',
+          billType: '',
+          subjectSid: '',
+          subject: '',
+          claimManufacturerSid: '',
+          claimManufacturer: '',
+          isGoOut: '',
+          estimatedFinishTime: '',
+          entryTime: '',
+          nodeName: '',
+          waitorName: '',
+          waitorSid: '',
+          groupSid: '',
+          groupName: '',
+          mainRepairers: '',
+          printRemarks: '',
+          remarks: '',
+          isSpecialSign: '',
+          discountAmount: '',
+          coupon: '',
+          scoreDeduct: '',
+          nodeTime: '',
+          outDoorState: '',
+          outDoorTime: '',
+          customerSid: '',
+          customerName: '',
+          mobile: '',
+          customerOrg: '',
+          customerSource: '',
+          memberCardSid: '',
+          memberCarNumber: '',
+          vehMark: '',
+          vinNo: '',
+          vehModel: '',
+          mileage: '',
+          oil: '',
+          currentMileage: '',
+          dockingPeopleSid: '',
+          dockingPeople: '',
+          dockingPhone: '',
+          invoiceVo: {
+            isInvoicing: '',
+            invoiceType: '',
+            invoiceTypeKey: '',
+            invoiceCompanySid: '',
+            invoiceCompany: ''
+          },
+          insuranceVo: {
+            responsibility: '',
+            responsibilityKey: '',
+            isPersonInjuries: '',
+            responsibilityRatioKey: '',
+            responsibilityRatio: '',
+            insuranceList: []
+          },
+          sitemVos: [],
+          aitemVos: [],
+          goodsDetailsVos: [],
+          createBySid: '',
+          operatorSid: '',
+          nodeCode: '',
+          settleVo: {
+            payerNo: '',
+            payerName: '',
+            receivableAmount: '',
+            depositdeductAmount: '',
+            settleKey: '',
+            settleValue: '',
+            settleAmount: '',
+            otherSettleKey: '',
+            otherSettleValue: '',
+            debts: '',
+            settleTime: '',
+            otherSettleAmount: ''
+          },
+          showReSettleBtn: true,
+          hourAmount: '',
+          otherAmount: '',
+          goodsAmount: '',
+          addAmount: '',
+          taxAmount: '',
+          outAmount: '',
+          subsidyAmount: '',
+          rescueAmount: '',
+          actualAmount: '',
+          receivableAmount: '',
+          subsidyRemarks: '',
+          rescueRemarks: '',
+          outRemarks: '',
+          fileName: '',
+          operator: '',
+          useOrgSid: '',
+          createOrgSid: ''
+        }
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .span-sty-one {
+    width: 180px !important;
+  }
+
+  .addinputInfo-one {
+    margin-left: 170px !important;
+  }
+</style>
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
index 8a4d5c4939..924d704a31 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue
@@ -79,15 +79,24 @@
             <el-table-column prop="billNo" label="单据编号" align="center" width="220" />
             <el-table-column prop="createTime" label="单据日期" align="center" width="150" />
             <el-table-column prop="createByName" label="制单人" align="center" width="150" />
-            <el-table-column prop="sourceBillNo" label="采购单号" align="center" width="180" />
+            <!-- <el-table-column prop="sourceBillNo" label="采购单号" align="center" width="180" /> -->
+            <el-table-column label="采购单号" align="center" width="180">
+              <template slot-scope="scope">
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showSourceBillDetail(scope.row)">
+                  {{ scope.row.sourceBillNo }}
+                </div>
+              </template>
+            </el-table-column>
             <el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
+            <el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="180" />
+            <el-table-column prop="manufactorBillTypeValue" label="厂家订单类型" align="center" width="150" />
             <el-table-column prop="supplierName" label="供应商" align="center" width="150" />
             <el-table-column prop="contact" label="联系人" align="center" width="150" />
             <el-table-column prop="mobile" label="联系人电话" align="center" width="150" />
             <el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150" />
             <el-table-column prop="billState" label="单据状态" align="center" width="150" />
-            <el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" />
-            <el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" />
+            <!-- <el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" /> -->
+            <!-- <el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" /> -->
 
 
           </el-table>
@@ -105,6 +114,7 @@
     <!-- 新增修改部分组件 -->
     <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
     <divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
+    <sourceBillInfo v-show="viewState == 5" ref="sourceinfo" @doback="resetState" @reloadlist="loadList" />
 
     <el-dialog title="审核单据" :visible.sync="dialogVisible" :before-close="handleClose">
       <el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
@@ -155,13 +165,15 @@
   import pageye from '@/components/pagination/pageye'
   import divAdd from './receiptAdd.vue'
   import divInfo from './receiptInfo.vue'
+  import sourceBillInfo from './procurementInfo.vue'
   export default {
     components: {
       ButtonBar,
       Pagination,
       pageye,
       divAdd,
-      divInfo
+      divInfo,
+      sourceBillInfo
     },
     data() {
       return {
@@ -177,18 +189,27 @@
         searchxianshitit: '显示查询条件',
         tableLoading: false,
         dataList: [],
-        btnList: [{
+        btnList: [
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAudit',
+          //   btnLabel: '审核'
+          // },
+          {
             type: 'primary',
             size: 'small',
             icon: 'plus',
-            btnKey: 'toAudit',
-            btnLabel: '审核'
-          }, {
-            type: 'primary',
+            btnKey: 'toAdd',
+            btnLabel: '新增收货单'
+          },
+          {
+            type: 'danger',
             size: 'small',
             icon: 'plus',
-            btnKey: 'toAdd',
-            btnLabel: '收货'
+            btnKey: 'toEnd',
+            btnLabel: '终止'
           },
           {
             type: 'info',
@@ -260,6 +281,14 @@
       this.loadList()
     },
     methods: {
+      showSourceBillDetail(row) {
+        console.log("showSourceBillDetail》》》》", row)
+
+        this.viewState = 5
+        this.$refs['sourceinfo'].showInfo(row.sourceBillSid)
+        // this.$refs['sourceinfo'].showInfo('1b20ee30-d7d5-4cd0-8ee3-3802ddd12ff2')
+
+      },
       saveExamine() {
 
       },
@@ -291,6 +320,11 @@
         console.log("val", val);
 
         this.selectionList = val
+        const aa = []
+        val.forEach(element => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
 
       },
       // 搜索条件效果
@@ -310,6 +344,9 @@
           case 'toAdd':
             this.toAdd()
             break
+          case 'toEnd':
+            this.toEnd()
+            break
           case 'doClose':
             this.doClose()
             break
@@ -359,6 +396,57 @@
         }
         this.loadList()
       },
+      toEnd() {
+
+        for (var i = 0; i < this.selectionList.length; i++) {
+
+          if (this.selectionList[i].billState == '已收货' || this.selectionList[i].billState == '已收货(部分终止)') {
+            this.$message({
+              type: 'warning',
+              message: "不可选择已收货或已终止的记录。",
+              showClose: true
+            })
+            return
+          }
+        }
+
+        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.billToEnd(this.sids).then((resp) => {
+              loading.close()
+              if (resp.success) {
+                this.$message({
+                  type: 'success',
+                  message: resp.msg,
+                  showClose: true
+                })
+                this.loadList()
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            }).catch(e => {
+              loading.close()
+            })
+          }).catch(() => {})
+        } else {
+          this.$message({
+            showClose: true,
+            message: '请至少选择一条记录进行终止操作'
+          })
+        }
+
+      },
       toAdd() {
 
         if (this.selectionList.length != 1) {
@@ -370,7 +458,7 @@
           return
         }
 
-        if(this.selectionList[0].billState=='已收货'){
+        if (this.selectionList[0].billState == '已收货') {
           this.$message({
             type: 'warning',
             message: "此记录已完成,不可重复操作。",
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/procurementInfo.vue b/yxt-as-ui/src/views/storage/deliveryNotice/procurementInfo.vue
new file mode 100644
index 0000000000..22ade4459c
--- /dev/null
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/procurementInfo.vue
@@ -0,0 +1,389 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <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">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <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.createByName }}</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.purchaseTypeValue }}<span
+                    v-show="formobj.purchaseTypeValue == '代理库'"
+                    style="margin-left: 20px">{{ formobj.operateBrandValue }}</span></span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.purchaseReasonValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">付款方式</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.payTypeValue }}</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.supplierName }}<span
+                    v-show="formobj.purchaseTypeValue == '代理库'"
+                    style="margin-left: 20px">{{ formobj.warehouseTypeValue }}</span></span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否开发票</div>
+              <el-form-item><span
+                  class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
+                <div class="span-sty">发票类型(税率)</div>
+                <el-form-item><span
+                    class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}{{ formobj.purchaseBillInvoice.taxRate == '' ? '' : '(' + formobj.purchaseBillInvoice.taxRate + '%)' }}</span></el-form-item>
+              </div>
+            </el-col>
+          </el-row>
+          <el-row v-show="formobj.payTypeValue == '预付款'">
+            <el-col :span="24">
+              <div class="span-sty">预付款情况</div>
+              <el-form-item><span class="addinputInfo">当前预付款项金额(元)：{{ formobj.prepaymentAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-show="formobj.payTypeValue == '月结'">
+            <el-col :span="24">
+              <div class="span-sty">月结欠款情况</div>
+              <el-form-item><span class="addinputInfo">累计欠款金额(元)：{{ formobj.owedAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预计到货日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-if="formobj.payTypeValue == '单笔付款'">
+            <div class="title">订金及付款申请</div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">是否先付货款</div>
+                <el-form-item><span
+                    class="addinputInfo">{{ formobj.purchasePay.isFirstPay == '1' ? '是' : '否' }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
+                <div class="span-sty">审批通过后付订金</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.deposit }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
+                <div class="span-sty">验货后付货款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
+              </el-col>
+              <el-col :span="16" v-else>
+                <div class="span-sty">审批通过后付货款</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</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.purchasePay.accountName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">开户行</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">银行账号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="16">
+                <div class="span-sty">其他费用名称</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmountName }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">其他费用合计</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmount }}</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.purchasePay.payRemark }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">附件</div>
+                <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px"
+                    v-for="(item, index) in formobj.purchasePay.filePaths" :key="index" :src="item"
+                    :preview-src-list="formobj.purchasePay.filePaths" /></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="title ">商品列表</div>
+          <el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
+            <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
+            <el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
+            <el-table-column prop="goodsSkuCode" label="图号" align="center" width="200" />
+            <el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="200" />
+            <el-table-column prop="unit" label="单位" align="center" width="100" />
+            <el-table-column prop="count" label="采购数量" align="center" width="150" />
+            <el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价(元)"
+              align="center" min-width="150" />
+            <el-table-column prop="taxPrice" v-else label="不含税单价(元)" align="center" min-width="150" />
+            <el-table-column prop="amount" label="采购金额(元)" align="center" width="200" />
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="border-right: 0px">数量：</div>
+              <el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty" style="border-right: 0px">应付金额：</div>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费：{{ formobj.freight }} -
+                  优惠：{{ formobj.discountAmount }} + 误差调整：{{ formobj.errorAmount }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/purchase/procurement'
+
+  export default {
+    name: 'ProcurementInfo',
+    data() {
+      return {
+        viewTitle: '',
+        viewState: 1,
+        tableKey: 1,
+        index: 0,
+        formobj: {
+          sid: '',
+          remarks: '',
+          createBySid: '',
+          createByName: '',
+          createTime: '',
+          sourceBillSid: '',
+          sourceBillNo: '',
+          billNo: '',
+          purchaseTypeKey: '',
+          purchaseTypeValue: '',
+          purchaseReasonKey: '',
+          purchaseReasonValue: '',
+          payTypeKey: '',
+          payTypeValue: '',
+          errorAmount: '',
+          supplierSid: '',
+          supplierName: '',
+          supplierPhone: '',
+          purchaserSid: '',
+          purchaserName: '',
+          deliveryDate: '',
+          freight: '',
+          discountAmount: '',
+          payableAmount: '',
+          prepaymentAmount: '',
+          owedAmount: '',
+          deptSid: '',
+          deptName: '',
+          procDefId: '',
+          nodeId: '',
+          procInstId: '',
+          nodeState: '',
+          taskId: '',
+          finishTime: '',
+          useOrgSid: '',
+          useOrgName: '',
+          createOrgSid: '',
+          createOrgName: '',
+          operateBrandKey: '',
+          operateBrandValue: '',
+          warehouseTypeKey: '',
+          warehouseTypeValue: '',
+          purchasePay: {
+            sid: '',
+            billSid: '',
+            isFirstPay: '',
+            deposit: '',
+            goodsMoney: '',
+            accountName: '',
+            bankName: '',
+            bankAccount: '',
+            otherAmountName: '',
+            otherAmount: '',
+            payRemark: '',
+            filePaths: []
+          },
+          purchaseBillInvoice: {
+            billSid: '',
+            isInvoicing: '',
+            billTypeKey: '',
+            billType: '',
+            taxRate: ''
+          },
+          pmsPurchaseBillDetailList: []
+        },
+        rules: {}
+      }
+    },
+    computed: {
+      // 数量
+      slTotal() {
+        let sl = '0'
+        if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
+          this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
+            if (e.goodsSpuName !== '') {
+              sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
+            }
+          })
+        }
+        return sl
+      },
+      // 采购金额
+      cgTotal() {
+        let cg = '0'
+        if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
+          this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
+            if (e.goodsSpuName !== '') {
+              cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
+            }
+          })
+        }
+        return cg
+      },
+      yfTotal() {
+        let yf = '0'
+        yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this
+          .formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount :
+          '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
+        return yf
+      }
+    },
+    methods: {
+      showInfo(sid) {
+        this.viewTitle = '采购单详情'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        req.fetchDetailsBySid(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+            if (this.formobj.purchasePay.filePaths.length > 0) {
+              const aa = []
+              this.formobj.purchasePay.filePaths.forEach((e) => {
+                aa.push(e.url)
+              })
+              this.formobj.purchasePay.filePaths = aa
+            }
+          }
+        })
+      },
+      handleReturn() {
+        this.formobj = {
+          sid: '',
+          remarks: '',
+          createBySid: '',
+          createByName: '',
+          createTime: '',
+          sourceBillSid: '',
+          sourceBillNo: '',
+          billNo: '',
+          purchaseTypeKey: '',
+          purchaseTypeValue: '',
+          purchaseReasonKey: '',
+          purchaseReasonValue: '',
+          payTypeKey: '',
+          payTypeValue: '',
+          errorAmount: '',
+          supplierSid: '',
+          supplierName: '',
+          supplierPhone: '',
+          purchaserSid: '',
+          purchaserName: '',
+          deliveryDate: '',
+          freight: '',
+          discountAmount: '',
+          payableAmount: '',
+          prepaymentAmount: '',
+          owedAmount: '',
+          deptSid: '',
+          deptName: '',
+          procDefId: '',
+          nodeId: '',
+          procInstId: '',
+          nodeState: '',
+          taskId: '',
+          finishTime: '',
+          useOrgSid: '',
+          useOrgName: '',
+          createOrgSid: '',
+          createOrgName: '',
+          operateBrandKey: '',
+          operateBrandValue: '',
+          warehouseTypeKey: '',
+          warehouseTypeValue: '',
+          purchasePay: {
+            sid: '',
+            billSid: '',
+            isFirstPay: '',
+            deposit: '',
+            goodsMoney: '',
+            accountName: '',
+            bankName: '',
+            bankAccount: '',
+            otherAmountName: '',
+            otherAmount: '',
+            payRemark: '',
+            filePaths: []
+          },
+          purchaseBillInvoice: {
+            billSid: '',
+            isInvoicing: '',
+            billTypeKey: '',
+            billType: '',
+            taxRate: ''
+          },
+          pmsPurchaseBillDetailList: []
+        }
+        this.$emit('doback')
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .span-sty {
+    width: 130px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+</style>
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
index 49f5be6f8f..f34ceca349 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
@@ -48,7 +48,7 @@
           <el-col :span="8">
             <div class="span-sty">供应商</div>
             <el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName"
-              class="addinputInfo">
+              class="addinputInfo addinputw">
               <el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
                 :value="item.sid">
               </el-option>
@@ -67,10 +67,20 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="16">
+          <el-col :span="8">
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
+            <!-- <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item> -->
+            <el-form-item prop="isUpShelf">
+              <el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo" @change="changeTheme">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="2">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -117,7 +127,7 @@
               </el-select>
             </template>
           </el-table-column> -->
-          <!-- <el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> -->
+          <el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
           <el-table-column label="实收数量" align="center" width="120">
             <template slot-scope="scope">
               <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
@@ -257,6 +267,11 @@
             message: '到货日期不能为空',
             trigger: 'change'
           }],
+          isUpShelf: [{
+            required: true,
+            message: '请选择是或否',
+            trigger: 'change'
+          }],
         }
       }
     },
@@ -546,23 +561,26 @@
         //   return
         // }
 
-        for (var i = 0; i < this.formobj.list.length; i++) {
 
-          if (Number(this.formobj.list[i].actualInCount) == 0) {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '商品实收数量不能为空'
-            })
 
-            return
-          }
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
 
-        }
 
+            for (var i = 0; i < this.formobj.list.length; i++) {
+
+              if (Number(this.formobj.list[i].actualInCount) == 0) {
+                this.$message({
+                  showClose: true,
+                  type: 'error',
+                  message: '商品实收数量不能为空'
+                })
+
+                return
+              }
+
+            }
 
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
             this.submitdisabled = true
             req.save(this.formobj).then((res) => {
               if (res.success) {
@@ -703,16 +721,16 @@
   }
 
   .span-sty {
-    width: 130px !important;
+    width: 190px !important;
   }
 
   .addinputInfo {
-    margin-left: 120px !important;
+    margin-left: 180px !important;
   }
 
   .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
-    margin-left: 120px !important;
-    width: calc(100% - 115px);
+    margin-left: 180px !important;
+    width: calc(100% - 175px);
   }
 
   .first_row {
@@ -726,4 +744,14 @@
     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>
diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
index 70e7e236ec..597784e535 100644
--- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
+++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue
@@ -15,10 +15,10 @@
     <div class="listconadd">
 
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-     <!--   <div class="title">
+        <!--   <div class="title">
           <div>基础信息</div>
         </div> -->
-          <el-row class="first_row">
+        <el-row class="first_row">
 
           <el-col :span="8">
             <div class="span-sty">单据编号</div>
@@ -61,39 +61,39 @@
             <div class="span-sty">单据状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
+          <!--  <el-col :span="8">
             <div class="span-sty">审核状态</div>
             <el-form-item><span class="addinputInfo">{{ formobj.reviewStatus }}</span></el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
 
-        <el-row>
+        <!-- <el-row>
 
           <el-col :span="24">
             <div class="span-sty">拒绝原因</div>
             <el-form-item><span class="addinputInfo">{{ formobj.refuseReason }}</span></el-form-item>
           </el-col>
 
-        </el-row>
+        </el-row> -->
 
         <div class="title titleOne">
           <div>商品列表</div>
         </div>
         <el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
           <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
-          <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center"  />
+          <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" />
           <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
           <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
           <el-table-column label="单位" prop="unit" align="center" width="120" />
-        <!--  <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
+          <!--  <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
           <el-table-column label="库位" prop="warehouseRack" align="center" width="120" /> -->
-          <el-table-column label="预约数量" prop="orderCount" align="center" width="120" />
+          <el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
           <el-table-column label="待收货数量" prop="waitInCount" align="center" />
           <el-table-column label="已收货数量" prop="actualInCount" align="center" />
           <el-table-column label="入库单价" prop="cost" align="center" width="100" />
           <el-table-column label="税率" prop="taxAmount" align="center" width="100" />
           <!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
-          <el-table-column label="采购金额" prop="amount" align="center"  />
+          <el-table-column label="采购金额" prop="amount" align="center" />
         </el-table>
 
       </el-form>
@@ -161,6 +161,10 @@
     width: calc(100% - 115px);
   }
 
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
   .titleOne {
     padding: 7px;
     display: flex;
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue
index 9a4983ec4f..1a81a13985 100644
--- a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceOutboundInfo.vue
@@ -15,7 +15,7 @@
 
       <div class="listconadd">
 
-        <el-form ref="form_obj" :model="formobj"  class="formaddcopy02">
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
           <!-- <div class="title">
           <div>基础信息</div>
         </div> -->
@@ -184,7 +184,7 @@
 </template>
 
 <script>
-  import req from '@/api/maintenance/maintenanceOutbound.js'
+  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
   export default {
     components: {},
     data() {
@@ -197,9 +197,9 @@
 
         },
 
-    }
-  },
-  created() {
+      }
+    },
+    created() {
 
     },
     methods: {
diff --git a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
index 4ea8165014..7e0f549376 100644
--- a/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
+++ b/yxt-as-ui/src/views/storage/maintenanceInOrOutBound/maintenanceReturnBoundInfo.vue
@@ -139,38 +139,38 @@
         <div class="title titleOne">
           <div>服务项目</div>
         </div>
-      <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
-        <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-        <el-table-column label="服务项目" prop="serviceItem" align="center" />
-        <el-table-column label="工种" prop="serviceType" align="center" />
-        <el-table-column label="科目" prop="subject" align="center" />
-        <el-table-column label="维修人" prop="repairerName" align="center" />
-        <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
-        <el-table-column label="工时单价" prop="hourPrice" align="center" />
-        <el-table-column label="工时数" prop="hours" align="center" />
-        <el-table-column label="销售价" prop="price" align="center" />
-        <el-table-column label="折扣" prop="discount" align="center" />
-        <el-table-column label="优惠" prop="discountAmount" align="center" />
-        <el-table-column label="金额" prop="amount" align="center" />
-        <el-table-column label="备注" prop="remarks" align="center" />
-      </el-table>
+        <el-table v-loading="listLoading" :data="formobj.sitemVoList" border>
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="服务项目" prop="serviceItem" align="center" />
+          <el-table-column label="工种" prop="serviceType" align="center" />
+          <el-table-column label="科目" prop="subject" align="center" />
+          <el-table-column label="维修人" prop="repairerName" align="center" />
+          <el-table-column label="考核工时" prop="examineHourPrice" align="center" />
+          <el-table-column label="工时单价" prop="hourPrice" align="center" />
+          <el-table-column label="工时数" prop="hours" align="center" />
+          <el-table-column label="销售价" prop="price" align="center" />
+          <el-table-column label="折扣" prop="discount" align="center" />
+          <el-table-column label="优惠" prop="discountAmount" align="center" />
+          <el-table-column label="金额" prop="amount" align="center" />
+          <el-table-column label="备注" prop="remarks" align="center" />
+        </el-table>
 
         <div class="title titleOne">
           <div>商品列表</div>
         </div>
         <el-table v-loading="listLoading" :data="formobj.detailList" border>
-         <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-         <el-table-column label="项目名称" prop="serviceItem" align="center" />
-         <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
-         <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
-         <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
-         <el-table-column label="单位" prop="unit" align="center" />
-         <el-table-column label="仓库" prop="warehouseName" align="center" />
-         <el-table-column label="库位" prop="warehouseRackCode" align="center" />
-         <el-table-column label="已出数量" prop="outboundCount" align="center" />
+          <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+          <el-table-column label="项目名称" prop="serviceItem" align="center" />
+          <el-table-column label="商品名称" prop="goodsSpuName" align="center" />
+          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
+          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" />
+          <el-table-column label="单位" prop="unit" align="center" />
+          <el-table-column label="仓库" prop="warehouseName" align="center" />
+          <el-table-column label="库位" prop="warehouseRackCode" align="center" />
+          <el-table-column label="已出数量" prop="outboundCount" align="center" />
           <el-table-column label="退库数量" prop="count" align="center" />
           <el-table-column label="销售单价" prop="price" align="center" />
-         <el-table-column label="备注" prop="remarks" align="center" />
+          <el-table-column label="备注" prop="remarks" align="center" />
         </el-table>
 
 
@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import req from '@/api/maintenance/maintenanceReturnBound.js'
+  import req from '@/api/maintenanceReceive/maintenanceReceive.js'
 
   export default {
     components: {},
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/index.vue b/yxt-as-ui/src/views/storage/receivingGoods/index.vue
index 21de65a333..b9e47c9f6d 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/index.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/index.vue
@@ -25,7 +25,8 @@
               </el-form-item>
               <el-form-item label="业务类型">
                 <el-select v-model="queryParams.params.busTypeKey" placeholder="请选择">
-                  <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -65,21 +66,29 @@
             @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="180">
+            <el-table-column fixed label="操作" align="center" width="150">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" :disabled="scope.row.billState=='已完成'"
                   @click="toEdit(scope.row)">办理</el-button>
                 <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="billNo" width="220" label="单据编号" align="center" />
-            <el-table-column prop="createTime" label="单据日期" align="center" />
-            <el-table-column prop="createByName" label="制单人" align="center" />
-            <el-table-column prop="sourceBillNo" label="预期到货通知单号" width="220"align="center" />
-            <el-table-column prop="busTypeValue" label="业务类型" align="center" />
-            <el-table-column prop="supplierName" label="供应商" align="center" />
-            <el-table-column prop="deliveryDate" label="到货日期" align="center" />
-            <el-table-column prop="billState" label="单据状态" align="center" />
+            <el-table-column prop="billNo" width="180" label="单据编号" align="center" />
+            <el-table-column prop="createTime" label="单据日期" width="120" align="center" />
+            <el-table-column prop="createByName" label="制单人" width="120" align="center" />
+            <el-table-column prop="sourceBillNo" label="预期到货通知单号" width="200" align="center" />
+            <el-table-column prop="distributeType" label="分配状态" width="120" align="center" />
+            <el-table-column prop="busTypeValue" label="业务类型" width="120" align="center" />
+            <el-table-column prop="supplierName" label="供应商" width="220" align="center" />
+            <el-table-column prop="deliveryDate" label="到货日期" width="120" align="center" />
+            <el-table-column prop="billState" label="单据状态" width="100" align="center" />
+            <el-table-column label="上架单" align="center" width="100">
+              <template slot-scope="scope">
+                <div style="color: #1890FF; text-decoration: underline ;" @click="showUpShelfList(scope.row)">
+                  {{ scope.row.upShlefNum }}
+                </div>
+              </template>
+            </el-table-column>
 
           </el-table>
         </div>
@@ -99,6 +108,17 @@
     <divAddupShelfRecord v-show="viewState == 5" ref="divAddupShelfRecord" @doback="resetState"
       @reloadlist="loadList" />
 
+    <el-dialog title="上架单列表" :visible.sync="dialogVisible" :before-close="handleClose">
+      <el-table :data="upShelfList" border style="width: 100%;margin-top: -30px;">
+        <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod2" align="center" />
+        <el-table-column prop="billNo" label="单据编号" align="center" />
+        <el-table-column prop="createTime" label="单据日期" align="center" />
+        <el-table-column prop="createByName" label="制单人" align="center" />
+        <el-table-column prop="sourceBillNo" label="来源单号" align="center" />
+        <el-table-column prop="billState" label="单据状态" align="center" />
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -136,26 +156,34 @@
         searchxianshitit: '显示查询条件',
         tableLoading: false,
         dataList: [],
-        btnList: [{
+        btnList: [
+          // {
+          //   type: 'primary',
+          //   size: 'small',
+          //   icon: 'plus',
+          //   btnKey: 'toAudit',
+          //   btnLabel: '新增'
+          // },
+          // {
+          //   type: 'danger',
+          //   size: 'small',
+          //   icon: 'del',
+          //   btnKey: 'doDel',
+          //   btnLabel: '删除'
+          // },
+          {
             type: 'primary',
             size: 'small',
             icon: 'plus',
-            btnKey: 'toAudit',
-            btnLabel: '新增'
-          },
-          {
-            type: 'danger',
-            size: 'small',
-            icon: 'del',
-            btnKey: 'doDel',
-            btnLabel: '删除'
+            btnKey: 'toPrint',
+            btnLabel: '打印入库单'
           },
           {
             type: 'primary',
             size: 'small',
             icon: 'plus',
             btnKey: 'toAdd',
-            btnLabel: '上架'
+            btnLabel: '新增上架单'
           },
           {
             type: 'info',
@@ -175,8 +203,7 @@
         },
         sids: [],
         selectionList: [],
-        busTypeList: [
-        ],
+        busTypeList: [],
         billStateList: [{
             name: "新建",
             sid: "0"
@@ -187,6 +214,16 @@
           },
 
         ],
+        upShelfList: [
+          //   {
+          //   billSid: '单据sid',
+          //   billNo: '单据编号',
+          //   createTime: '单据日期',
+          //   createByName: '制单人',
+          //   sourceBillNo: '来源单号',
+          //   billState: '单据状态'
+          // },
+        ]
       }
     },
     mounted() {
@@ -195,7 +232,10 @@
     created() {
       this.loadList()
 
-      getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+      getTypeValueList({
+        type: 'wms_busType',
+        groupNum: 'wms_rk'
+      }).then((res) => {
         if (res.success) {
           this.busTypeList = res.data
         }
@@ -203,6 +243,20 @@
 
     },
     methods: {
+
+      showUpShelfList(row) {
+        console.log("val", row);
+        req.getUpShlefList(row.sid).then((resp) => {
+          this.upShelfList = resp.data
+          this.dialogVisible = true
+
+        }).catch(() => {})
+
+
+      },
+      handleClose() {
+        this.dialogVisible = false
+      },
       saveExamine() {
 
       },
@@ -249,6 +303,9 @@
           case 'doDel':
             this.doDel()
             break
+          case 'toPrint':
+            this.toPrint()
+            break
           case 'toAdd':
             this.toAdd()
             break
@@ -286,6 +343,9 @@
         var pageindex = index + 1 + pagestart
         return pageindex
       },
+      indexMethod2(index) {
+        return index + 1
+      },
       dosearch() {
         this.queryParams.current = 1
         this.loadList()
@@ -339,6 +399,26 @@
           })
         }
       },
+      toPrint() {
+
+        for (var i = 0; i < this.selectionList.length; i++) {
+
+          if (this.selectionList[i].billState != '已完成') {
+            this.$message({
+              type: 'warning',
+              message: "只能选择已完成的记录。",
+              showClose: true
+            })
+            return
+          }
+        }
+
+        this.$message({
+          type: 'warning',
+          message: "打印功能正在完善中。",
+          showClose: true
+        })
+      },
       toAdd() {
         if (this.selectionList.length != 1) {
           this.$message({
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
index 298b4cfd84..bd20bdd0c1 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue
@@ -50,7 +50,8 @@
               <div class="span-sty"><span class="must">*</span> 业务类型</div>
               <el-form-item prop="busTypeValue"><el-select v-model="formobj.busTypeValue" filterable clearable
                   placeholder="请选择" class="addinputInfo" @change="busTypeSelect">
-                 <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                  <el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey">
                   </el-option>
                 </el-select></el-form-item>
             </el-col>
@@ -73,11 +74,20 @@
                   class="addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
                 </el-date-picker></el-form-item>
             </el-col>
-            <el-col :span="16">
+            <el-col :span="8">
               <div class="span-sty">单据状态</div>
               <el-form-item> <span class="addinputInfo">{{formobj.billState}}</span></el-form-item>
             </el-col>
-
+            <el-col :span="8">
+              <div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
+              <!-- <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item> -->
+              <el-form-item prop="isUpShelf">
+                <el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="2">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
           </el-row>
 
           <el-row>
@@ -161,7 +171,7 @@
               </el-select>
             </template>
           </el-table-column> -->
-            <!-- <el-table-column label="预约数量" prop="orderCount" align="center" width="120" v-if="isUpdata" /> -->
+            <el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
             <el-table-column label="实收数量" align="center" width="120">
               <template slot-scope="scope">
                 <el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
@@ -367,6 +377,11 @@
             message: '到货日期不能为空',
             trigger: 'change'
           }],
+          isUpShelf: [{
+            required: true,
+            message: '请选择是或否',
+            trigger: 'change'
+          }],
         }
       }
     },
@@ -375,7 +390,7 @@
     },
     methods: {
 
-      init(){
+      init() {
         getOrgSidByPath({
           orgPath: window.sessionStorage.getItem('defaultOrgPath')
         }).then((res) => {
@@ -586,42 +601,45 @@
       },
       submit() {
 
-        if (this.formobj.list.length == 0) {
-          this.$message({
-            showClose: true,
-            type: 'error',
-            message: '请添加商品'
-          })
 
-          return
-        }
 
-        for (var i = 0; i < this.formobj.list.length; i++) {
-          var item = this.formobj.list[i]
-          if (item.goodsSkuSid == '') {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '请添加商品'
-            })
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
 
-            return
-          }
+            if (this.formobj.list.length == 0) {
+              this.$message({
+                showClose: true,
+                type: 'error',
+                message: '请添加商品'
+              })
 
-          if (item.actualInCount == 0) {
-            this.$message({
-              showClose: true,
-              type: 'error',
-              message: '实收数量不能为空'
-            })
+              return
+            }
 
-            return
-          }
+            for (var i = 0; i < this.formobj.list.length; i++) {
+              var item = this.formobj.list[i]
+              if (item.goodsSkuSid == '') {
+                this.$message({
+                  showClose: true,
+                  type: 'error',
+                  message: '请添加商品'
+                })
 
-        }
+                return
+              }
+
+              if (item.actualInCount == 0) {
+                this.$message({
+                  showClose: true,
+                  type: 'error',
+                  message: '实收数量不能为空'
+                })
+
+                return
+              }
+
+            }
 
-        this.$refs['form_obj'].validate((valid) => {
-          if (valid) {
             this.submitdisabled = true
             req.submit(this.formobj).then((res) => {
               if (res.success) {
@@ -685,7 +703,10 @@
           this.$refs['form_obj'].clearValidate()
         })
 
-        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+        getTypeValueList({
+          type: 'wms_busType',
+          groupNum: 'wms_rk'
+        }).then((res) => {
           if (res.success) {
             this.busTypeList = res.data
           }
@@ -696,7 +717,7 @@
       showEdit(row) {
         this.title = "【修改】"
         this.isUpdata = true
-              this.init()
+        this.init()
         this.getsupplierLust()
         this.getWarehouseList()
         console.log("showEdit", this.isUpdata);
@@ -705,7 +726,10 @@
           this.$refs['form_obj'].clearValidate()
         })
 
-        getTypeValueList({ type: 'wms_busType', groupNum: 'wms_rk' }).then((res) => {
+        getTypeValueList({
+          type: 'wms_busType',
+          groupNum: 'wms_rk'
+        }).then((res) => {
           if (res.success) {
             this.busTypeList = res.data
           }
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
index 7ace2adfee..ac73f0b5e1 100644
--- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
+++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue
@@ -1,119 +1,121 @@
 <template>
-  <div>
-
-    <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>收货单</div>
-      <!-- start 添加修改按钮 -->
-      <div>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!-- 标题 -->
+        <div>收货单</div>
+        <!-- start 添加修改按钮 -->
+        <div>
+          <el-button type="primary" size="small" v-show="formobj.billState=='已完成'" :disabled="submitdisabled"
+            @click="addUpShelf">新增上架单</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+        <!-- end 添加修改按钮 -->
+        <!-- end 详情按钮 -->
       </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
-    </div>
 
-    <div class="listconadd">
+      <div class="listconadd">
 
-      <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
-        <!-- <div class="title">
+        <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
+          <!-- <div class="title">
           <div>基础信息</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>
-            <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.sourceBillNo }}</span></el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <div class="span-sty">业务类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">供应商</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</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.deliveryDate }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <div class="span-sty">单据状态</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.billState }}</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 v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
-          <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
-          <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" width="200" />
-          <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
-          <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
-          <el-table-column label="单位" prop="unit" align="center" width="120" />
-          <!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
-          <el-table-column label="库位" prop="warehouseRackName" align="center" width="180" />
-          <el-table-column label="预约数量" prop="orderCount" align="center" width="120" /> -->
-          <el-table-column label="实收数量" prop="actualInCount" align="center" width="120" />
-          <el-table-column label="拒收数量" prop="rejectCount" align="center" width="120" />
-          <el-table-column label="拒收原因" prop="rejectReason" align="center" width="180" />
-          <el-table-column label="是否质检" align="center" width="180">
-            <template slot-scope="scope">
-              <el-radio-group v-model="scope.row.isQuality" :disabled="true" size="small">
-                <el-radio :label="0">是</el-radio>
-                <el-radio :label="1">否</el-radio>
-              </el-radio-group>
-            </template>
-          </el-table-column>
-          <el-table-column label="质检状态" align="center" width="180">
-            <template slot-scope="scope">
-              <el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
-                <el-radio :label="0">合格</el-radio>
-                <el-radio :label="1">不合格</el-radio>
-              </el-radio-group>
-            </template>
-          </el-table-column>
-          <el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
-          <el-table-column label="入库单价" prop="cost" align="center" width="100" />
-          <el-table-column label="税率" prop="taxAmount" align="center" width="100" />
-          <!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
-          <el-table-column label="入库金额" prop="amount" align="center" width="100" />
-        </el-table>
-
-
-        <!--      <div class="title titleOne">
+          <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.sourceBillNo }}</span></el-form-item>
+            </el-col>
+
+            <el-col :span="8">
+              <div class="span-sty">业务类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">供应商</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</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.deliveryDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">单据状态</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billState }}</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 v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
+            <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" width="200" />
+            <el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
+            <el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
+            <el-table-column label="单位" prop="unit" align="center" width="120" />
+            <!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="180" />
+          <el-table-column label="库位" prop="warehouseRackName" align="center" width="180" />-->
+            <el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
+            <el-table-column label="实收数量" prop="actualInCount" align="center" width="120" />
+            <el-table-column label="拒收数量" prop="rejectCount" align="center" width="120" />
+            <el-table-column label="拒收原因" prop="rejectReason" align="center" width="180" />
+            <el-table-column label="是否质检" align="center" width="180">
+              <template slot-scope="scope">
+                <el-radio-group v-model="scope.row.isQuality" :disabled="true" size="small">
+                  <el-radio :label="0">是</el-radio>
+                  <el-radio :label="1">否</el-radio>
+                </el-radio-group>
+              </template>
+            </el-table-column>
+            <el-table-column label="质检状态" align="center" width="180">
+              <template slot-scope="scope">
+                <el-radio-group v-model="scope.row.qualityState" :disabled="true" size="small">
+                  <el-radio :label="0">合格</el-radio>
+                  <el-radio :label="1">不合格</el-radio>
+                </el-radio-group>
+              </template>
+            </el-table-column>
+            <el-table-column label="载具说明" prop="packageRemark" align="center" width="180" />
+            <el-table-column label="入库单价" prop="cost" align="center" width="100" />
+            <el-table-column label="税率" prop="taxAmount" align="center" width="100" />
+            <!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
+            <el-table-column label="入库金额" prop="amount" align="center" width="100" />
+          </el-table>
+
+
+          <!--      <div class="title titleOne">
           <div>商品-批次</div>
         </div>
         <el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
@@ -131,9 +133,12 @@
           <el-table-column label="数量" prop="batchCount" align="center" width="120" />
         </el-table> -->
 
-      </el-form>
+        </el-form>
 
+      </div>
     </div>
+    <!-- 新增上架单 -->
+    <upShelf v-show="viewState == 2" ref="divSp" @doback="resetState" />
 
 
   </div>
@@ -141,11 +146,14 @@
 
 <script>
   import req from '@/api/storage/receivingGoods.js'
-
+  import upShelf from './upShelfAddRecord'
   export default {
-    components: {},
+    components: {
+      upShelf
+    },
     data() {
       return {
+        viewState: 1,
         listLoading: false,
         submitdisabled: false,
         formobj: {},
@@ -178,7 +186,14 @@
           .catch(e => {
             this.formobj = {}
           })
-      }
+      },
+      resetState() {
+        this.viewState = 1
+      },
+      addUpShelf() {
+        this.viewState = 2
+        this.$refs['divSp'].showEdit(this.formobj)
+      },
     }
   }
 </script>
@@ -196,6 +211,11 @@
     width: calc(100% - 115px);
   }
 
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+
   .titleOne {
     padding: 7px;
     display: flex;