Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

fe/PC/src/api/wms-api.js

@@ -286,7 +286,7 @@ export function byItem(itemCode, url ){
   })
 }
 
-// 详情tabs页 通过父物料号 获取列表
+// 详情tabs页 通过父物品号 获取列表
 export function byProduct(product, url ){
   return request({
     url: baseURL + url + '/get-list-by-product',
@@ -295,7 +295,7 @@ export function byProduct(product, url ){
   })
 }
 
-// 详情tabs页 通过子物料号 获取列表
+// 详情tabs页 通过子物品号 获取列表
 export function byComponent(component, url ){
   return request({
     url: baseURL + url + '/get-list-by-component',
@@ -339,7 +339,7 @@ export function relationByLocationCode(locationCode, url ){
   })
 }
 
-// 详情tabs页 通过子物料号 获取子层级列表
+// 详情tabs页 通过子物品号 获取子层级列表
 export function byComponentCJ(component, url ){
   return request({
     url: baseURL + url + '/get-list-by-component-with-tree',

fe/PC/src/api/wms-core.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 // let baseURL = localStorage.getItem('print') + '/api/'
 let baseURL = localStorage.getItem('base') + '/api/'
 
-// 批量获取箱标签信息 | 到货通知
+// 批量获取箱标签信息 | 到货请求
 export function getInventoryLabelByCodes(data) {
   return request({
     url: baseURL + 'label/inventory-label/by-codes',

fe/PC/src/components/commonTabel-drawer/index.vue

@@ -134,7 +134,7 @@
               <slot></slot>
             </template>		
           </umyTable>
-          <!-- 自定义扩展（tree）的形式 目前使用位置：物料清单信息-子物料层级  todo:待优化-->
+          <!-- 自定义扩展（tree）的形式 目前使用位置：物品清单信息-子物品层级  todo:待优化-->
           <currenTable
             v-if="
               scope.value == zdyValue &&
@@ -456,7 +456,7 @@ export default {
                 parent.tableLoading = false
               })
             } 
-            // 基础数据管理-物料清单维护-物料清单信息-详情-子物料层级
+            // 基础数据管理-物品清单维护-物品清单信息-详情-子物品层级
             else if (item.functionName == 'byComponentCJ') {
               this.otherData = []
               byComponentCJ({component:this.propsData.component}, item.url).then(res => {
@@ -545,7 +545,7 @@ export default {
         }
       })
     },
-    // 递归 物料子级层级
+    // 递归 物品子级层级
     recursion(val){
       val.forEach(item => {
         if(item.componentDTOs) {

fe/PC/src/components/importFile/index.vue

@@ -7,8 +7,7 @@
     :visible.sync="show"
     :append-to-body="true"
     :modal-append-to-body="false"
-    top="5vh"
-    width="950px"
+    width="85%"
     :show-close="false"
   >
     <div class="body_header">
@@ -56,13 +55,14 @@
     :modal-append-to-body="false"
     :show-close="false"
     width="85%"
-    top="3vh"
   >
     <div >
       <el-table 
         :data="excelData.results" 
-        border highlight-current-row 
-        style="width: 100%;margin-top:10px;"
+        :border="true" 
+        highlight-current-row 
+        style="width: 100%;
+        margin-top:10px;"
         max-height="400"
       >
         <el-table-column 
@@ -255,7 +255,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-dialog__body {
-  max-height: 50vh;
+  max-height: 100vh;
   display: flex;
   flex-direction: column;
 }

fe/PC/src/components/tablePagination/index.vue

@@ -139,7 +139,7 @@ export default {
       type: Boolean,
       default: false,
     },
-    // todo:当前组件内没有使用，待确定是否可以删除
+    // 选择当前行数据
     multipleSelection: {
       type: Array,
       default: () => {

fe/PC/src/filters/excelOrReportsOption.js

@@ -12,11 +12,11 @@ export const supplierAsnExcel = {
     shipDate:"发货日期",
     details:{
         projectCode:"明细-项目编号",
-        itemCode:"明细-物料代码",
+        itemCode:"明细-物品代码",
         ctype:"明细-类型",
         recommendErpCode:"明细-指定ERP储位",
         qty:"明细-发货数量",
-        uom:"明细-物料单位",
+        uom:"明细-物品单位",
         lot:"明细-生产批次",
         produceDate:"明细-生产时间",
         expireDate:"明细-过期时间",

fe/PC/src/filters/options.js

@@ -126,13 +126,13 @@ export function Roles(val){
     // "Warehouse": "仓库",
     // "Area": "区域",
     // "AreaItem": "区域零件",
-    // "Bom": "物料清单",
+    // "Bom": "物品清单",
     // "InterfaceCalendar": "日历接口",
     // "Calendar": "日历",
     // "Company": "公司",
     // "Customer": "客户",
     // "CustomerItem": "客户物品",
-    // "WorkStation": "工作站",
+    // "WorkStation": "工作中心",
     // "Team": "班组",
     // "Supplier": "供应商",
     // "SupplierItem": "供应商物品",
@@ -179,7 +179,7 @@ export function Roles(val){
     // "PreparationPlan": "备料计划",
     // "ProductReceiptNote": "完工收货记录",
     // "OfflineSettlementNote": "下线结算记录",
-    // "ArriveNotice": "到货通知",
+    // "PurchaseReceiptRequest": "到货请求",
     // "PurchaseReceiptNote": "采购收货记录",
     // "ReceiptAbnormalNote": "收货异常记录",
     // "PurchaseReturnNote": "采购退货记录",

fe/PC/src/filters/status.js

@@ -430,9 +430,9 @@ export function calendarStatus(index, prop) {
 }
 /**
  * @param {Boolean} 
- * @returns {object} '到货通知状态'
+ * @returns {object} '到货请求'
  */
-export function arriveNoticeStatus(index, prop) {
+export function PurchaseReceiptRequestStatus(index, prop) {
   let status = {
     1: {
       label: "关闭",
@@ -1592,9 +1592,9 @@ export function SupplierAsnCtypeStaBack(name){
       value: '原料',
       label: '原料',
     },
-    '物料': {
-      value: '物料',
-      label: '物料',
+    '物品': {
+      value: '物品',
+      label: '物品',
     },
     '半成品': {
       value: '半成品',
@@ -1629,7 +1629,7 @@ export function SupplierAsnCtypeStaBack(name){
     },
     3: {
       value: 3,
-      label: '物料',
+      label: '物品',
       UK: 'MAT'
     },
     4: {

fe/PC/src/mixins/TableMixins.js

@@ -136,6 +136,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤tableData
     getSupplierByCodesHandle_table() {
+      this.Loading.tableLoading = false
+      return
       for(let i=0;i<this.tableColumns.length;i++){
         if(this.tableColumns[i].prop == 'supplierName' || this.tableColumns[i].prop == "supplierAddress"){
           let _allSuCode = []
@@ -173,6 +175,8 @@ export const tableMixins = {
     },
     // 获取供应商信息过滤propsData
     getSupplierByCodesHandle_props() {
+      this.Loading.DrawerLoading = false
+      return
       for(let i=0;i<this.tabsDesTions.length;i++){
         if(!this.propsData.supplierCode){
           this.Loading.DrawerLoading = false

fe/PC/src/mixins/mixins.js

@@ -219,7 +219,15 @@ export const mixins = {
 
             let fd = new FormData();
             fd.append("fileType", 1) //文件类型  固定1
-            fd.append("method", val[1].method) //导入方式 0 更新 1 追加 2 覆盖
+            let methodVal = ''
+            if (val[1].method == '0') {
+              methodVal = 'Update'
+            } else if (val[1].method == '1') {
+              methodVal = 'Append'
+            } else if (val[1].method == '2') {
+              methodVal = 'Replace'
+            }
+            fd.append("method", methodVal) //导入方式 0 更新 1 追加 2 覆盖
             fd.append("isAllowPartImport", val[1].isAllowPartImport=='0'?true:false) //是否部分错误导入 
             fd.append("route", _isSpecial ? _uploadURL : _uploadURL + '/import') //路由 
             fd.append("function", menuName) //菜单名

fe/PC/src/mixins/printMixin.js

@@ -19,7 +19,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
     let _options = options ? options : {}
     propsData.details.forEach((item,key) => {
         _printData["boxlabel"].push({
-            "title":propsData[_options.title] || propsData.title || "FATY 物料发运单",//title
+            "title":propsData[_options.title] || propsData.title || "FATY 物品发运单",//title
             "contacts": propsData[_options.contacts] || propsData.contacts,//客户名称
             "customerAddressCode":propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
             "supplierCode": propsData[_options.supplierCode] || propsData.supplierCode,//供应商代码
@@ -36,8 +36,8 @@ export function initPrintPackingCodeData(propsData,options,name,url){
                     "produceDate": item[_options.produceDate] || item.produceDate,//生产时间
                     "lot": item[_options.lot] || item.lot,//生产批次
                     "locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位
-                    "itemName": item[_options.itemName] || item.itemName,//物料名称
-                    "itemCode": item[_options.itemCode] || item.itemCode,//物料代码（ERP号）
+                    "itemName": item[_options.itemName] || item.itemName,//物品名称
+                    "itemCode": item[_options.itemCode] || item.itemCode,//物品代码（ERP号）
                     "stdPackQty": item[_options.stdPackQty] || item.stdPackQty,//整包数量
                     "qty": item[_options.qty] || item.qty,//要货数量
                     "packingCode": item[_options.packingCode] || item.packingCode,//条形码
@@ -93,7 +93,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
 
 // 打印【箱标签-单页4个】 (xiangbq_many.rdlx)
 // 使用位置：半成品上架标签 (PartiallyPreparedProducts.vue) | 生产退库标签 (productionReturnLabel.vue)
-//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货通知详情 (ArriveNotice-ms.vue)
+//          | 创建标签 (RecycledMaterialsLabel.vue) | 到货请求详情 (PurchaseReceiptRequest.vue)
 /**
  * @param {*} propsData 必填 详情数据 示例：this.propsData
  * @param {*} options 自定义特殊配置值 示例：{'number':'poNumber'} (number值将传为poNumber)
@@ -127,7 +127,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
                     _index = Number(_index) + 1
                 }
             }
-            let _title = propsData ? "FATY 物料发运单" : ""
+            let _title = propsData ? "FATY 物品发运单" : ""
             _label['title'+Number(key2 + 1)]=propsData[_options.title] || propsData.title || _title,//title
             _label['contacts'+Number(key2 + 1)]= propsData[_options.contacts] || propsData.contacts,//客户名称
             _label['customerAddressCode'+Number(key2 + 1)]=propsData[_options.customerAddressCode] || propsData.customerAddressCode,//客户地址
@@ -144,7 +144,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
             _label['produceDate'+Number(key2 + 1)] = item[_options.produceDate] || item2.produceDate;//生产时间
             _label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次
             _label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位
-            _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物料代码（ERP号）
+            _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号）
             _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量
             _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量
             _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
@@ -273,7 +273,7 @@ const printEnumOption = {
 // 使用位置:自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue) 
 // 使用位置:人工发料任务 (IssueJob.vue)  | 人工发料记录 (IssueNote.vue)
 // 单号:number; 制表日:creationTime; 部门名称:deptName; 
-// 物品代码:itemCode; 物品名称:itemName; 物料描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
+// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
 // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
 
 // xbctl.rdlx  使用参数  xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段
@@ -282,7 +282,7 @@ const printEnumOption = {
 // zjfl.rdlx  使用参数
 // 使用位置:直接发料记录 (directIssueNote.vue)
 // 单号:number; 制表日:creationTime; 部门名称:deptName; 
-// 物品代码:itemCode; 物品名称:itemName; 物料描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
+// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
 // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
 
 // hslrkd.rdlx  使用参数

fe/PC/src/router/index.js

@@ -118,22 +118,22 @@ export const constantRoutes = [
       }
     }]
   }, 
-  // {
-  //   path: '/',
-  //   component: Layout,
-  //   redirect: '/gridlayout',
-  //   // hidden: true,
-  //   children: [{
-  //     path: 'gridlayout',
-  //     component: () => import('@/views/gridLayout/indexShow'),
-  //     name: 'Gridlayout',
-  //     meta: {
-  //       keepAlive : true, 
-  //       title: '首页编辑器',
-  //       icon: '系统首页',
-  //     }
-  //   }]
-  // }, 
+  {
+    path: '/',
+    component: Layout,
+    redirect: '/gridlayout',
+    hidden: true,
+    children: [{
+      path: 'gridlayout',
+      component: () => import('@/views/gridLayout/indexShow'),
+      name: 'Gridlayout',
+      meta: {
+        keepAlive : true, 
+        title: '首页编辑器',
+        icon: '系统首页',
+      }
+    }]
+  }, 
   // 开发中模拟路由
   // {
   //   path: '/',

fe/PC/src/utils/primarySearchOption/index.js

@@ -2,7 +2,7 @@
 // 示例配置  primarySearchOptionExample
 export const ItemBasic = [
   // type == input
-  { type: "input", label: "物料编码", prop: "code", action:"Like"},
+  { type: "input", label: "物品编码", prop: "code", action:"Like"},
   // type == select 枚举options(filters/status.js)
   { type: "select", label: "状态", prop: "status", options: "itemStatus"},
   // type == select 自定义options(使用userOptions参数)

fe/PC/src/utils/quicklySearchOption/index.js

@@ -3,7 +3,7 @@
 // export const primarySearchOptionExample = {
 //   action:"Like",//筛选方式：可不写，默认等于== 
 //   prop:'code',//接口要查的参数
-//   placeholder:'请输入物料代码',//placeholder
+//   placeholder:'请输入物品代码',//placeholder
 // }
 
 // 原料管理

fe/PC/src/utils/summaryTableColumns/index.js

@@ -6,10 +6,10 @@ const orderWidth = 180
 // 报检单 已调整
 export const InspectNotice =  [
   // { label: "检验详情", fixed: "left", type: "button" },
-  { label: "物料代码", prop: "itemCode" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料单位", prop: "receiveUom" },
+  { label: "物品代码", prop: "itemCode" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品单位", prop: "receiveUom" },
   { label: "生产批次", prop: "lot" },
   { label: "收货数量", prop: 'receiveQty' },
   { label: "检验数量", prop: 'inspectQty' },
@@ -45,10 +45,10 @@ export const InspectNotice =  [
 ]
 // 检验记录  字段需要确定
 export const InspectNote =  [
-  { label: "物料代码", prop: "itemCode", fixed: "left" },
-  { label: "物料名称", prop: "itemName" },
-  { label: "物料描述", prop: "itemDesc1" },
-  { label: "物料单位", prop: 'receiveUom' },
+  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: "物品名称", prop: "itemName" },
+  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品单位", prop: 'receiveUom' },
   { label: "生产批次", prop: "lot" },
   { label: "收货数量", prop: 'receiveQty' },
   { label: "检验数量", prop: 'inspectQty' },
@@ -61,12 +61,12 @@ export const InspectNote =  [
   // { label: "不合格原因", prop: 'failedReason', type: "filter", filters: "getDict", dictType: "UnqualifiedReason" },
   // -----------------------------------------------------------------------
   { label: "单据号", prop: "number" },
-  { label: "物料描述2", prop: "itemDesc2" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "创建时间", prop: "completeTime",type: "dateTime" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "创建者Id", prop: 'creatorId' },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "上次修改者Id", prop: 'lastModifierId' },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "备注", prop: 'remark' },
   { label: "供应商批次", prop: 'supplierBatch' },
   { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
@@ -79,7 +79,7 @@ export const InspectNote =  [
   { label: "样品率", prop: 'samplePercent' },
   { label: "破坏数量", prop: 'crackQty' },
   { label: "最终不合格数量", prop: 'notPassedQty' },
-  { label: "事务代码", prop: "tenantId" },
+  { label: "事务ID", prop: "tenantId" },
   { label: "检验人邮件", prop: 'inspectUserEmail' },
   { label: "检验人姓名", prop: 'inspectUserName' },
   { label: "检验人电话", prop: 'inspectUserPhone' },

fe/PC/src/views/basicData/BomManage/Bom.vue

@@ -149,14 +149,14 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "父物料号", prop: "product", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "父物品号", prop: "product", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "子物料号", prop: "component", optionsLabel: "name", optionsValue: "code", 
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "filterSelect", label: "子物品号", prop: "component", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
-        { type: "input", label: "子物料用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
+        { type: "input", label: "子物品用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
         { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
@@ -168,10 +168,10 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "父物料号", prop: "product",disabled:"true",  colSpan: 12 },
-        { type: "input", label: "子物料号", prop: 'component', disabled:"true", colSpan: 12 },
-        { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
-        { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 },
+        { type: "input", label: "父物品号", prop: "product",disabled:"true",  colSpan: 12 },
+        { type: "input", label: "子物品号", prop: 'component', disabled:"true", colSpan: 12 },
+        { type: "inputNumber", label: "子物品用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2  },
+        { type: "input", label: "子物品用量单位", prop: 'componentUom', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },
         { type: "input", label: "ERP工序", prop: "erpOp", colSpan: 12 },
@@ -205,14 +205,14 @@ export default {
           name: 'xq'
         },
         {
-          label: "父物料信息",
+          label: "父物品信息",
           name: 'fwlxx',
           url: 'basedata/bom',
           tableColumns: 'BomInner',
           functionName: 'byProduct'
         },
         {
-          label: "子物料信息",
+          label: "子物品信息",
           name: 'zwlxx',
           url: 'basedata/bom',
           tableColumns: 'BomInner',
@@ -220,7 +220,7 @@ export default {
         }
         ,
         // {
-        //   label: "子物料层级",
+        //   label: "子物品层级",
         //   name: 'zwlcj',
         //   url: 'basedata/bom',
         //   tableColumns: 'Bom',

fe/PC/src/views/basicData/CustomerManage/CustomerAddress.vue

@@ -155,10 +155,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "客户编号", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '客户选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
           ])},
@@ -174,8 +174,8 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-      { type: "input", label: "客户编号", prop: 'customerCode', disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "库位编号", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
+      { type: "input", label: "客户代码", prop: 'customerCode', disabled:"true", colSpan: 12 },
+        { type: "filterSelect", label: "库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
             {logic:"And",column:"type",action:"==",value:"10"}
           ])},

fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue

@@ -156,17 +156,17 @@ export default {
         reportGroupId: [],
       },
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         
         { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
         focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
-        searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
+        searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
         
-        { type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
+        { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
+        { type: "input", label: "客户包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -174,11 +174,11 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "客户物料代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装数量单位", prop: "customerPackUom", colSpan: 12 },
+        { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },
+        { type: "input", label: "客户包装数量单位", prop: "customerPackUom", colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         // { type: "rangeDateTime", label: "时间窗口", prop: "timeRange", startDate: "beginTime", endDate: "endTime", colSpan: 24 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },

fe/PC/src/views/basicData/CustomerManage/Project.vue

@@ -153,7 +153,7 @@ export default {
       CreateForm: [
         { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "项目代码", prop: 'code', validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "项目名称", prop: 'name', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },
@@ -164,7 +164,7 @@ export default {
       editForm: [
         { type: "filterSelect", label: "客户代码", prop: "customerCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/customer")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.editFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物品选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "项目代码", prop: 'code', disabled:"true", colSpan: 12 },
         { type: "input", label: "项目名称", prop: 'name', colSpan: 12 },
         { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 },

fe/PC/src/views/basicData/DictionaryManage/Category.vue

@@ -124,13 +124,13 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "分类编号", prop: "code", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "分类代码", prop: "code", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "分类名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "分类编号", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "分类代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "分类名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },

fe/PC/src/views/basicData/ItemsManage/AQL.vue

@@ -186,9 +186,9 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
@@ -197,13 +197,13 @@ export default {
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.editFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'SupplierBasic', '供应商选择', this.editFormData) }, colSpan: 12 },
@@ -212,7 +212,7 @@ export default {
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
-        { type: "number", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
+        { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {

fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue

@@ -202,12 +202,12 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物料代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
-        { type: "input", label: "物料名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 },
-        { type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
+        { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
+        { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
-        { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
+        { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
@@ -216,30 +216,31 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
-        { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
+        { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
+        { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物料", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
-        { type: "input", label: "物料名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 },
-        { type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
+        { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
+        { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 },
-        { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
+        { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
@@ -248,20 +249,21 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
-        { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
+        { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
+        { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "E-LEVEL等级", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
+        { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", disabled: true, colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
         { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
         { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变更", prop: 'eco', colSpan: 12 },
-        { type: "select", label: "是否虚拟物料", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue

@@ -142,18 +142,18 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "分类编号", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "filterSelect", label: "分类代码", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/category")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物料分类选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/category', 'Category', '物品分类选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
-        { type: "input", label: "分类编号", prop: "categoryCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
+        { type: "input", label: "分类代码", prop: "categoryCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

fe/PC/src/views/basicData/ItemsManage/ItemPack.vue

@@ -151,20 +151,20 @@ export default {
         { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
         { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
-        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue

@@ -150,13 +150,13 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物料名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
+        { type: "filterSelect", label: "物品名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },
@@ -166,9 +166,9 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "input",label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "name", colSpan: 12,disabled:"true", },
-        { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "input",label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
+        { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },

fe/PC/src/views/basicData/SupplierManage/Supplier.vue

@@ -222,7 +222,7 @@ export default {
           label: "发货单列表",
           name: 'fhdlb',
           url: 'wms/store/arrive-notice',
-          tableColumns: 'ArriveNotice',
+          tableColumns: 'PurchaseReceiptRequest',
           functionName: 'bySupplierCode'
         },
         {

fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue

@@ -131,7 +131,8 @@ export default {
         supplierItemCode: null,
         version: null,
         supplierPackQty: 0,
-        supplierPackUom: '包装单位',
+        // supplierPackUom: '包装单位',
+        supplierPackUom: '',
         itemName: null,
         supplierCode: null,
         itemCode: null,
@@ -158,22 +159,25 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
+        { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
+        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "供应商代码", prop: "supplierCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },
-        { type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装计量单位", prop: "supplierPackUom", colSpan: 12 },
+        { type: "input", label: "供应商包装数量", prop: "supplierPackQty", validType:'number', colSpan: 12 },
         { type: "input", label: "版本", prop: "version", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

fe/PC/src/views/basicData/SupplierManage/SupplierTime.vue

@@ -151,10 +151,14 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier",
+            this.isFilter("code", this.CreateFormData.supplierCode)
+          )},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "当前时间", prop: "week", options: "week", colSpan: 12 },
+        
+        { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -162,10 +166,14 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
+        
         { type: "filterSelect", label: "供应商名称", prop: "supplierName", optionsLabel: "code", optionsValue: "name", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier",
+            this.isFilter("code", this.editFormData.supplierCode)
+          )},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 },
-        { type: "select", label: "当前时间", prop: "week", options: "week", colSpan: 12 },
+        
+        { type: "select", label: "当前星期", prop: "week", options: "week", colSpan: 12 },
         { type: "input", label: "时间窗口", prop: 'timeSlot', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -191,6 +199,18 @@ export default {
     this.paging();
   },
   methods: {
+    //过滤查询条件
+    isFilter (val, data) {
+      let filter = [
+        {
+          logic: "And",
+          column: val,
+          action: "==",
+          value: data
+        }
+      ]
+      return filter
+    },
     addNewDataPush (val) {
       if (this.theEvent == 'newly') {
         if (val[1].prop == 'supplierCode' || val[1].prop == 'supplierName') {

fe/PC/src/views/basicData/WarehouseManage/Dock.vue

@@ -132,7 +132,7 @@ export default {
         defaultLocationCode: null,
         description: null,
         name: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: null
       },
       //编辑
@@ -142,27 +142,29 @@ export default {
         defaultLocationCode: null,
         description: null,
         name: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: null
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "收货口代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "收货口编号", prop: "code", disabled:"true", colSpan: 12 },
-        { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "input", label: "收货口代码", prop: "code", disabled:"true", colSpan: 12 },
+        { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue

@@ -154,7 +154,7 @@ export default {
       //新增
       CreateFormData: {
         itemCode: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         maxStock: null,
@@ -170,7 +170,7 @@ export default {
       //编辑
       editFormData: {
         itemCode: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         maxStock: null,
@@ -185,11 +185,11 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url, this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
@@ -199,11 +199,13 @@ export default {
         { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
-        { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url, this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
@@ -213,6 +215,8 @@ export default {
         { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue

@@ -153,7 +153,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         enabled: true,
@@ -171,7 +171,7 @@ export default {
       editFormData: {
         itemCode: null,
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         storeRelationType: 1,
         storeValue: null,
         enabled: true,
@@ -186,10 +186,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
@@ -201,10 +201,12 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url , this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
-        { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
@@ -216,6 +218,8 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},
           searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url , this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
+        { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/WarehouseManage/Location.vue

@@ -133,7 +133,7 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         type: 1,
@@ -187,7 +187,7 @@ export default {
       //编辑
       editFormData: {
         remark: null,
-        warehouseCode: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
         type: 1,
@@ -237,20 +237,20 @@ export default {
         { type: "input", label: "名称", prop: "name", colSpan: 12 },
         // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
         // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "locationType", colSpan: 12 },
+        { type: "select", label: "库位类型", prop: "type", options: "locationType", colSpan: 12 },
         { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' },
         { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' },
         { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' },
         { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
-        { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
+        { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -260,12 +260,13 @@ export default {
         { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -277,6 +278,7 @@ export default {
         // { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "库位代码", prop: "code", disabled:"true", colSpan: 12 },
@@ -292,20 +294,20 @@ export default {
         { type: "input", label: "名称", prop: "name", colSpan: 12 },
         // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 },
         // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
+        { type: "select", label: "库位类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 },
         { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' },
         { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' },
         { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' },
         { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' },
         { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 },
-        { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 },
+        { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 },
         { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -313,10 +315,12 @@ export default {
         { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否拆箱", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode',  disabled:"true", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -328,6 +332,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
           rowCode:[{required: true, trigger: "change", message: "不可为空"}],
           columnCode:[{required: true, trigger: "change", message: "不可为空"}],
+          defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}],
         },
         editRule: {
           pickPriority: [{ required: true, trigger: "change", message: "不可为空" },],
@@ -337,6 +342,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
           rowCode:[{required: true, trigger: "change", message: "不可为空"}],
           columnCode:[{required: true, trigger: "change", message: "不可为空"}],
+          defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}],
         }
       },
       // 自定义详情明细汇总等table页

fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue

@@ -208,34 +208,34 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "库位组代码", prop: "code", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 },
-        { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
+        { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
+        { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
+        { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        // { type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
@@ -245,6 +245,7 @@ export default {
         // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
         // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editForm: [
         { type: "filterSelect", label: "区域代码", prop: "areaCode", optionsLabel: "name", optionsValue: "code", 
@@ -252,29 +253,30 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "库位组代码", prop: "code", disabled:"true", colSpan: 12 },
         { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 },
-        { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
+        { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 },
+        { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 },
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 },
-        { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
+        { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12  },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "input", label: "描述", prop: 'description', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -284,11 +286,13 @@ export default {
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
           pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
+          defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
           pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }],
+          defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         }
       },
     };

fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue

@@ -149,19 +149,19 @@ export default {
         type: []
       },
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物料代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },

fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue

@@ -171,8 +171,12 @@ export default {
           ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData,[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[
@@ -203,8 +207,12 @@ export default {
           ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, colSpan: 12 },
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group",[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ])},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData,[
+            {logic:"And",column:"groupType",action:"==",value:"2"},
+          ]) }, colSpan: 12 },
         
         { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[

fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue

@@ -151,7 +151,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
@@ -160,14 +160,14 @@ export default {
         { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 },
+        { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
@@ -176,10 +176,10 @@ export default {
         { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 },
-        { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 },
-        { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 },
-        { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 },
+        { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 },
+        { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 },
+        { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue

@@ -158,17 +158,17 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
         { type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
         { type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: 'itemCode', disabled: true, colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'itemCode', disabled: true, colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
         { type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
         { type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },

fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue

@@ -143,7 +143,7 @@ export default {
           label: "实际箱标签",
           prop: "handledPackingCode",
         },
-        { label: "物料代码", prop: "itemCode", },
+        { label: "物品代码", prop: "itemCode", },
         { type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "handledQty", showProp: "qty", },
         { type: "objectInput", label: "实际单位", prop: "handledQty", showProp: "uom", },
         { type: "object", label: "推荐数量", prop: "recomendQty", showProp: "qty", },
@@ -154,7 +154,7 @@ export default {
         { type: "objectDateTimeInput", label: "实际日期", prop: "handledBatch", showProp: "produceDate", },
         { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", },
         { type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品名称",  prop: "itemName" },
         { label: "包装数量", prop: "stdPackQty", },
         { label: "包装单位", prop: "stdPackUom", },
         { label: "备注", prop: 'remark', },

fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue

@@ -121,8 +121,8 @@ export default {
       //     label: "箱标签",
       //     prop: "handledPackingCode",
       //   },
-      //   { label: "物料代码", prop: "itemCode", },
-      //   { label: "物料名称",  prop: "itemName" },
+      //   { label: "物品代码", prop: "itemCode", },
+      //   { label: "物品名称",  prop: "itemName" },
       //   // { type: "objectInput", rules: detailsRules.detailsRules, label: "供应商批次", prop: "supplierBatch",},
       //   // { type: "objectDateTimeInput", rules: detailsRules.detailsRules, label: "生产日期", prop: "produceDate",},
       //   { type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
@@ -130,8 +130,8 @@ export default {
       //   { type: "input", rules: detailsRules.detailsRules, label: "实际库位", prop: "handledLocationCode", },
       //   { label: "推荐库位", prop: "recommendLocationCode", },
       //   // { label: "托标签", prop: "handledContainerCode", },
-      //   // { label: "物料名称1",  prop: "itemDesc1" },
-      //   // { label: "物料名称2",  prop: "itemDesc2" },
+      //   // { label: "物品名称1",  prop: "itemDesc1" },
+      //   // { label: "物品名称2",  prop: "itemDesc2" },
       //   { label: "包装单位", prop: "stdPackUom", },
       //   { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom", },
       //   { label: "订单号", prop: "poNumber", },

fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue

@@ -126,16 +126,16 @@ export default {
       ],
       handleDetailsTableColumns: [
         { label: "箱标签", prop: "packingCode", },
-        { label: "物料代码", prop: "itemCode", },
+        { label: "物品代码", prop: "itemCode", },
         { type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "countQty", showProp: "qty", },
         { type: "objectInput", label: "实际单位", prop: "countQty", showProp: "uom", },
         { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
         { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom", },
-        { type: "input", rules: detailsRules.detailsRules, label: "库位编号", prop: "locationCode", },
+        { type: "input", rules: detailsRules.detailsRules, label: "库位代码", prop: "locationCode", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", },
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { label: "供应商批次", prop: "supplierBatch", },
         { label: "备注", prop: 'remark', },
       ],

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue

@@ -147,13 +147,13 @@ export default {
         { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
         { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
         { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
-        { type: "input", label: "物料代码", prop: 'itemCode', colSpan: 12 },
+        { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
         { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "itemName", disabled:true, colSpan: 12 },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
+        { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 },
         { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 },
         { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 },
         { type: "input", label: "箱标签", prop: "packingCode", disabled:true, colSpan: 12 },

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue

@@ -168,7 +168,7 @@ export default {
         { type: "radio", label: "转移方式", prop: "queryType",radio:'queryTypeRadio', value: '1', colSpan: 9 },
         { type: "radio", label: "清除箱码", prop: "clearPackCode",radio:'radio', value: '2', colSpan: 5 },
         { type: "radio", label: "清除批次", prop: "clearLot",radio:'radio', value: '2', colSpan: 5 },
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "itemCode", optionsValue: "packingCode", 
@@ -185,8 +185,8 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, colSpan: 12 },
       ],
       myTableColumns:[
-        {label: "物料代码", prop: "itemCode", width:'180px'},
-        {label: "物料名称", prop: "itemName", width:'150px'},
+        {label: "物品代码", prop: "itemCode", width:'180px'},
+        {label: "物品名称", prop: "itemName", width:'150px'},
         {label: "来源库位", prop: "locationCode",},
         {label: "箱码", prop: "packingCode", width:'110px'},
         {label: "批次", prop: "lot", width:'110px'},

fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue

@@ -91,7 +91,7 @@ export default {
         {title:"预览信息"},
         {title:"打印"},
       ],
-      selectItemInfo:{},//已选物料信息
+      selectItemInfo:{},//已选物品信息
       // 筛选数据
       selectData:{
         itemCode:"",
@@ -104,18 +104,18 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
             {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"半成品"}
           ])},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,[
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
             {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"半成品"}
           ]) }, 
           colSpan: 12,
         },
-        { type: "input",disabled:true,label: "物料名称", prop: "itemName",  colSpan: 12 },
+        { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
         { type: "input",disabled:true,label: "标包数量", prop: "packQty",  colSpan: 12 },
         { type: "inputNumber", label: "实际数量", prop: "qty",colSpan: 12},
@@ -124,15 +124,15 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物料代码", prop: "itemCode", },
-        { width:"auto",label: "物料名称", prop: "itemName", },
+        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "标包数量", prop: "packQty", },
         { width:"auto",label: "标包单位", prop: "packUom", },
@@ -161,7 +161,7 @@ export default {
       this.$refs.steps_bcpsj.returnFirstActive()
       this.$refs.form_bcpsj.getDom().resetFields();
     },
-    // 第一部物料代码点击拉取
+    // 第一部物品代码点击拉取
     detailsDataPush (val) {
       if(val[1].prop == "itemCode"){
         this.pageLoading = true

fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue

@@ -107,8 +107,8 @@ export default {
         {title:"预览信息",cancle:()=>{return _this.sencondPre()}},
         {title:"打印"},
       ],
-      selectItemInfo:{},//已选物料信息
-      selectSupplierInfo:{},//已选物料信息对应的供应商信息
+      selectItemInfo:{},//已选物品信息
+      selectSupplierInfo:{},//已选物品信息对应的供应商信息
       // 默认筛选数据
       defaultSelectData:{
         itemCode:"",
@@ -130,16 +130,16 @@ export default {
       // 筛选条件
       selectForm:[
         { 
-          type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+          type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", 
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件
           )},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}]  //原回收料的条件
           )}, 
           colSpan: 12,
         },
-        { type: "input",disabled:true,label: "物料名称", prop: "itemName",  colSpan: 12 },
+        { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
         { type: "select", disabled:true,label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
         { type: "select", disabled:true,label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
@@ -149,7 +149,7 @@ export default {
         { type: "input",  label: "批次", prop: "lot", colSpan: 12 },
         { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
             this.isFilter("itemCode", this.selectData.itemCode)
@@ -160,15 +160,15 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" },],
+        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
         // lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
       },
       // 表格头部信息
       flexTableColumns:[
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称", prop: "itemName", },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称", prop: "itemName", },
         { label: "批次", prop: "lot", },
         // { width:"auto",label: "标包数量", prop: "packQty", },
         // { width:"auto",label: "标包单位", prop: "packUom", },
@@ -206,9 +206,9 @@ export default {
       this.$refs.steps_create.returnFirstActive()
       this.$refs.form_create.getDom().resetFields();
     },
-    // 第一部物料代码点击拉取
+    // 第一部物品代码点击拉取
     detailsDataPush (val) {
-      // 点击物料
+      // 点击物品
       if(val[1].prop == "itemCode"){
         this.canForm.canType = null
         this.selectItemInfo = val[0];

fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

@@ -92,7 +92,7 @@ export default {
         {title:"预览信息"},
         {title:"打印"},
       ],
-      selectItemInfo:{},//已选物料信息
+      selectItemInfo:{},//已选物品信息
       // 筛选数据
       selectData:{
         itemCode:"",
@@ -107,20 +107,20 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ])},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料代码', this.selectData,[
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ]) }, 
           colSpan: 12,
         },
-        { type: "input",disabled:true,label: "物料名称", prop: "itemName",  colSpan: 12 },
+        { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
             this.isFilter("itemCode", this.selectData.itemCode)
@@ -129,7 +129,7 @@ export default {
         },
         { 
           type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物料代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
           colSpan: 12,
         },
@@ -140,7 +140,7 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物料代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
         supplierCode: [{ required: true, trigger: "change", message: "供应商代码不能为空" }],
         poNumber: [{ required: true, trigger: "change", message: "采购订单号不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
@@ -149,8 +149,8 @@ export default {
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物料代码", prop: "itemCode", },
-        { width:"auto",label: "物料名称", prop: "itemName", },
+        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "订单号", prop: "poNumber", },
         { width:"auto",label: "供应商代码", prop: "supplierCode", },
@@ -218,7 +218,7 @@ export default {
         this.selectData.poNumberInfo = val[0]
       }
     },
-    // 第一部物料代码点击拉取
+    // 第一部物品代码点击拉取
     filterClearHandle(val){
       if(val[0].prop == "itemCode"){
         this.selectData.supplierCode = ""

fe/PC/src/views/labelManage/RepairLabels.vue

@@ -128,7 +128,7 @@ export default {
       flexTableData:[],
       // 箱码表格头部信息
       flexTableColumns:[
-        { label: "物料代码", prop: "itemCode", width:"auto" },
+        { label: "物品代码", prop: "itemCode", width:"auto" },
         { label: "物品名称", prop: "itemName", width:"auto" },
         { label: "箱标签", prop: "packingCode", width:"auto" },
         { label: "数量", prop: "qty", width:"auto" },

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue

@@ -118,8 +118,8 @@ export default {
         // },
       ],
       handleDetailsTableColumns: [
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { label: "实际库位", prop: "handledLocationCode", },
         { label: "推荐库位", prop: "recommendLocationCode", },
         { label: "实际箱标签", prop: "handledPackingCode", },
@@ -266,7 +266,7 @@ export default {
           reject()
         } else {
           if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物料发到目标库位?', '提示', {
+            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -276,7 +276,7 @@ export default {
               reject()
             })
           } else {
-            that.$confirm('是否要将物料发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
+            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -386,7 +386,7 @@ export default {
             }
             getPageList(params, 'basedata/item-basic').then(res => {
               if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物料信息!')
+                this.$errorMsg('未查询到该物品信息!')
               } else {
                 let findRs = that.CreateFormData.details.find(item => (
                   item.code == that.CreateFormData.itemCode
@@ -419,7 +419,7 @@ export default {
               }
               for (var i = 0; i < this.CreateFormData.details.length; i++) {
                 if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物料[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
+                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
                   return
                 } else {
                   params.details.push({

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

@@ -118,8 +118,8 @@ export default {
         },
       ],
       handleDetailsTableColumns: [
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { label: "实际库位", prop: "handledLocationCode", },
         { label: "推荐库位", prop: "recommendLocationCode", },
         { label: "实际箱标签", prop: "handledPackingCode", },
@@ -267,7 +267,7 @@ export default {
           reject()
         } else {
           if (that.handleMultipleSelection[0].requestLocationCode != that.handleFormData.toLocationCode) {
-            that.$confirm('目标库位与需求库位不一致,是否要将所有物料发到目标库位?', '提示', {
+            that.$confirm('目标库位与需求库位不一致,是否要将所有物品发到目标库位?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -277,7 +277,7 @@ export default {
               reject()
             })
           } else {
-            that.$confirm('是否要将物料发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
+            that.$confirm('是否要将物品发到目标库位:[' + that.handleFormData.toLocationCode + ']', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
@@ -387,7 +387,7 @@ export default {
             }
             getPageList(params, 'basedata/item-basic').then(res => {
               if (res.items.length == 0) {
-                this.$errorMsg('未查询到该物料信息!')
+                this.$errorMsg('未查询到该物品信息!')
               } else {
                 let findRs = that.CreateFormData.details.find(item => (
                   item.code == that.CreateFormData.itemCode
@@ -420,7 +420,7 @@ export default {
               }
               for (var i = 0; i < this.CreateFormData.details.length; i++) {
                 if (this.CreateFormData.details[i].numberDetails <= 0) {
-                  this.$errorMsg('物料[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
+                  this.$errorMsg('物品[' + this.CreateFormData.details[i].code + ']的数量应该大于0')
                   return
                 } else {
                   params.details.push({

fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue

@@ -162,7 +162,7 @@ export default {
   data () {
     let _this = this
     return {
-      URL: 'wms/job/purchase-receipt-job',
+      URL: 'wms/store/purchase-receipt-job',
       handleMultipleSelection: [],
       uploadDialogShow: false,
       uploadLoading:false,//上传图片Loading
@@ -196,7 +196,7 @@ export default {
         formFile: [],
       },
       uploadDialogForm: [
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12, },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12, },
         { type: "objectSelect", label: "不合格原因", prop: "item", showProp: "failedReason", options: "purchaseReceiptFailedReason", colSpan: 12,  },
         { type: "objectTextarea", label: "质量缺陷", prop: "item", showProp: "massDefect"},
         { type: "uploadPictureCard", label: "上传图片", prop: "formFile", limit: 3, picExt:'.jpg,.png', multiple:true}
@@ -251,8 +251,8 @@ export default {
         // }
       ],
       handleDetailsTableColumns: [
-        { label: "物料代码", prop: "itemCode" ,fixed:"left",width:"auto"},
-        { label: "物料名称", prop: "itemName",width:"auto"},
+        { label: "物品代码", prop: "itemCode" ,fixed:"left",width:"auto"},
+        { label: "物品名称", prop: "itemName",width:"auto"},
         { label: "箱标签", prop: "recommendPackingCode",width:"auto"},
         { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty",width:"auto"},
         { type: "object", label: "单据数量", prop: "recommendQty", showProp: "qty" ,width:"auto"},

fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue → fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue

@@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins";
 import { mixins } from "@/mixins/mixins";
 import {initPrintPackingCodeManyData } from "@/mixins/printMixin"
 export default {
-  name: "ArriveNotice",
+  name: "PurchaseReceiptRequest",
   mixins: [
     tableMixins,
     LoadingMixins,
@@ -83,7 +83,7 @@ export default {
   },
   data() {
     return {
-      URL: "wms/store/arrive-notice",
+      URL: "wms/store/purchase-receipt-request",
       DrawerButtonData: [
         {
           type: 'info',
@@ -96,6 +96,7 @@ export default {
       ],
       //常用按钮数据
       currenButtonData: [
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选

fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue

@@ -27,7 +27,7 @@
     </tablePagination>
     <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
     <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
-    <!-- <importFile
+    <importFile
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
@@ -37,15 +37,7 @@
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
       @postImportDown="importDown"
-    ></importFile> -->
-    <!-- 表格导入 -->
-    <upload-excel-component 
-      :DrawerLoading="Loading.DrawerLoading"
-      :before-upload="beforeUpload"
-      :show="displayDialog.importDialog"
-      @postImportDown="importDown()"
-      @submitForm="uploadSubmitForm"
-    />
+    ></importFile>
     <!-- 抽屉 -->
     <curren-Drawer
       :title="tableColumns"
@@ -69,17 +61,11 @@
   </div>
 </template>
 <script>
-import { supplierAsnCreateMany } 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 UploadExcelComponent from '@/components/UploadExcel/index.vue'
-import { supplierAsnExcel } from "@/filters/excelOrReportsOption";
-import {SupplierAsnCtypeStaBack} from "@/filters/status"
-import { formatTimeToT,formatTimeStampToNorm } from "@/utils/formatTime"
-import store  from '@/store'
 export default {
   name: "SupplierAsn",
   mixins: [
@@ -89,7 +75,6 @@ export default {
     TableHeaderMixins,
     mixins,
   ],
-  components: { UploadExcelComponent },
   computed: {
     editDialog: {
       get: function () {
@@ -100,10 +85,10 @@ export default {
   data () {
     return {
       URL: 'wms/store/supplier-asn',
-      // importUploadURL:"wms/store/supplier-asn/newImport",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
+        this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
@@ -113,139 +98,6 @@ export default {
   mounted () {
     this.paging();
   },
-  methods: {
-    // 创建外部主表数据
-    build(data,str){
-      
-      return {
-        str:str,//用于对比数据
-        details:[],
-        supplierCode:data[supplierAsnExcel.supplierCode],
-        planUserCode:data[supplierAsnExcel.planUserCode],
-        contactUserName:data[supplierAsnExcel.planUserCode],
-        planArriveDate:formatTimeStampToNorm(data[supplierAsnExcel.planArriveDate],'datetime'),
-        shipDate:formatTimeStampToNorm(data[supplierAsnExcel.shipDate],'datetime'),
-        remark:data[supplierAsnExcel.remark],
-        // 接口需要默认配置项：
-        company:localStorage.getItem("company"),
-        warehouseCode:localStorage.getItem("warehouseCode"),//仓库
-        dockCode:"FWDY",//收货口
-        rpNumber:"123456",//要货计划单号
-        timeWindow:"00:00-24:00",//时间窗口
-      }
-    },
-    // 创建详情detail数据
-    builddDeails(data,item){
-      data.details.push({
-        ctype:SupplierAsnCtypeStaBack(item[supplierAsnExcel.details.ctype]) || null,
-        projectCode:item[supplierAsnExcel.details.projectCode] || null,
-        itemCode:item[supplierAsnExcel.details.itemCode] || null,
-        uom:item[supplierAsnExcel.details.uom] || null,
-        qty:item[supplierAsnExcel.details.qty] || null,
-        recommendErpCode:item[supplierAsnExcel.details.recommendErpCode] || null,
-        lot:item[supplierAsnExcel.details.lot] || null,
-        supplierBatch:item[supplierAsnExcel.details.lot] ? item[supplierAsnExcel.details.lot].replaceAll('-','') : '',
-        produceDate:formatTimeStampToNorm(item[supplierAsnExcel.details.produceDate],'datetime'),
-        expireDate:formatTimeStampToNorm(item[supplierAsnExcel.details.expireDate],'datetime'),
-        packingCode:item['明细-箱标签'] || null,
-        // 默认配置项：
-        warehouseCode:localStorage.getItem("warehouseCode"),//仓库
-      })
-    },
-    uploadSubmitForm(index,data){
-      // 确定
-      if(index == '1'){
-        let _result = data.results;
-        let _data = [];
-        // 查询物料代码是否重复
-        // let _itemArr = [];
-        // let _hasSame = false
-        // data.results.forEach(item=>{
-        //   if(_itemArr.indexOf(item[supplierAsnExcel.details.itemCode]) >= 0){
-        //     _hasSame = true
-        //   }else{
-        //     _itemArr.push(item[supplierAsnExcel.details.itemCode])
-        //   }
-        // })
-        // if(_hasSame){
-        //   this.$message.error("模板中存在相同物料代码，请修改模板重新导入")
-        //   return 
-        // }
-        // 查重重组
-        for(let i=0;i<_result.length;i++){
-          let _itemStr = ""
-          // _itemStr =(_result[i][supplierAsnExcel.poNumber] || '') + (_result[i][supplierAsnExcel.number] || '')
-          let entity=this.build(_result[i],_itemStr);
-    
-         if(_data.find(e => e.str == _itemStr)){
-          continue;
-         }
-         _result.forEach((element,key) => {
-            // let temp =(element[supplierAsnExcel.poNumber] || '') + (element[supplierAsnExcel.number] || '')
-            let temp = ""
-            if(temp==_itemStr){
-              this.builddDeails(entity,element);
-            }
-          });
-          _data.push(entity);
-        }
-        // 提交数据处理
-        _data.forEach(item=>{
-          item.createType = 1
-          item.planArriveDate = formatTimeToT(item.planArriveDate)
-          item.shipDate = formatTimeToT(item.shipDate)
-          item.details.forEach(item_d=>{
-            item_d.produceDate = formatTimeToT(item_d.produceDate)
-            item_d.expireDate = formatTimeToT(item_d.expireDate)
-            item_d.itemName = ""
-          })
-          item.worker = store.getters.name.userName;
-          return delete item.str
-        })
-        this.Loading.appMainLoading = true
-        supplierAsnCreateMany(_data)
-          .then((response) => {
-            this.$message.success("创建成功！")
-            this.Loading.appMainLoading = false
-            this.displayDialog.importDialog = false;
-            this.paging();
-          })
-          .catch(()=>{
-            this.Loading.appMainLoading = false
-            this.$message.error("创建失败，请重试。")
-          })
-      }
-      // 取消
-      else{
-        if(!data.results || data.results.length <= 0){
-          this.displayDialog.importDialog = false;
-          return;
-        }
-        this.$confirm('您还未提交, 是否取消?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.displayDialog.importDialog = false;
-        }).catch(() => {
-          document.getElementsByClassName("v-modal")[0].style.display = "none"
-        });
-      }
-    },
-    beforeUpload(file) {
-      // const isLt1M = file.size / 1024 / 1024 < 1
-      // if (isLt1M) {
-      //   return true
-      // }
-      // this.$message({
-      //   message: 'Please do not upload files larger than 1m in size.',
-      //   type: 'warning'
-      // })
-      // return false
-      return true
-    }
-
-  },
 };
 </script>
 <style lang="scss" scoped>

fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue

@@ -129,8 +129,8 @@ export default {
           label: "箱标签",
           prop: "handledPackingCode",
         },
-        { label: "物料代码", prop: "itemCode", },
-        { label: "物料名称",  prop: "itemName" },
+        { label: "物品代码", prop: "itemCode", },
+        { label: "物品名称",  prop: "itemName" },
         { type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
         { label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "实际库位", prop: "handledLocationCode", },

fe/PC/src/views/rawMaterialManage/quality/InspectNotice.vue

@@ -337,8 +337,8 @@ export default {
         }],
       },
       inspectForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 12  },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12  },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
         { type: "input", label: "箱码", prop: "packingCode", disabled: true, colSpan: 12 },
         { type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },
         { type: "input", label: "尺寸", prop: "volume", colSpan: 12  },
@@ -385,8 +385,8 @@ export default {
       //   }]
       // },
       // supplierForm: [
-      //   { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 12  },
-      //   { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 12  },
+      //   { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+      //   { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
       //   { type: "input", label: "描述", prop: "lot", disabled: true, colSpan: 12 },
       //   { type: "input", label: "外观", prop: "jysl", disabled: true, colSpan: 12  },
       //   { type: "input", label: "尺寸", prop: "jysl", disabled: true, colSpan: 12  },
@@ -450,8 +450,8 @@ export default {
       },
       // 质检详情页面-form字段
       inspectNoticeDetailsForm: [
-        { type: "input", label: "物料代码", prop: "itemCode", disabled: true, colSpan: 8  },
-        { type: "input", label: "物料名称", prop: "itemName", disabled: true, colSpan: 8  },
+        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 8  },
+        { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 8  },
         { type: "input", label: "单位", prop: "stdPackUom", disabled: true,  colSpan: 8  },
         // { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true,  colSpan: 8  },
         { type: "input", label: "生产批次", prop: "lot", disabled: true, colSpan: 8 },
@@ -473,8 +473,8 @@ export default {
       ],
       inspectNoticeDetailsTableColumns: [
         { label: "箱码", prop: "packingCode", width:'100%' },
-        { label: "物料代码", prop: "itemCode", width:'100%'  },
-        { label: "物料名称", prop: "itemName", width:'100%' },
+        { label: "物品代码", prop: "itemCode", width:'100%'  },
+        { label: "物品名称", prop: "itemName", width:'100%' },
         { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
         { label: "状态", prop: "detailInspectStatus", type: "filter", filters: "detailInspectStatus", width:'100%' },
@@ -654,8 +654,8 @@ export default {
                   }
                 }
                 if (this.inspectNoticeDetailsFormData.sampleQty == 0) {
-                  this.$alert('没有找到当前物料代码对应的质检标准！')
-                //   this.$confirm('没有找到当前物料代码对应的质检标准！, 是否继续?', '提示', {
+                  this.$alert('没有找到当前物品代码对应的质检标准！')
+                //   this.$confirm('没有找到当前物品代码对应的质检标准！, 是否继续?', '提示', {
                 //   confirmButtonText: '继续',
                 //   cancelButtonText: '取消',
                 //   type: 'warning'