From 6f7b3a8b69c7954cfde15c60f46f1d8de6ab02c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 2 Apr 2024 17:31:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90NEV-PC=E3=80=91=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      |   8 +
 fe/PC/src/filters/status.js                   |  36 +-
 fe/PC/src/router/index.js                     |  64 +++
 fe/PC/src/utils/detailsTableColumns/index.js  |   1 +
 fe/PC/src/utils/tableColumns/index.js         |  65 ++-
 fe/PC/src/utils/tabsDesTions/index.js         |  60 ++-
 .../basicData/ItemsManage/ItemContainer.vue   | 211 ++++++++++
 .../views/basicData/ItemsManage/Utensil.vue   |   7 +-
 .../WarehouseManage/ItemStoreRelation.vue     |   5 +-
 .../priceManage/PurchasePriceSheet.vue        | 163 ++++++++
 .../basicData/priceManage/SalePriceSheet.vue  | 163 ++++++++
 .../priceManage/StdCostPriceSheet.vue         | 163 ++++++++
 .../dismantle/customerDismantleJob-old.vue    | 381 ++++++++++++++++++
 .../purchaseReceipt/PurchaseOrderHigher.vue   |  80 ++--
 14 files changed, 1355 insertions(+), 52 deletions(-)
 create mode 100644 fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
 create mode 100644 fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue
 create mode 100644 fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue
 create mode 100644 fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue
 create mode 100644 fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-old.vue

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 14e11ae80..f81e8de52 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -666,6 +666,14 @@ export async function productRecycleNoteExport(data) {
   })
 }
 
+// 采购订单-关闭订单行
+export async function purchaseOrderCloseDetailld(id,detailld) {
+  return request({
+      url: baseURL + `wms/store/purchase-order/${id}/detail/close/${detailld}`,
+      method: 'post',
+  })
+}
+
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
 //   return request({
diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js
index adbaf8099..c15c6aae3 100644
--- a/fe/PC/src/filters/status.js
+++ b/fe/PC/src/filters/status.js
@@ -614,6 +614,30 @@ export function taskType(index, prop) {
       label: "盘点任务",
       value: 9
     },
+    11: {
+      label: "JIS发货",
+      value: 11
+    },
+    12: {
+      label: "计划外出库",
+      value: 12
+    },
+    13: {
+      label: "计划外入库",
+      value: 13
+    },
+    14: {
+      label: "退料",
+      value: 14
+    },
+    15: {
+      label: "转移",
+      value: 15
+    },
+    16: {
+      label: "器具转移",
+      value: 16
+    },
   }
   return Enum(type, index, prop)
 }
@@ -1202,9 +1226,7 @@ export function truncType(index, prop) {
   }
   return Enum(type, index, prop)
 }
-/**
- * @returns {Array} '包装类型'
- */
+// 包装类型
 export function qtyUomType(index, prop) {
   let type = {
     EA: {
@@ -2469,12 +2491,12 @@ export function positionCodeType(index, prop) {
 // 器具类型
 export function utensilType(index, prop) {
   let type = {
-    1: {
-      value: 1,
+    "InLogistics": {
+      value: "InLogistics",
       label: "内物流"
     },
-    2: {
-      value: 2,
+    "OutLogistics": {
+      value: "OutLogistics",
       label: "外物流"
     },
   }
diff --git a/fe/PC/src/router/index.js b/fe/PC/src/router/index.js
index 139a62f22..373689244 100644
--- a/fe/PC/src/router/index.js
+++ b/fe/PC/src/router/index.js
@@ -414,6 +414,70 @@ export const constantRoutes = [
       }
     }]
   }, 
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'StdCostPriceSheet',
+      component: () => import('@/views/basicData/priceManage/StdCostPriceSheet.vue'),
+      name: 'StdCostPriceSheet',
+      meta: {
+        keepAlive : true, 
+        title: '标准成本价格单',
+        icon: '成品发运任务',
+      }
+    }]
+  }, 
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'PurchasePriceSheet',
+      component: () => import('@/views/basicData/priceManage/PurchasePriceSheet.vue'),
+      name: 'PurchasePriceSheet',
+      meta: {
+        keepAlive : true, 
+        title: '采购价格单',
+        icon: '成品发运任务',
+      }
+    }]
+  }, 
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'SalePriceSheet',
+      component: () => import('@/views/basicData/priceManage/SalePriceSheet.vue'),
+      name: 'SalePriceSheet',
+      meta: {
+        keepAlive : true, 
+        title: '销售价格单',
+        icon: '成品发运任务',
+      }
+    }]
+  },
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'ItemContainer',
+      component: () => import('@/views/basicData/ItemsManage/ItemContainer.vue'),
+      name: 'ItemContainer',
+      meta: {
+        keepAlive : true, 
+        title: '收容数标包',
+        icon: '成品发运任务',
+      }
+    }]
+  }, 
 ]
 
 /**
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index 6d4d025e6..49e189e98 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -125,6 +125,7 @@ export const PurchaseOrderHigher =  [
   { label: "已收货数量", prop: "receivedQty" },
   { label: "已退货数量", prop: "returnedQty" },
   { label: "已上架数量", prop: "putAwayQty" },
+  { label: "订单行状态", prop: "lineStatus",type:'filter',filters:"openToClose" },
   // -----------------------------------------------------------------------
   { label: "筹措员代码", prop: 'planUserCode' },
   { label: "要求到货时间", prop: "planArriveDate", type: "dateTime" },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index 231a34854..65efe64a2 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -120,6 +120,20 @@ export const ItemPack = [
   //   fixed: "right"
   // },
 ]
+// 收容数标包
+export const ItemContainer =  [
+  { 
+    label: "收容代码", 
+    prop: "containerCode",
+    fixed: "left",
+    type: "name" 
+  },
+  { label: "物料代码", prop: "itemCode" },
+  { label: '收容数量', prop: "qty" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  { label: "备注", prop: 'remark', colSpan: 12 },
+]
 // 物品质检标准信息
 export const AQL = [
   {
@@ -994,6 +1008,53 @@ export const documentBasic = [
   //   fixed: "right"
   // },
 ]
+// 标准成本价格单
+export const StdCostPriceSheet = [
+  {
+    label: "物品代码",
+    fixed: "left",
+    type: "name",
+    prop: "itemCode",
+    width:"200px"
+  },
+  { label: "标准成本价格", prop: "stdCostPrice" },
+  { label: "价格单描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+]
+// 采购价格单
+export const PurchasePriceSheet = [
+  {
+    label: "物品代码",
+    fixed: "left",
+    type: "name",
+    prop: "itemCode",
+    width:"200px"
+  },
+  { label: "供应商编号", prop: "supplierCode" },
+  { label: "采购价格", prop: "purchasePrice" },
+  { label: "价格单描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+]
+// 销售价格单
+export const SalePriceSheet = [
+  {
+    label: "物品代码",
+    fixed: "left",
+    type: "name",
+    prop: "itemCode",
+    width:"200px"
+  },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "销售价格", prop: "salePrice" },
+  { label: "价格单描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+]
 
 
 // 原料管理
@@ -4075,8 +4136,8 @@ export const Utensil = [
     type: "name"
   },
   // { label: _Names.stdPackQty, prop: "stdQty",isNumber:true },
-  { label: "器具类型", prop: 'containerType',type:"filter",filters:"utensilType" },
-  { label: "器具规格", prop: "specificationsType",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
+  { label: "器具类型", prop: 'type',type:"filter",filters:"utensilType" },
+  { label: "器具规格", prop: "model",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: '创建人', prop: "creator" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index 032cf1c15..3bc99d438 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -92,6 +92,15 @@ export const ItemPack =  [
   // ************** 确认隐藏 ************************
 
 ]
+// 收容数标包
+export const ItemContainer =  [
+  { label: "收容代码", prop: 'containerCode' },
+  { label: "物料代码", prop: "itemCode" },
+  { label: '收容数量', prop: "qty" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  { label: "备注", prop: 'remark', colSpan: 12 },
+]
 // 物品质检标准信息 20230328
 export const AQL =  [
   { label: "物品代码", prop: "itemCode" },
@@ -748,6 +757,53 @@ export const documentBasic = [
   // { label: "ID", prop: 'id' },
   // ************** 确认隐藏 ************************
 ]
+// 标准成本价格单
+export const StdCostPriceSheet = [
+  {
+    label: "物品代码",
+    fixed: "left",
+    type: "name",
+    prop: "itemCode",
+    width:"200px"
+  },
+  { label: "标准成本价格", prop: "stdCostPrice" },
+  { label: "价格单描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+]
+// 采购价格单
+export const PurchasePriceSheet = [
+  {
+    label: "物品代码",
+    fixed: "left",
+    type: "name",
+    prop: "itemCode",
+    width:"200px"
+  },
+  { label: "供应商编号", prop: "supplierCode" },
+  { label: "采购价格", prop: "purchasePrice" },
+  { label: "价格单描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+]
+// 销售价格单
+export const SalePriceSheet = [
+  {
+    label: "物品代码",
+    fixed: "left",
+    type: "name",
+    prop: "itemCode",
+    width:"200px"
+  },
+  { label: "客户代码", prop: "customerCode" },
+  { label: "销售价格", prop: "salePrice" },
+  { label: "价格单描述", prop: "description" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' },
+  { label: "备注", prop: "remark" },
+]
 
 // 原料管理
 // 供应商发货通知 20230404
@@ -2948,8 +3004,8 @@ export const PositionCode = [
 export const Utensil = [
   { label: '器具代码',prop: "code",},
   // { label: _Names.stdPackQty, prop: "stdQty" },
-  { label: "器具类型", prop: 'containerType',type:"filter",filters:"utensilType" },
-  { label: "器具规格", prop: "specificationsType",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
+  { label: "器具类型", prop: 'type',type:"filter",filters:"utensilType" },
+  { label: "器具规格", prop: "model",type: "filter", filters: "getDict" , dictType:"ContainerSpecificationsType"},
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: '创建人', prop: "creator" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
new file mode 100644
index 000000000..4fcd8e6e1
--- /dev/null
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
@@ -0,0 +1,211 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      @buttonOperationClick="buttonOperationClick"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="formReveal ? CreateFormData : editFormData"
+      :Form="formReveal ? CreateForm : editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @FormSubmit="FormSubmit"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod={method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport={isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <curren-Drawer
+      :title="tableColumns"
+      :tableColumns="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :dropdownData="dropdownData"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+    ></curren-Drawer>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+export default {
+  name: "ItemContainer",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+  },
+  data () {
+    const validateQty = (rule, value, callback) => {
+      if (value <= 0) {
+        callback(new Error('最小值为1'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      URL: 'basedata/item-container',
+      //常用按钮数据
+      currenButtonData: [
+        this.defaultAddBtn(),//新增
+        this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //新增
+      CreateFormData: {
+        remark: null,
+        containerCode: null,
+        qty: null,
+        itemCode: null,
+      },
+      //编辑
+      editFormData: {
+        containerCode:'',
+        itemCode:'',
+        remark: null,
+        qty: null,
+        concurrencyStamp: null,
+      },
+      editOptions: {},
+      CreateForm: [
+        { type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",this.isFilterItemCode())},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData,this.isFilterItemCode()) }, colSpan: 12 },
+        { type: "inputNumber", label: "收容数量", prop: "qty", colSpan: 12, min:1 },
+        { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+      ],
+      editForm: [
+        { disabled:true, type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
+        { type: "inputNumber", label: "收容数量", prop: "qty", colSpan: 12, min:1 },
+        { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+      ],
+      editRules: {
+        cerateRule: {
+          containerCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          itemCode: [{ required: true, trigger: "change", message: "不可为空" }],
+          qty: [
+            { required: true, trigger: "blur", message: "不可为空且最小值为1" },
+            { required: true, trigger: 'blur', validator: validateQty }
+          ],
+        },
+        editRule: {
+          containerCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          itemCode: [{ required: true, trigger: "change", message: "不可为空" }],
+          qty: [
+            { required: true, trigger: "blur", message: "不可为空且最小值为1" },
+            { required: true, trigger: 'blur', validator: validateQty }
+          ],
+        }
+      },
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+  methods:{
+    //过滤查询条件
+    isFilterItemCode () {
+      let filter = [
+        {
+          logic: "Or",
+          column: "type",
+          action: "==",
+          value: "10C04"
+        },
+        {
+          logic: "Or",
+          column: "type",
+          action: "==",
+          value: "10C01"
+        }
+      ]
+      return filter
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/basicData/ItemsManage/Utensil.vue b/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
index 21de53db4..546780d90 100644
--- a/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/Utensil.vue
@@ -162,7 +162,6 @@ export default {
         { type: "select",options: "utensilType", label: "器具类型", prop: "type", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
-      //todo:器具规格+器具类型
       editRules: {
         cerateRule: {
           codeSuffix: [{ required: true, trigger: "blur", message: "不可为空" }],
@@ -202,7 +201,6 @@ export default {
         // this.$listAssign(this.editFormData, this.propsData)
         this.displayDialog.editDialog = true
         
-       // todo:编辑-拆分类型前缀和code码
        this.editFormData.prefixType = "Q"
         this.editFormData.codeSuffix = (this.editFormData.prefixType == 'Q') ? (this.editFormData.code && this.editFormData.code.length > 0 ? this.editFormData.code.slice(1) : null) : this.editFormData.code
         // this.editFormData.prefixType = this.editFormData.code && this.editFormData.code.length > 0 ? this.editFormData.code.slice(0,1) : "Q"
@@ -213,12 +211,11 @@ export default {
       }
     },
     FormSubmitHandle(val){
-      // todo:处理codeType + code拼接
       if(this.formReveal){
-        this.CreateFormData.code = this.CreateFormData.prefixType + this.CreateFormData.codeSuffix
+        this.CreateFormData.code = this.CreateFormData.codeSuffix
         this.CreateFormData.creator = store.getters.name.userName
       }else{
-        this.editFormData.code = this.editFormData.prefixType + this.editFormData.codeSuffix
+        this.editFormData.code = this.editFormData.codeSuffix
         this.editFormData.creator = store.getters.name.userName
       }
       this.$nextTick(()=>{
diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
index c3754fb4e..d93f8235b 100644
--- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
+++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue
@@ -223,8 +223,11 @@ export default {
       editRules: {
         cerateRule: {
           itemCode: [{ required: true, trigger: "change", message: "不可为空" },],
+          storeValue: [{ required: true, trigger: "change", message: "不可为空" },],
         },
-        editRule: {}
+        editRule: {
+          storeValue: [{ required: true, trigger: "change", message: "不可为空" },],
+        }
       },
     };
   },
diff --git a/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue b/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue
new file mode 100644
index 000000000..df58f9d1e
--- /dev/null
+++ b/fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue
@@ -0,0 +1,163 @@
+
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      @buttonOperationClick="buttonOperationClick"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="formReveal ? CreateFormData : editFormData"
+      :Form="formReveal ? CreateForm : editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @FormSubmit="FormSubmit"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :dropdownData="dropdownData"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :tableLoading="tableLoading"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+export default {
+  name: "PurchasePriceSheet",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+  },
+  data () {
+    return {
+      URL: 'basedata/purchase-price-sheet',
+      tableLoading:false,
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultAddBtn(),//新增
+        // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //新增
+      CreateFormData: {
+        code: null,
+      },
+      //编辑
+      editFormData: {
+        code: null,
+      },
+      editOptions: {},
+      CreateForm: [
+        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+      ],
+      editForm: [
+        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+      ],
+      editRules: {
+        cerateRule: {
+          code: [{ required: true, trigger: "blur", message: "不可为空" }],
+        },
+        editRule: {
+          code: [{ required: true, trigger: "blur", message: "不可为空" }],
+        }
+      },
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue b/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue
new file mode 100644
index 000000000..b4ab89423
--- /dev/null
+++ b/fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue
@@ -0,0 +1,163 @@
+
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      @buttonOperationClick="buttonOperationClick"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="formReveal ? CreateFormData : editFormData"
+      :Form="formReveal ? CreateForm : editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @FormSubmit="FormSubmit"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :dropdownData="dropdownData"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :tableLoading="tableLoading"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+export default {
+  name: "SalePriceSheet",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+  },
+  data () {
+    return {
+      URL: 'basedata/sale-price-sheet',
+      tableLoading:false,
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultAddBtn(),//新增
+        // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //新增
+      CreateFormData: {
+        code: null,
+      },
+      //编辑
+      editFormData: {
+        code: null,
+      },
+      editOptions: {},
+      CreateForm: [
+        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+      ],
+      editForm: [
+        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+      ],
+      editRules: {
+        cerateRule: {
+          code: [{ required: true, trigger: "blur", message: "不可为空" }],
+        },
+        editRule: {
+          code: [{ required: true, trigger: "blur", message: "不可为空" }],
+        }
+      },
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue b/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue
new file mode 100644
index 000000000..65af6ee03
--- /dev/null
+++ b/fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue
@@ -0,0 +1,163 @@
+
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      @buttonOperationClick="buttonOperationClick"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <!-- 新增与编辑 -->
+    <newAndEdiDialog
+      :loading="Loading.newAndEdiLoading"
+      :active="active"
+      :pageStatus="pageStatus"
+      :formReveal="formReveal"
+      :formTitle="formTitle"
+      :displayDialog="editDialog"
+      :FormData="formReveal ? CreateFormData : editFormData"
+      :Form="formReveal ? CreateForm : editForm"
+      :Options="editOptions"
+      :Handle="editHandle"
+      :Rules="formReveal ? editRules.cerateRule : editRules.editRule"
+      @FormSubmit="FormSubmit"
+      @close="FormClose"
+      @goBack="goBack"
+    ></newAndEdiDialog>
+    <!-- 搜索按钮——窗体组件 -->
+    <searchPage
+      ref="searchTable"
+      :tableLoading="Loading.autoTableLoading"
+      :advancedFilter="advancedFilter()"
+      :filterPageListParams="filterPageListParams"
+      :formTitle="searchTitle"
+      :displayDialog="displayDialog.AddNewDialog"
+      :searchTableData="searchData"
+      :searchTableColumns="searchColumns"
+      :searchTotalCount="searchTotalCount"
+      :supplierItemPage="searchPageListParams"
+      @handleSelectionChange="prepareFormData"
+      @SizeChange="searchAlterResultCount($event, searchPageListParams)"
+      @CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
+      @tableButtonClick="searchSubmit(arguments)"
+    ></searchPage>
+    <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
+    <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
+    <importFile
+      :loading="Loading.importLoading"
+      :show="displayDialog.importDialog"
+      :URL="URL"
+      :disabledMethod = {method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      isAllowPartImportValue="1"
+      @importClick="postImportMergeClick(arguments)"
+      @postImportDown="importDown"
+    ></importFile>
+    <!--抽屉-->
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :dropdownData="dropdownData"
+      :propsData="propsData"
+      :tabsDesTions="tabsDesTions"
+      :tableLoading="tableLoading"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbutton"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+  </div>
+</template>
+<script>
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+export default {
+  name: "StdCostPriceSheet",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+    newAndEdiDialogMixins
+  ],
+  computed: {
+    editDialog: {
+      get: function () {
+        return this.displayDialog.newDialog || this.displayDialog.editDialog;
+      },
+    },
+  },
+  data () {
+    return {
+      URL: 'basedata/stdcostpricesheet',
+      tableLoading:false,
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultAddBtn(),//新增
+        // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      //新增
+      CreateFormData: {
+        code: null,
+      },
+      //编辑
+      editFormData: {
+        code: null,
+      },
+      editOptions: {},
+      CreateForm: [
+        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+      ],
+      editForm: [
+        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+      ],
+      editRules: {
+        cerateRule: {
+          code: [{ required: true, trigger: "blur", message: "不可为空" }],
+        },
+        editRule: {
+          code: [{ required: true, trigger: "blur", message: "不可为空" }],
+        }
+      },
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-old.vue b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-old.vue
new file mode 100644
index 000000000..1d45443b7
--- /dev/null
+++ b/fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-old.vue
@@ -0,0 +1,381 @@
+<template>
+  <div class="page-box" v-loading="Loading.appMainLoading">
+    <tablePagination
+      :currenButtonData="currenButtonData"
+      :tableData="tableData"
+      :tableLoading="Loading.tableLoading"
+      :tableColumns="tableColumns"
+      @rowDrop="rowDrop"
+      :totalCount="totalCount"
+      :multipleSelection="multipleSelection"
+      :MaxResultCount="PageListParams.MaxResultCount"
+      @topbutton="topbutton"
+      @inlineDialog="inlineDialog"
+      @sortChange="sortChange"
+      @alertoldSkipCount="alertoldSkipCount"
+      @alterResultCount="alterResultCount"
+      @handleSelectionChange="handleSelectionChange"
+      :currentPageProps="oldSkipCount"
+      :quicklySearchOption="quicklySearchOption"
+      @quicklySearchClick="quicklySearchClick"
+      @quicklySearchClear="quicklySearchClear"
+      :primarySearchOption="primarySearchOption"
+      @overallSearchFormClick="overallSearchFormClick"
+      :httpOverallSearchData="httpOverallSearchData"
+    >
+    </tablePagination>
+    <curren-Drawer
+      :title="tableColumns"
+      :DrawerLoading="Loading.DrawerLoading"
+      :drawer="displayDialog.detailsDialog"
+      :propsData="propsData"
+      :Butttondata="DrawerButtonData"
+      :tabsDesTions="tabsDesTions"
+      @drawerShut="(val) => (displayDialog.detailsDialog = val)"
+      @drawerbutton="drawerbuttonHandle"
+      @handleCommand="drawerHandle"
+      @close-value="closeValue"
+      :tableColumns="detailsTableColumns"
+      :totalCount="totalCountDetails"
+      :MaxResultCount="MaxResultCountDetails"
+      @alterResultCountDetails="alterResultCountDetails"
+      @alertoldSkipCountDetails="alertoldSkipCountDetails"
+      :dropdownTabsData="[]"
+      :firstTabs="firstTabs"
+    ></curren-Drawer>
+    <!--编辑-->
+    <StepsFormNotView
+      :formTitle="formTitle"
+      :displayDialog="displayDialog"
+      :CreateFormData="CreateFormData"
+      :CreateForm="CreateForm"
+      :Rules="editRules.cerateRule"
+      :Options="editOptions"
+      :detailsTableColumns="AddDetailsTableColumns"
+      :childTableData="childTableData"
+      @close="stepsCloseHandle(arguments)"
+      @detailsDataPush="detailsDataPush"
+      @detailsClear="detailsClear"
+      :isShowDeleteButton="false"
+      :addClickButton="false"
+      :successHandle="successHandle"
+    ></StepsFormNotView>
+  </div>
+</template>
+<script>
+import {  
+  getDetailed, 
+  getPageList,
+  getBomByComponentTree,
+  productRecycleNoteExport,
+  productionRecycleJobHandle,
+  // productionRecycleJobComplete
+} from "@/api/wms-api";
+import { tableMixins } from "@/mixins/TableMixins"
+import { LoadingMixins } from "@/mixins/LoadingMixins"
+import { drawerMixins } from "@/mixins/drawerMixins"
+import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
+import { mixins } from "@/mixins/mixins"
+import { filterSelectMixins } from '@/mixins/filter-Select'
+import store  from '@/store'
+export default {
+  name: "customerDismantleJob",
+  mixins: [
+    tableMixins,
+    LoadingMixins,
+    drawerMixins,
+    TableHeaderMixins,
+    mixins,
+    filterSelectMixins,
+  ],
+  computed: {
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
+    },
+  },
+  data () {
+    return {
+      URL: 'wms/store/production-recycle-job',
+      //常用按钮数据
+      currenButtonData: [
+        // this.defaultAddBtn(),//新增
+        //导出
+        this.defaultExportBtn(),
+        this.defaultFieldSettingBtn(),//字段设置
+        this.defaultFreshBtn(),//刷新
+        this.defaultFilterBtn(),//筛选
+      ],
+      DrawerButtonData: [
+        {
+          type: 'warning',
+          label: '执行',
+          name: "handle",
+          // 待处理+执行中+部分完成
+          hide: () => { return this.hideButton([1,2,4]) },
+          size: 'mini'
+        },
+        // {
+        //   type: 'success',
+        //   label: '完成',
+        //   name: "complete",
+        //   // todo:什么状态可以执行，还是数量判断
+        //   hide: () => { return this.hideButton([1]) },
+        //   size: 'mini'
+        // },
+      ],
+      //新增
+      CreateFormData: {
+        qty:null,
+        details:[]
+      },
+      CreateForm: [
+        { type: "inputNumber", label: "数量", prop: "qty",colSpan: 12,min:1},
+      ],
+      editRules: {
+        cerateRule: {
+          qty: [
+            { required: true, trigger: "blur", message: "不可为空" },
+            {
+              type: "number",
+              trigger: ["blur"],
+              validator: (rule, value, callback) => {
+                //数量控制
+                let _InventoryQty = Number(this.propsData.details[0].qty) - Number(this.propsData.details[0].executedQty)
+                if(_InventoryQty < value){
+                  return callback(new Error(`数量不能大于未完成数量${_InventoryQty}`))
+                }else{
+                  callback()
+                }
+              }
+            }
+          ],
+        },
+      },
+      AddDetailsTableColumns: [
+        { label: "子物料代码", prop: "partCode",width:"auto" },
+        { label: "数量", prop: 'qty',width:"auto" },
+        { type: "filterSelect", label: "目标库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, 
+          width:"auto",
+        },
+      ],
+      childTableData:[{
+        partCode:undefined,
+        qty:undefined,
+        rawLocationCode:undefined,
+        rawLocationArea:undefined,
+        rawLocationErpCode:undefined,
+        rawLocationGroup:undefined,
+        warehouseCode:undefined,
+      }],
+      successHandle:[
+        {
+          label:"下载报告",
+          click:(()=>{
+            this.downloadReport()
+          })
+        }
+      ],
+      bomList:null,
+      submitRes:null,//提交后结果
+    };
+  },
+  mounted () {
+    this.paging();
+  },
+  methods: {
+    drawerbuttonHandle(val){
+      // 执行
+      if (val == "handle") {
+        this.formTitle = this.$route.meta.title + "执行";
+        this.CreateFormData = JSON.parse(JSON.stringify(this.propsData));
+        // 默认值
+        let _qty = Number(this.propsData.details[0].qty) - Number(this.propsData.details[0].executedQty)
+        this.$set(this.CreateFormData, "qty", _qty)
+        this.childTableData = [{
+          partCode:undefined,
+          qty:undefined,
+          rawLocationCode:undefined,
+          rawLocationArea:undefined,
+          rawLocationErpCode:undefined,
+          rawLocationGroup:undefined,
+          warehouseCode:undefined,
+        }]
+        this.theEvent = "edit"
+        this.displayDialog.newDialog = true
+      }
+      // 完成
+      // else if(val == "complete"){
+      //   // todo:强制完成,更改wsm-api中productionRecycleJobComplete的值
+      //   this.Loading.appMainLoading = true
+      //   productionRecycleJobComplete(this.propsData.id).then(res => {
+      //     this.Loading.appMainLoading = false
+      //     this.paging()
+      //     this.displayDialog.detailsDialog = false
+      //   }).catch(err => {
+      //     this.Loading.appMainLoading = false
+      //   })
+      // }
+      else{
+        this.drawerbutton(val)
+      }
+    },
+    //过滤查询条件
+    isFilter (val, data) {
+      let filter = [
+        {
+          logic: "And",
+          column: val,
+          action: "==",
+          value: data
+        }
+      ]
+      return filter
+    },
+    detailsDataPush(data){
+      if(data[1].prop == "rawLocationCode"){
+        this.CreateFormData.details[data[3].$index].rawLocationArea = data[0].areaCode
+        this.CreateFormData.details[data[3].$index].rawLocationErpCode = data[0].erpLocationCode
+        this.CreateFormData.details[data[3].$index].rawLocationGroup = data[0].locationGroupCode
+        this.CreateFormData.details[data[3].$index].warehouseCode = data[0].warehouseCode
+      }
+    },
+    detailsClear(data){
+      console.log(data)
+    },
+    // 成功后按钮操作
+    downloadReport(){
+      // 下载
+      let _data = {
+        maxResultCount: 20,
+        skipCount: 0,
+        sorting: "",
+        route: "wms/store/product-recycle-note/export-product-recycle",
+        function: "客户退拆记录",//导出文件名称
+        condition: {
+          filters: [
+            {
+              logic: "And",
+              column: "number",
+              action: "==",
+              value: this.submitRes.remark
+            }
+          ]
+        }
+      }
+      this.Loading.appMainLoading = true
+      productRecycleNoteExport(_data)
+        .then(res=>{
+          this.Loading.appMainLoading = false
+          this.blob(res,'客户退拆记录报告')//导出文件名称
+        })
+        .catch(err=>{
+          this.Loading.appMainLoading = false
+        })
+    },
+    stepsSubmit (val) {
+      // 提交
+      return new Promise((resolve, reject) => {
+        let _tableList = this.CreateFormData.details
+        let _empty = 0
+        _tableList.forEach(item=>{
+          if(!item.rawLocationCode || item.rawLocationCode.length <= 0){
+            _empty ++
+          }
+        })
+        if(_empty > 0){
+          this.$errorMsg("目标库位不可为空")
+          return
+        }
+        let _jobInfo = this.propsData
+        let _itemInfo = this.propsData.details[0]
+        let _data = JSON.parse(JSON.stringify(_jobInfo))
+        _data.details[0].materialDetails = [],//目前规定明细中肯定只有一个子数据
+        _data.details[0].qty = Number(this.CreateFormData.qty)
+        this.bomList.forEach((item,index)=>{
+          let _item = {
+            itemCode: item.component,
+            qty: _tableList[index].qty,
+            locationCode: _tableList[index].rawLocationCode,
+            locationArea: _tableList[index].rawLocationArea,
+            locationGroup: _tableList[index].rawLocationGroup,
+            locationErpCode: _tableList[index].rawLocationErpCode,
+            warehouseCode: _tableList[index].warehouseCode,
+          }
+          _data.details[0].materialDetails.push(_item)
+        })
+        this.Loading.appMainLoading = true
+        this.submitRes = null
+        productionRecycleJobHandle(_jobInfo.id,_data).then(res => {
+          this.Loading.appMainLoading = false
+          this.submitRes = res
+          resolve();
+        }).catch(err => {
+          this.Loading.appMainLoading = false
+          reject();
+        })
+      });
+    },
+    stepsCloseHandle(data){
+      // 关闭详情弹窗
+      this.displayDialog.detailsDialog = false
+      this.stepsClose(data)
+    },
+    PalletlFunction (val) {
+      return new Promise((resolve, reject) => {
+        if(val == 0){
+          console.log(this.CreateFormData.qty)
+          this.Loading.appMainLoading = true
+          // 获取接口生成bom列表
+          let _itemInfo = this.propsData.details[0]
+          getBomByComponentTree(_itemInfo.itemCode)
+            .then(res=>{
+              this.bomList = res
+              this.Loading.appMainLoading = false
+              if(res.length > 0){
+                this.CreateFormData.details = []
+                res.forEach(item=>{
+                  let _item={
+                    partCode:item.component,
+                    // details的qty是否要乘以主表的qty值
+                    qty:Number(item.componentQty)*this.CreateFormData.qty,
+                    rawLocationCode:_itemInfo.rawLocationCode,
+                    rawLocationArea:_itemInfo.rawLocationArea,
+                    rawLocationGroup:_itemInfo.rawLocationGroup,
+                    rawLocationErpCode:_itemInfo.rawLocationErpCode,
+                    warehouseCode:_itemInfo.warehouseCode,
+                  }
+                  this.CreateFormData.details.push(_item)
+                })
+                resolve();
+              }else{
+                this.$errorMsg(`并未找到${_itemInfo.itemCode}对应的bom数据`)
+                reject()
+              }
+            })
+            .catch(err=>{
+              this.Loading.appMainLoading = false
+              reject()
+            })
+        }
+        // 提交
+        if(val == 1){
+          resolve()
+        }
+      });
+    },
+  }
+};
+</script>
+<style lang="scss" scoped>
+@import "../../../styles/basicData.scss";
+</style>
\ No newline at end of file
diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue
index 3330de9af..93dc87a09 100644
--- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue
+++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrderHigher.vue
@@ -55,7 +55,27 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-    ></curren-Drawer>
+    >
+      <template>
+        <el-table-column
+          fixed="right"
+          label="操作"
+          align="center"
+          width="120"
+        >
+          <template slot-scope="scope">
+            <span style="color:#999" v-if="scope.row.lineStatus == 0">订单行已关闭</span>
+            <span style="color:#999" v-if="Number(scope.row.putAwayQty) > 0 && scope.row.lineStatus == 1">已上架</span>
+            <el-button 
+              v-if="Number(scope.row.putAwayQty) <= 0 && scope.row.lineStatus == 1"
+              type="danger"
+              @click="closePoline(scope)"
+              size="small"
+            >关闭订单行</el-button>
+          </template>
+        </el-table-column>
+      </template>		
+    </curren-Drawer>
   </div>
 </template>
 <script>
@@ -64,7 +84,7 @@ import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
-import { processRequest, getDetailed } from '@/api/wms-api'
+import { processRequest, getDetailed,purchaseOrderCloseDetailld } from '@/api/wms-api'
 export default {
   name: "PurchaseOrderHigher",
   mixins: [
@@ -75,27 +95,11 @@ export default {
     mixins
   ],
   computed: {
-    hideButton: function () {
-      return function (val) {
-        let data = true
-        // todo:确定判断条件（上架后不让关闭订单行）
-        if(this.propsData.confirmed == val){data = false}
-        return data
-      }
-    },
   },
   data () {
     return {
       URL: 'wms/store/purchase-order',
       DrawerButtonData: [
-        {
-          type: 'danger',
-          icon: 'el-icon-delete-solid',
-          label: '关闭订单行',
-          hide: false,
-          name: "close",
-          size: 'mini'
-        },
         // {
         //   type: 'danger',
         //   icon: 'el-icon-delete-solid',
@@ -119,25 +123,31 @@ export default {
     this.paging();
   },
   methods: {
+    // 关闭订单行
+    closePoline(scope){
+      this.$confirm('您确定要关闭该订单行吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.Loading.appMainLoading = true
+        purchaseOrderCloseDetailld(this.propsData.id, scope.row.id).then(res => {
+          this.$successMsg('关闭成功')
+          getDetailed(this.propsData.id, this.URL).then(res => {
+            this.propsData = res
+          })
+          this.paging()
+          this.Loading.appMainLoading = false
+        }).catch(err => {
+          console.log(err)
+          this.Loading.appMainLoading = false
+        })
+      }).catch(() => {
+
+      });
+    },
     //抽屉内常用按钮
     drawerbutton (val) {
-      // 关闭订单行
-      if (val == 'close') {
-        let that = this
-        that.Loading.appMainLoading = true
-        // todo:确定关闭接口
-        // processRequest(that.propsData.id, that.URL + '/cancel/').then(res => {
-        //   that.$successMsg('已作废')
-        //   getDetailed(that.propsData.id, that.URL).then(res => {
-        //     that.propsData = res
-        //   })
-        //   that.paging()
-        //   that.Loading.appMainLoading = false
-        // }).catch(err => {
-        //   console.log(err)
-        //   that.Loading.appMainLoading = false
-        // })
-      }
       // 作废
       // if (val == 'delete') {
       //   let that = this