修改相关bug

fe/PC/src/filters/options.js

@@ -37,7 +37,7 @@ export function Roles(val){
     "CustomerBom": "用户清单",
     "InventoryRoute": "库存路径",
     "TransactionType": "交易类型",
-    "ProdLineItem": "产品类项目",
+    "ProductionLineItem": "产品类项目",
     "Machine": "生产线",
     "Param": "参数",
     "PurchasePriceSheet": "采购价格表",
@@ -150,7 +150,7 @@ export function Roles(val){
     // "Configuration": "配置",
     // "ItemQuality": "物品质量信息",
     // "AQL": "物品质检标准",
-    // "SupplierTime": "供应商时间窗口",
+    // "SupplierTimeWindow": "供应商时间窗口",
     // "ItemStoreRelation": "库位零件关系维护",
     // "CustomerAddress": "客户地址",
     /**/

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

@@ -87,7 +87,7 @@ export const ItemCategory = [
   { label: "备注", prop: "remark" },
   // --------------------------------
   { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" },
-  
+
   // {
   //   label: "操作",
   //   type:"buttonOperation", 
@@ -392,7 +392,7 @@ export const SupplierItem = [
   // },
 ]
 // 供应商时间窗口 20230328
-export const SupplierTime = [
+export const SupplierTimeWindow = [
   {
     label: "供应商代码",
     prop: 'supplierCode',
@@ -746,7 +746,7 @@ export const ProductionLine = [
   // },
 ]
 // 生产线零件关系 20230328
-export const ProdLineItem = [
+export const ProductionLineItem = [
   { label: "物料代码", prop: "itemCode", type: "name" },
   { label: "生产线编号", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },

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

@@ -284,7 +284,7 @@ export const SupplierItem =  [
   // -----------------------------------------------------------------------
 ]
 // 供应商时间窗口 20230328
-export const SupplierTime =  [
+export const SupplierTimeWindow =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商名称", prop: 'supplierName' },
   { label: "时间窗口", prop: "timeSlot" },
@@ -600,7 +600,7 @@ export const ProductionLine =  [
   // -----------------------------------------------------------------------
 ]
 // 生产线零件关系 20230328
-export const ProdLineItem =  [
+export const ProductionLineItem =  [
   { label: "物料代码", prop: "itemCode" },
   { label: "生产线编号", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },

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

@@ -122,6 +122,7 @@ export default {
         type: 0,
         code: null,
         company: null,
+        shortName: null,
       },
       //编辑
       editFormData: {
@@ -139,11 +140,13 @@ export default {
         isActive: true,
         type: 0,
         concurrencyStamp: null,
+        shortName: null,
       },
       editOptions: {},
       CreateForm: [
         { type: "input", label: "客户代码", prop: "code", colSpan: 12 },
         { type: "input", label: "客户名称", prop: 'name', colSpan: 12 },
+        { type: "input", label: "客户简称", prop: 'shortName', colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "customerType", colSpan: 12 },
         { type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
         { type: "input", label: "国家", prop: "country", colSpan: 12 },
@@ -159,6 +162,7 @@ export default {
       editForm: [
         { type: "input", label: "客户代码", prop: "code",disabled:"true", colSpan: 12 },
         { type: "input", label: "客户名称", prop: 'name', colSpan: 12 },
+        { type: "input", label: "客户简称", prop: 'shortName', colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "customerType", colSpan: 12 },
         { type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
         { type: "input", label: "国家", prop: "country", colSpan: 12 },

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

@@ -154,7 +154,7 @@ export default {
         { 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: "input", label: "项目代码", prop: 'code', 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 },
         { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 },

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

@@ -215,7 +215,7 @@ export default {
           label: "供应商时间窗口",
           name: 'gyssjck',
           url: 'basedata/supplier-time',
-          tableColumns: 'SupplierTime',
+          tableColumns: 'SupplierTimeWindow',
           functionName: 'bySupplierCode'
         },
         {

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

@@ -97,7 +97,7 @@ import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 export default {
-  name: "SupplierTime",
+  name: "SupplierTimeWindow",
   mixins: [
     tableMixins,
     LoadingMixins,

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

@@ -98,7 +98,7 @@ import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 
 export default {
-  name: "ProdLineItem",
+  name: "ProductionLineItem",
   mixins: [
     tableMixins,
     LoadingMixins,