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

be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/AuthWebModule.cs

@@ -1,10 +1,13 @@
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Authentication.JwtBearer;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
 using Volo.Abp.Identity.Web;
@@ -61,6 +64,7 @@ public class AuthWebModule : ModuleBase<AuthWebModule>
         base.ConfigureBundles();
     }
 
+
     public override void OnApplicationInitialization(ApplicationInitializationContext context)
     {
         CreateDatabase<AuthDbContext>(context);

be/Hosts/Auth.Host/src/Win_in.Sfs.Auth.Web/Win_in.Sfs.Auth.Web.csproj

@@ -62,6 +62,6 @@
   </Target>-->
 
 
-  <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties /></VisualStudio></ProjectExtensions>
 
 </Project>

build/src/docker/publish/settings/appsettings.Development.json

@@ -1,5 +1,5 @@
 {
-  "AlwaysAllowAuthorization": "True",
+  "AlwaysAllowAuthorization": "False",
   "App": {
     "CorsOrigins": [
       "http://localhost:59080",

fe/PC/README.md

@@ -107,8 +107,19 @@ active          步骤控制
 pageStatus      结合active控制返回结果
 
 [字段设置：rowDrop]
-
 @radio="rowDrop"                数据更新方法
 :tableColumns="tableColumns"    表头数据
 :visible="visible"              是否显示
-@closeRowDrop="closeRowDrop"    关闭方法
+@closeRowDrop="closeRowDrop"    关闭方法
+
+[表单组件补充:currenForm]
+validType           type仅等于input时：实时keyUp校验，类型如下：
+                    1、 number:正整数, 
+                    2、 pointNumber:数字+带小数点(只能输入一个小数点, 小数点后方保留位数见<pointNumberFixed>), 
+                    3、 numberLetter: 数字+字母, 
+                    4、 letter:纯字母, 
+                    5、 letterCn:字母+中文
+pointNumberFixed    组合上方validType值仅等于pointNumber时：
+                    小数点后方保留位数,如不填写默认为100位
+<validType>+<pointNumberFixed>示例：
+{ type:"input", label:"金额", prop:"money", validType:'pointNumber',pointNumberFixed:2},

fe/PC/public/config.js

@@ -19,8 +19,8 @@
 // window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/'
 
 // localhost
-window.SITE_CONFIG['base'] = 'http://localhost:59095'
-window.SITE_CONFIG['user'] = 'http://localhost:59093/api'
+window.SITE_CONFIG['base'] = 'http://localhost:21093'
+window.SITE_CONFIG['user'] = 'http://localhost:21093/api/auth'
 window.SITE_CONFIG['print'] = 'print'
 window.SITE_CONFIG['largeScreen'] = 'http://localhost:59082'
 window.SITE_CONFIG['warehouseCode'] = 'T8'

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

@@ -81,6 +81,7 @@ export function postExport(data, url, special) {
     url: _url,
     method: 'post',
     data,
+    responseType: 'blob'
   })
 }
 //导出(详情内)-获取文件 blobName | 盘点计划
@@ -96,6 +97,7 @@ export function postExportForDetail(data, url,params) {
     method: 'post',
     data,
     params: params,
+    responseType: 'blob'
   })
 }
 //导出-文件
@@ -120,6 +122,9 @@ export function postImport(data, url,isSpecial) {
   return request({
     url: baseURL + _url,
     method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data;'
+    },
     data
   })
 }

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

@@ -23,11 +23,12 @@
             v-if="!hide ? true : false"
           >
             <!-- 输入框 onkeyup: 正则表达式，用于前端输入校验工作-->
+              <!-- :onkeyup="item.onkeyup" -->
             <el-input
               v-if="item.type === 'input'"
               v-model="searchData[item.prop]"
               :maxlength="item.maxlength"
-              :onkeyup="item.onkeyup"
+              :onkeyup="itemOnKeyUp(item,searchData[item.prop])"
               clearable
               :disabled="Boolean(item.disabled)"
               :placeholder="item.placeholder || '请输入' + item.label"
@@ -422,6 +423,7 @@ import currenUpload from "@/components/currenUpload";
 import currenUploadList from "@/components/currenUploadList";
 import currenUploadPictureCard from "@/components/currenUploadPictureCard";
 import filterSelect from "@/components/filterSelect"
+import { getMatchRegConformValue } from "@/utils/index"
 export default {
   name: "currenForm",
   components: {
@@ -574,6 +576,16 @@ export default {
     })
   },
   methods: {
+    // type=input情况下，框实时校验
+    itemOnKeyUp(item,value){
+      if(item.onkeyup){
+        return item.onkeyup()
+      }else{
+        if(value && item.validType){
+          this.searchData[item.prop]=getMatchRegConformValue(item.validType,value,item.pointNumberFixed)
+        }
+      }
+    },
     // 数字类型input框onkeyup最大最小值处理
     typeNumberOnkeyup(item,value){
       if(value){

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

@@ -36,6 +36,7 @@
         <el-form>
         <el-form-item
           v-if="item.type == 'input'"
+          :onkeyup="itemOnKeyUp(item,searchData[item.prop])"
           :prop="'details.' + scope.$index + '.' + item.prop"
           :rules="item.rules"
         >
@@ -307,6 +308,7 @@
 <script>
 import Sortable from "sortablejs";
 import { parseTime, debounce } from "@/utils/index";
+import { getMatchRegConformValue } from "@/utils/index"
 import _ from "lodash";
 export default {
   name: "currenTable",
@@ -434,6 +436,16 @@ export default {
     // })
   },
   methods: {
+    // type=input情况下，框实时校验
+    itemOnKeyUp(item,value){
+      if(item.onkeyup){
+        return item.onkeyup()
+      }else{
+        if(value && item.validType){
+          this.searchData[item.prop]=getMatchRegConformValue(item.validType,value,item.pointNumberFixed)
+        }
+      }
+    },
     // 数字类型input框onkeyup最大最小值处理
     typeNumberOnkeyup(item,value){
       if(value){

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

@@ -24,6 +24,7 @@
       @push="DataPush(arguments)"
       @submitForm="FormClick(arguments)"
       @radioChange="radioChange"
+      @changeSelect="changeSelect"
     >
     <template v-if="showmyTable">
       <el-form-item class="formTable-box" prop="details">
@@ -219,6 +220,10 @@ export default {
     //点击selection框
     handleSelectionChange(val) {
       this.$emit("handleSelectionChange", val);
+    },
+    // form表单下拉框change事件
+    changeSelect(prop,val ) {
+      this.$emit("changeSelect", prop, val)
     }
   }
 }

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

@@ -47,6 +47,7 @@
                     placeholder="请选择筛选对象"
                     :disabled="item.hide"
                     :filterable="true"
+                    @change="resetSelect(item)"
                   >
                     <el-option
                       v-for="(item, index) in tableColumnsOptions(tableColumns)"
@@ -71,8 +72,9 @@
                     placeholder="请选择条件"
                     :disabled="item.column == '' || item.hide ? true : false"
                   >
+                  <!-- moreListOptions.action -->
                     <el-option
-                      v-for="item in moreListOptions.action"
+                      v-for="item in formatMoreListOptions(item.column) "
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -109,6 +111,16 @@
                     >
                     </el-option>
                   </el-select>
+                  <!-- 日期时间 -->
+                  <el-date-picker
+                  v-else-if="getColumnType(item.column) == 'dateTime'"
+                    type="datetime"
+                    v-model="item.value"
+                    :placeholder="'选择日期时间'"
+                    style="width: 100%"
+                    format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-ddTHH:mm:ss"
+                  ></el-date-picker>
                   <el-input
                     v-else
                     v-model="item.value"
@@ -389,6 +401,45 @@ export default {
       })
       return data
     },
+    // 判断筛选类型是否是时间格式
+    getColumnType(val) {
+      var columnsType = this.tableColumns.filter(item => item.prop == val)
+      if (columnsType.length > 0) {
+        if (columnsType[0].type) {
+          return columnsType[0].type
+        } 
+      }  else {
+        return ''
+      }
+    },
+    // 筛选条件改变重置其他项
+    resetSelect(val) {
+      val.action = "=="
+      val.value = ""
+    },
+    // 根据数据内容约束条件选项
+    formatMoreListOptions(val) {
+      if (val) {
+        for(var i =0; i< this.tableColumns.length; i++) {
+          if (val == this.tableColumns[i].prop) {
+            if (this.tableColumns[i].filters) {
+              return this.moreListOptions.action.filter(item => item.value == '==' || item.value == '!=')
+            } else if (this.tableColumns[i].type == 'dateTime') {
+              return this.moreListOptions.action.filter(item => 
+                item.value == '==' || 
+                item.value == '!=' ||
+                item.value == '>' ||
+                item.value == '<' ||
+                item.value == '>=' ||
+                item.value == '<=' )
+            } else {
+              return this.moreListOptions.action
+            }
+          }
+        }
+      }
+      return this.moreListOptions.action
+    },
     // 设置moreList列表的内容项是input还是select
     inputOrSelect(val) {
       let data

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

@@ -41,6 +41,7 @@
         <el-form>
         <el-form-item
           v-if="item.type == 'input'"
+          :onkeyup="itemOnKeyUp(item,searchData[item.prop])"
           :prop="'details.' + scope.$index + '.' + item.prop"
           :rules="item.rules"
         >
@@ -321,6 +322,7 @@
 <script>
 import { parseTime } from "@/utils/index";
 import _ from "lodash";
+import { getMatchRegConformValue } from "@/utils/index"
 export default {
   name: "currenTable",
   filters: {
@@ -493,6 +495,16 @@ export default {
       }
       return _re
     },
+    // type=input情况下，框实时校验
+    itemOnKeyUp(item,value){
+      if(item.onkeyup){
+        return item.onkeyup()
+      }else{
+        if(value && item.validType){
+          this.searchData[item.prop]=getMatchRegConformValue(item.validType,value,item.pointNumberFixed)
+        }
+      }
+    },
     // 数字类型input框onkeyup最大最小值处理
     typeNumberOnkeyup(item,value){
       if(value){

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/filters/status.js

@@ -1184,7 +1184,10 @@ export function nextAction(index, prop) {
  */
 export function customerType(index, prop) {
   let type = {
-    
+    1: {
+      label: "正常用户",
+      value: 1
+    },
   }
   return Enum(type, index, prop)
 }

fe/PC/src/mixins/TableHeaderMixins.js

@@ -59,7 +59,7 @@ export const TableHeaderMixins = {
       // } 
       // 导出
       else if (val == 'export') {
-        const name = this.$route.meta.title
+        const name = this.$route.meta.title 
         this.$confirm('您将进行导出操作, 是否继续?', '提示', {
           confirmButtonText: '本页导出',
           cancelButtonText: '全部导出',
@@ -76,14 +76,8 @@ export const TableHeaderMixins = {
           this.PageListParams.route =  item.url ? item.url : this.URL + '/export';
           let _exportUrl = item.url ? item.url : this.URL;
           let _special = (item.url && item.url.length > 0) ? true : false
-          postExport(this.PageListParams,_exportUrl,_special).then(res => {
-            fileStorage({blobName: res.blobName}).then( fileStorageRes => {
-              // this.downloadFile(fileStorageRes.bytes, name)//使用前端导出名称
-              this.downloadFile(fileStorageRes.bytes, fileStorageRes.fileName)//使用后端导出名称
-            }).catch( err => {
-              console.log(err)
-            })
-            
+          postExport(this.PageListParams, _exportUrl, _special).then(res => {
+            this.blob(res, name)//使用前端导出名称
             this.Loading.appMainLoading = false
           }).catch(err => {
             this.Loading.appMainLoading = false
@@ -99,11 +93,7 @@ export const TableHeaderMixins = {
             params.route = this.URL + '/export'
             params.function = name
             postExport(params, this.URL).then(res => {
-              fileStorage({blobName: res.blobName}).then( fileStorageRes => {
-                this.downloadFile(fileStorageRes.bytes, fileStorageRes.fileName)
-              }).catch( err => {
-                console.log(err)
-              })
+              this.blob(res, name)//使用前端导出名称
               this.Loading.appMainLoading = false
             }).catch(err => {
               this.Loading.appMainLoading = false

fe/PC/src/mixins/drawerMixins.js

@@ -290,11 +290,12 @@ export const drawerMixins = {
       PageListParams.function = that.$route.meta.title
       PageListParams.route = url;
       postExportForDetail(PageListParams,url,params).then(res => {
-        fileStorage({blobName: res.blobName}).then( fileStorageRes => {
-          that.downloadFile(fileStorageRes.bytes, fileStorageRes.fileName)
-        }).catch( err => {
-          console.log(err)
-        })
+        this.blob(res, this.$route.meta.title )//使用前端导出名称
+        // fileStorage({blobName: res.blobName}).then( fileStorageRes => {
+        //   that.downloadFile(fileStorageRes.bytes, fileStorageRes.fileName)
+        // }).catch( err => {
+        //   console.log(err)
+        // })
         that.Loading.appMainLoading = false
       }).catch(err => {
         that.Loading.appMainLoading = false

fe/PC/src/mixins/mixins.js

@@ -227,7 +227,7 @@ export const mixins = {
     //导出存储-新
     blob(res, fileName) {
       let blob = new Blob([res], {
-        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
       })
       const href = URL.createObjectURL(blob) //创建新的URL表示指定的blob对象
       const a = document.createElement('a') //创建a标签
@@ -259,7 +259,6 @@ export const mixins = {
             //   fd.append("method", val[1].method)
             //   fd.append("isAllowPartImport", val[1].isAllowPartImport=='0'?true:false)
             // })
-
             // 目前只有单文件上传，写法只适用于单文件上传
             fileName = formFile[0].name
             rd.readAsDataURL(formFile[0])
@@ -272,15 +271,24 @@ export const mixins = {
               // 特殊导入接口判断
               let _uploadURL = that.importUploadURL || that.URL
               let _isSpecial = that.importUploadURL ? true : false
-              fileStorageCreate(params).then( createRes => {
+              // fileStorageCreate(params).then( createRes => {
+                // let importParams = {
+                //   fileType: 1, //文件类型  固定1
+                //   method: val[1].method,  //导入方式 0 更新 1 追加 2 覆盖
+                //   isAllowPartImport: val[1].isAllowPartImport=='0'?true:false,  //是否部分错误导入 
+                //   route: _isSpecial ? _uploadURL : _uploadURL + '/import',  //路由
+                //   function: menuName, //菜单名 
+                //   blobName: menuName,
+                //   file: params.bytes
+                // }
                 let importParams = {
-                  fileType: 1, //文件类型  固定1
-                  method: val[1].method,  //导入方式 0 更新 1 追加 2 覆盖
-                  isAllowPartImport: val[1].isAllowPartImport=='0'?true:false,  //是否部分错误导入 
-                  route: _isSpecial ? _uploadURL : _uploadURL + '/import',  //路由
-                  function: menuName, //菜单名 
-                  blobName: createRes,
-                  company: window.SITE_CONFIG['company']
+                  fileType: null, //文件类型  固定1
+                  method: 'Append',  //导入方式 0 更新 1 追加 2 覆盖
+                  isAllowPartImport: null,  //是否部分错误导入 
+                  route: null,  //路由
+                  function: null, //菜单名 
+                  blobName: null,
+                  file: params.bytes
                 }
                 postImport(importParams, _uploadURL, _isSpecial).then(res => {
                   // 判断是否有错误记录
@@ -335,9 +343,9 @@ export const mixins = {
                   that.displayDialog.importDialog = false;
                   that.paging()
                 })
-              }).catch(err => {
-                console.log(err)
-              })
+              // }).catch(err => {
+              //   console.log(err)
+              // })
             }
           } else {
             that.$errorMsg('请按照提示继续操作')

fe/PC/src/utils/index.js

@@ -447,6 +447,49 @@ export function getImgsDetailPopData(row,sucess,faild) {
   return imgsrcList
 }
 
+// 匹配正则返回值
+/** 具体参数详细，可参照README.md的[表单组件补充:currenForm]说明
+ * @param {*} type      需要匹配的正则类型
+ * @param {*} defaultValue     当前传入值（即需要校验值）
+ * @param {*} fixedNum  如果type为pointNumber，需要保留小数点后的位数
+ * @returns 
+ */
+export function getMatchRegConformValue(type,defaultValue,fixedNum){
+  let value = defaultValue ? String(defaultValue) : ''
+  let _conformValue = ""
+  switch(type){
+    // 正整数
+    case "number":
+      _conformValue=value.replace(/[^\d]/g,'');
+      break;
+
+    // 数字+带小数点，只能输入一个小数点
+    case "pointNumber":
+      //小数点后保留位数
+      let _fixed = fixedNum ? Number(fixedNum) : 100
+      let reg = new RegExp(`\\d+\\.?\\d{0,${_fixed}}`);
+      let _match = String(value).match(reg)
+      _conformValue = _match ? _match[0] : _match
+      break;
+
+    // 数字+字母
+    case "numberLetter":
+      _conformValue=value.replace(/[^\a-\z\A-\Z0-9]/g,'');
+      break;
+      
+    // 字母
+    case "letter":
+      _conformValue=value.replace(/[^a-zA-Z]/g,'');
+      break;
+
+    // 字母+中文
+    case "letterCn":
+      _conformValue=value.replace(/[\d]/g,'');
+      break;
+  }
+  return _conformValue
+}
+
 // 字典格式化数据结构
 export function dictFormatData() {
   return new Promise(resolve => {
@@ -496,3 +539,5 @@ export function dictFormatData() {
 //     })
 //   })
 // }
+
+

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

@@ -35,10 +35,12 @@ export const ItemBasic =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+   // ---------------------------------------
+   { label: "标包数", prop: "stdPackQty" },
   // -----------------------------------------------------------------------
 ]
-// 物品质量信息 20221212
+// 物品质量信息 20230328
 export const ItemQuality =  [
   { label: "物料代码", prop: "itemCode" },
   { label: "供应商代码", prop: 'supplierCode' },
@@ -53,10 +55,10 @@ export const ItemQuality =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物品分类信息 20221212
+// 物品分类信息 20230328
 export const ItemCategory =  [
   { label: "物料代码", prop: 'itemCode' },
   { label: "分类编号", prop: "categoryCode" },
@@ -69,19 +71,21 @@ export const ItemCategory =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物品包装信息 20221212
+// 物品包装信息 20230328
 export const ItemPack =  [
   { label: "包装代码", prop: 'packCode' },
   { label: "包装名称", prop: "packName" },
   { label: '物料代码', prop: "itemCode" },
-  { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" },
-  { label: '标包编号', prop: "stdPackCode" },
-  { label: "包装数量", prop: "packQty" },
-  { label: "物料单位", prop: "packUom" },
-  { label: "转换率", prop: "conversionRate" },
+  { label: '包装计量单位', prop: "basicUom" },
+  { label: '包装数量', prop: "qty" },
+  // { label: "是否标准包装", prop: 'isStdPack', type: "filter", filters: "whetherOrNot" },
+  // { label: '标包编号', prop: "stdPackCode" },
+  // { label: "包装数量", prop: "packQty" },
+  // { label: "物料单位", prop: "packUom" },
+  // { label: "转换率", prop: "conversionRate" },
   { label: "备注", prop: 'remark', colSpan: 12 },
   // -----------------------------------------------------------------------
   { label: "事务代码", prop: "tenantId" },
@@ -91,10 +95,10 @@ export const ItemPack =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物料质检标准信息 20221212
+// 物料质检标准信息 20230328
 export const AQL =  [
   { label: "物料代码", prop: "itemCode" },
   { label: "供应商代码", prop: "supplierCode" },
@@ -112,10 +116,10 @@ export const AQL =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 物料清单信息 20221212
+// 物料清单信息 20230328
 export const Bom =  [
   { label: "父物料号", prop: "product" },
   { label: "子物料号", prop: 'component' },
@@ -137,7 +141,7 @@ export const Bom =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 客户信息 20230328
@@ -166,7 +170,7 @@ export const Customer =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 客户物品信息 20221212
+// 客户物品信息 20230328
 export const CustomerItem =  [
   { label: "客户代码", prop: 'customerCode' },
   { label: "物料代码", prop: "itemCode" },
@@ -184,7 +188,8 @@ export const CustomerItem =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
+  { label: "版本", prop: 'version' },
   // -----------------------------------------------------------------------
 ]
 // 客户地址信息 20230328
@@ -278,8 +283,8 @@ export const SupplierItem =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 供应商时间窗口 20221212
-export const SupplierTime =  [
+// 供应商时间窗口 20230328
+export const SupplierTimeWindow =  [
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商名称", prop: 'supplierName' },
   { label: "时间窗口", prop: "timeSlot" },
@@ -292,7 +297,7 @@ export const SupplierTime =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 收货口信息 20230328
@@ -595,7 +600,7 @@ export const ProductionLine =  [
   // -----------------------------------------------------------------------
 ]
 // 生产线零件关系 20230328
-export const ProdLineItem =  [
+export const ProductionLineItem =  [
   { label: "物料代码", prop: "itemCode" },
   { label: "生产线编号", prop: "prodLineCode" },
   { label: "备注", prop: "remark" },
@@ -609,7 +614,7 @@ export const ProdLineItem =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 工作站信息 20221215
+// 工作站信息 20230328
 export const WorkCenter =  [
   { label: "生产线编号", prop: "productionLineCode" },
   { label: "原料库位", prop: "rawLocation" },
@@ -626,7 +631,7 @@ export const WorkCenter =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 班组信息 20230328
@@ -684,17 +689,17 @@ export const ItemGuideBook = [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 账期信息 20221215
+// 账期信息 20230328
 export const accountPeriodNote = [
-  { label: "库存年", prop: "name" },
+  { label: "名称", prop: "name" },
   { label: "启日", prop: "beginTime",type:'dateTime' },
   { label: "迄日期", prop: "endTime", type:'dateTime' },
   { label: "最后异动时间", prop: "convertToTime", type:'dateTime' },
   // -----------------------------------------------------------------------
-  { label: "日历年", prop: "year" },
-  { label: "日历月", prop: "month" },
-  { label: "接口日历代码", prop: "code" },
-  { label: "日历描述", prop: "description" },
+  { label: "年", prop: "year" },
+  { label: "月", prop: "month" },
+  { label: "代码", prop: "code" },
+  { label: "描述", prop: "description" },
   { label: "备注", prop: "remark" },
   { label: "事务代码", prop: "tenantId" },
   { label: "创建时间", prop: "creationTime", type:'dateTime' },
@@ -702,10 +707,10 @@ export const accountPeriodNote = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 字典信息 20221215
+// 字典信息 20230328
 export const Dict = [
   { label: "字典编号", prop: "code" },
   { label: "字典名称", prop: "name" },
@@ -718,7 +723,7 @@ export const Dict = [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 分类信息 20230328
@@ -737,7 +742,7 @@ export const Category =  [
   // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 计量单位信息 20221215
+// 计量单位信息 20230328
 export const Uom =  [
   { label: "计量单位编号", prop: "code" },
   { label: "计量单位名称", prop: 'name' },
@@ -751,7 +756,7 @@ export const Uom =  [
   { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
   { label: "上次修改者Id", prop: "lastModifierId" },
   { label: "id", prop: 'id' },
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 日历信息 20230328
@@ -787,7 +792,7 @@ export const Configuration =  [
   { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
-// 文档信息 20221215
+// 文档信息 20230328
 export const documentBasic = [
   { label: "编号", prop: "code" },
   { label: "名称", prop: "name" },
@@ -805,7 +810,7 @@ export const documentBasic = [
   { label: "id", prop: "id" },
   { label: "描述", prop: "description" },
   // -----------------------------------------------------------------------
-  { label: "公司", prop: 'company' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 

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

@@ -124,8 +124,8 @@ export default {
         plannedSplitRule: 1,
         product: null,
         component: null,
-        perQtyUom: null,
-        company: null
+        // perQtyUom: null,
+        // company: null
       },
       //编辑
       editFormData: {
@@ -147,13 +147,13 @@ export default {
       CreateForm: [
         { type: "input", label: "父物料号", prop: "product", colSpan: 12 },
         { type: "input", label: "子物料号", prop: 'component', colSpan: 12 },
-        { type: "input", label: "子物料用量", valueType: Number, prop: 'componentQty', colSpan: 12 },
+        { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
         { 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 },
         { type: "input", label: "制造工序", prop: "mfgOp", colSpan: 12 },
-        { type: "input", label: "层级", valueType: Number, disabled:"true", prop: "layer", colSpan: 12 },
+        { type: "input", label: "层级", disabled:"true", prop: "layer", colSpan: 12, validType:'number' },
         { type: "select", label: "配送方式", prop: "distributionType", options: "distributionType", colSpan: 12 },
         { type: "select", label: "取整方式", prop: "truncType", options: "truncType", colSpan: 12 },
         { type: "select", label: "计划拆分规则", prop: "plannedSplitRule", options: "plannedSplitRule", colSpan: 12 },
@@ -161,13 +161,13 @@ export default {
       ],
       editForm: [
         { type: "input", label: "父物料号", prop: "product",disabled:"true",  colSpan: 12 },
-        { type: "input", label: "子物料用量", valueType: Number, prop: 'componentQty', colSpan: 12 },
+        { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' },
         { 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 },
         { type: "input", label: "制造工序", prop: "mfgOp", colSpan: 12 },
-        { type: "input", label: "层级", valueType: Number, disabled:"true", prop: "layer", colSpan: 12 },
+        { type: "input", label: "层级", disabled:"true", prop: "layer", colSpan: 12, validType:'number' },
         { type: "select", label: "配送方式", prop: "distributionType", options: "distributionType", colSpan: 12 },
         { type: "select", label: "取整方式", prop: "truncType", options: "truncType", colSpan: 12 },
         { type: "select", label: "计划拆分规则", prop: "plannedSplitRule", options: "plannedSplitRule", colSpan: 12 },

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

@@ -110,6 +110,7 @@ export default {
       CreateFormData: {
         remark: null,
         name: null,
+        shortName: null,
         address: null,
         country: null,
         city: null,
@@ -119,15 +120,16 @@ export default {
         contacts: null,
         currency: null,
         isActive: true,
-        type: 0,
+        type: 1,
         code: null,
-        company: null,
+        // company: null,
       },
       //编辑
       editFormData: {
         code:null,
         remark: null,
         name: null,
+        shortName: null,
         address: null,
         country: null,
         city: null,
@@ -137,37 +139,39 @@ export default {
         contacts: null,
         currency: null,
         isActive: true,
-        type: 0,
+        type: 1,
         concurrencyStamp: null,
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "客户代码", prop: "code", colSpan: 12 },
+        { type: "input", label: "客户代码", prop: "code", colSpan: 12, validType:'numberLetter' },
         { 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 },
         { type: "input", label: "城市", prop: "city", colSpan: 12 },
         { type: "input", label: "地址", prop: "address", colSpan: 12 },
         { type: "input", label: "联系人", prop: "contacts", colSpan: 12 },
-        { type: "input", label: "电话", prop: "phone", colSpan: 12 },
+        { type: "input", label: "电话", prop: "phone", colSpan: 12, validType:'number', maxlength:11},
         { type: "input", label: "传真", prop: "fax", colSpan: 12 },
-        { type: "input", label: "邮编", prop: "postID", colSpan: 12 },
+        { type: "input", label: "邮编", prop: "postID", colSpan: 12, validType:'number' },
         { type: "input", label: "货币", prop: "currency", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "客户代码", prop: "code",disabled:"true", colSpan: 12 },
+        { type: "input", label: "客户代码", prop: "code",disabled:"true", colSpan: 12, validType:'numberLetter' },
         { 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 },
         { type: "input", label: "城市", prop: "city", colSpan: 12 },
         { type: "input", label: "地址", prop: "address", colSpan: 12 },
         { type: "input", label: "联系人", prop: "contacts", colSpan: 12 },
-        { type: "input", label: "电话", prop: "phone", colSpan: 12 },
+        { type: "input", label: "电话", prop: "phone", colSpan: 12, validType:'number', maxlength:11 },
         { type: "input", label: "传真", prop: "fax", colSpan: 12 },
-        { type: "input", label: "邮编", prop: "postID", colSpan: 12 },
+        { type: "input", label: "邮编", prop: "postID", colSpan: 12, validType:'number' },
         { type: "input", label: "货币", prop: "currency", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

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

@@ -135,7 +135,7 @@ export default {
         locationCode: null,
         warehouseCode: null,
         desc: null,
-        company: null,
+        // company: null,
         code: null,
         customerCode: null,
       },

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

@@ -137,7 +137,7 @@ export default {
         endTime: null,
         customerCode: null,
         itemCode: null,
-        company: null,
+        // company: null,
       },
       //编辑
       editFormData: {
@@ -164,7 +164,7 @@ export default {
         searchButton: (val) => { this.showSerarchPage(val, 'basedata/customer', 'Customer', '物料选择', this.CreateFormData) }, colSpan: 12 },
         
         { type: "input", label: "客户物料代码", prop: "customerItemCode", colSpan: 12 },
-        { type: "input", label: "包装数量", valueType: Number, prop: "customerPackQty", colSpan: 12 },
+        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'pointNumber' },
         { 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 },
@@ -175,7 +175,7 @@ export default {
       editForm: [
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户物料代码", prop: "customerItemCode", colSpan: 12 },
-        { type: "input", label: "包装数量", valueType: Number, prop: "customerPackQty", colSpan: 12 },
+        { type: "input", label: "包装数量", prop: "customerPackQty", colSpan: 12, validType:'pointNumber' },
         { 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 },

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

@@ -134,7 +134,7 @@ export default {
         code: null,
         name: null,
         description: null,
-        company: null,
+        // company: null,
       },
       //编辑
       editFormData: {
@@ -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/DictionaryManage/Category.vue

@@ -124,13 +124,13 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "分类编号", prop: "code", colSpan: 12 },
+        { 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 },
+        { 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/DictionaryManage/Uom.vue

@@ -128,14 +128,14 @@ export default {
         type: [],
       },
       CreateForm: [
-        { type: "input", label: "计量单位编号", prop: "code", colSpan: 12 },
+        { type: "input", label: "计量单位编号", prop: "code", colSpan: 12, validType:'letter' },
         { type: "input", label: "计量单位名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "uomType", 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 },
+        { type: "input", label: "计量单位编号", prop: "code", disabled:"true", colSpan: 12, validType:'letter' },
         { type: "input", label: "计量单位名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "uomType", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },

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

@@ -25,7 +25,7 @@
       :httpOverallSearchData="httpOverallSearchData"
     >
     </tablePagination>
-    <!-- 新增与编辑 -->
+    <!-- 新增与编辑   @changeSelect="changeSelect"-->
     <newAndEdiDialog
       :loading="Loading.newAndEdiLoading"
       :active="active"
@@ -41,6 +41,7 @@
       @FormSubmit="FormSubmit"
       @close="FormClose"
       @goBack="goBack"
+     
     ></newAndEdiDialog>
     <!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
     <!-- methodValue 导入方式默认选项  是否局部导入 默认选项  -->
@@ -141,7 +142,7 @@ export default {
         samplePercent: 0,
         sampleQty: 0,
         isUsePercent: false,
-        company: null
+        abcClass: null,
       },
       //编辑
       editFormData: {
@@ -153,6 +154,7 @@ export default {
         samplePercent: 0,
         sampleQty: 0,
         isUsePercent: true,
+        abcClass: null,
         concurrencyStamp: null
       },
       editOptions: {},
@@ -163,11 +165,12 @@ 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: "input", label: "数量下限", valueType: Number, prop: "floorQty", colSpan: 12 },
-        { type: "input", label: "数量上限", valueType: Number, prop: "ceilingQty", colSpan: 12 },
-        { type: "input", label: "抽检百分比%", valueType: Number, prop: "samplePercent", colSpan: 12 },
-        { type: "input", label: "抽检数量", valueType: Number, prop: "sampleQty", colSpan: 12 },
+        { type: "input", label: "数量下限", prop: "floorQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },
       ],
       editForm: [
@@ -177,11 +180,12 @@ 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', 'SupplierBasic', '供应商选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "数量下限", valueType: Number, prop: "floorQty", colSpan: 12 },
-        { type: "input", label: "数量上限", valueType: Number, prop: "ceilingQty", colSpan: 12 },
-        { type: "input", label: "抽检百分比%", valueType: Number, prop: "samplePercent", colSpan: 12 },
-        { type: "input", label: "抽检数量", valueType: Number, prop: "sampleQty", colSpan: 12 },
+        { type: "input", label: "数量下限", prop: "floorQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
+        { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
@@ -215,6 +219,19 @@ export default {
   mounted () {
     this.paging();
   },
+  methods: {
+    // changeSelect(prop, val) {
+    //   if (prop == 'isUsePercent') {
+    //     if (val) {
+    //       this.editRules.cerateRule.samplePercent[1].required = true
+    //       this.editRules.editRule.samplePercent[1].required = true
+    //     } else {
+    //       this.editRules.cerateRule.samplePercent[1].required = false
+    //       this.editRules.editRule.samplePercent[1].required = false
+    //     }
+    //   }
+    // }
+  }
 };
 </script>
 <style lang="scss" scoped>

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

@@ -156,7 +156,7 @@ export default {
         configuration: null,
         basicUom: null,
         abcClass: "C",
-        productLine: null,
+        // productLine: null,
         project: null,
         version: null,
         eco: null,
@@ -166,7 +166,8 @@ export default {
         elevel: null,
         code: null,
         company: null,
-        isPhantom: false
+        isPhantom: false,
+        stdPackQty: null,
       },
       //编辑
       editFormData: {
@@ -187,7 +188,7 @@ export default {
         configuration: null,
         basicUom: null,
         abcClass: null,
-        productLine: null,
+        // productLine: null,
         project: null,
         version: null,
         eco: null,
@@ -196,13 +197,15 @@ export default {
         manageType: 1,
         elevel: null,
         concurrencyStamp: null,
-        isPhantom: null
+        isPhantom: null,
+        stdPackQty: null,
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物料代码", prop: 'code', colSpan: 12 },
+        { type: "input", label: "物料代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "物料名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物料描述", prop: "desc1", 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", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
@@ -212,8 +215,8 @@ export default {
         { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 },
         { 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", 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: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
@@ -227,12 +230,14 @@ export default {
         { 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: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物料代码", prop: 'code', disabled: true, colSpan: 12 },
+        { type: "input", label: "物料代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "物料名称", prop: "name", colSpan: 12 },
-        { type: "input", label: "物料描述", prop: "desc1", 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", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
@@ -242,8 +247,8 @@ export default {
         { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { 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", 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: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
@@ -257,6 +262,7 @@ export default {
         { 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: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

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

@@ -127,7 +127,6 @@ export default {
       ],
       //新增
       CreateFormData: {
-        company: '',
         itemCode: '',
         categoryCode: '',
         value: '',

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

@@ -130,12 +130,8 @@ export default {
         remark: null,
         packName: null,
         packType: "EA",
-        packQty: 0,
-        packUom: null,
-        isStdPack: true,
-        stdPackCode: null,
-        conversionRate: 0,
-        company: null,
+        basicUom: null,
+        qty: 0,
         packCode: null,
         itemCode: null,
       },
@@ -146,38 +142,29 @@ export default {
         remark: null,
         packName: null,
         packType: "EA",
-        packQty: 0,
-        packUom: null,
-        isStdPack: true,
-        stdPackCode: null,
-        conversionRate: 0,
+        basicUom: null,
+        qty: 0,
         concurrencyStamp: null,
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12 },
+        { 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", 
           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: "包装数量", valueType: Number, prop: "packQty", colSpan: 12 },
-        { type: "input", label: "物料单位", prop: "packUom", colSpan: 12 },
-        { type: "select", label: "是否标准包装", prop: "isStdPack", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12 },
-        { type: "input", label: "转换率", valueType: Number, prop: "conversionRate", colSpan: 12 },
+        { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
+        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12 },
+        { 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: "包装数量", valueType: Number, prop: "packQty", colSpan: 12 },
-        { type: "input", label: "物料单位", prop: "packUom", colSpan: 12 },
-        { type: "select", label: "是否标准包装", prop: "isStdPack", options: "whetherOrNot", colSpan: 12 },
-        { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12 },
-        { type: "input", label: "转换率", valueType: Number, prop: "conversionRate", colSpan: 12 },
+        { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
+        { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {

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

@@ -136,14 +136,6 @@ export default {
         status: 1,
         description: null,
         inspectType: 1,
-        inspFrequency: 0,
-        inspFreqDays: 0,
-        sampleQty: 0,
-        samplePercent: 0,
-        destructive: true,
-        sampleByBatch: true,
-        returnMethod: true,
-        company: null
       },
       //编辑
       editFormData: {
@@ -154,13 +146,6 @@ export default {
         status: 1,
         description: "",
         inspectType: 1,
-        inspFrequency: 0,
-        inspFreqDays: 0,
-        sampleQty: 0,
-        samplePercent: 0,
-        destructive: true,
-        sampleByBatch: true,
-        returnMethod: true,
         concurrencyStamp: ""
       },
       editOptions: {},
@@ -176,19 +161,21 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
         { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 },
         { type: "select", label: "检验类型", prop: "inspectType", options: "inspectType", colSpan: 12 },
-        { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 },
+        // { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
         { type: "input",label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 },
-        { type: "input", label: "物料名称", prop: "name", 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 },
         { type: "select", label: "检验类型", prop: "inspectType", options: "inspectType", colSpan: 12 },
-        { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 },
+        // { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
+        { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
@@ -199,7 +186,7 @@ export default {
         },
         editRule: {
           itemCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          name: [{ required: true, trigger: "change", message: "不可为空" }],
+          // name: [{ required: true, trigger: "change", message: "不可为空" }],
           status: [{ required: true, trigger: "blur", message: "不可为空" }],
           supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
         }

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

@@ -127,7 +127,7 @@ export default {
         isActive: true,
         type: 1,
         code: null,
-        company: null,
+        // company: null,
         shortName: null,
         taxRate: 0,
       },
@@ -158,7 +158,7 @@ export default {
         { type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "supplierType", colSpan: 12 },
         { type: "input", label: "简称", prop: "shortName", colSpan: 12 },
-        { type: "input", label: "税率", valueType: Number, prop: "taxRate", colSpan: 12 },
+        { type: "input", label: "税率", prop: "taxRate", colSpan: 12, validType: 'pointNumber' },
         { type: "input", label: "国家", prop: "country", colSpan: 12 },
         { type: "input", label: "城市", prop: "city", colSpan: 12 },
         { type: "input", label: "地址", prop: "address", colSpan: 12 },
@@ -176,7 +176,7 @@ export default {
         { type: "select", label: "状态", prop: "isActive", options: "openToCloseBit", colSpan: 12 },
         { type: "select", label: "类型", prop: "type", options: "supplierType", colSpan: 12 },
         { type: "input", label: "简称", prop: "shortName", colSpan: 12 },
-        { type: "input", label: "税率", valueType: Number, prop: "taxRate", colSpan: 12 },
+        { type: "input", label: "税率", prop: "taxRate", colSpan: 12, validType: 'pointNumber' },
         { type: "input", label: "国家", prop: "country", colSpan: 12 },
         { type: "input", label: "城市", prop: "city", colSpan: 12 },
         { type: "input", label: "地址", prop: "address", colSpan: 12 },
@@ -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/SupplierItem.vue

@@ -135,8 +135,9 @@ export default {
         itemName: null,
         supplierCode: null,
         itemCode: null,
-        company: null,
+        // company: null,
         supplierSimpleName: null,
+        qtyPerPallet:0
       },
       //编辑
       editFormData: {
@@ -150,6 +151,7 @@ export default {
         itemName: null,
         concurrencyStamp: null,
         supplierSimpleName: null,
+        qtyPerPallet:0
       },
       editOptions: { },
       CreateForm: [

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,
@@ -129,17 +129,17 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        warehouseCode: null,
+        // warehouseCode: null,
         supplierCode: null,
         supplierName: null,
         timeSlot: null,
         week: null,
-        company: null,
+        // company: null,
       },
       //编辑
       editFormData: {
         remark: null,
-        warehouseCode: null,
+        // warehouseCode: null,
         supplierCode: null,
         supplierName: null,
         timeSlot: null,
@@ -175,14 +175,14 @@ export default {
           supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
           week: [{ required: true, trigger: "change", message: "不可为空" }],
           timeSlot: [{ required: true, trigger: "blur", message: "不可为空" }],
-          warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
           supplierName: [{ required: true, trigger: "change", message: "不可为空" }],
           supplierCode: [{ required: true, trigger: "change", message: "不可为空" }],
           week: [{ required: true, trigger: "change", message: "不可为空" }],
           timeSlot: [{ required: true, trigger: "blur", message: "不可为空" }],
-          warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
     };

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

@@ -108,40 +108,42 @@ export default {
       ],
       //新增
       CreateFormData: {
-        company: null,
-        code: null,
+        remark: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
-        warehouseCode: null,
         areaType: 1,
         isFunctional: true,
-        remark: null
+        code: null,
+        // company: null,
       },
       //编辑
       editFormData: {
-        code: null,
+        remark: null,
+        warehouseCode: localStorage.getItem('warehouseCode'),
         name: null,
         description: null,
-        warehouseCode: null,
         areaType: 1,
         isFunctional: true,
+        code: null,
         concurrencyStamp: null,
-        remark: null
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "区域代码", prop: "code", colSpan: 12 },
+        { type: "input", label: "区域代码", prop: "code", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", 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 },
+        { type: "input", label: "区域代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "区域名称", prop: 'name', colSpan: 12 },
         { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

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

@@ -127,22 +127,22 @@ export default {
       ],
       //新增
       CreateFormData: {
-        company: null,
-        defaultLocationCode: null,
+        // company: null,
         code: null,
-        name: null,
+        defaultLocationCode: null,
         description: null,
+        name: null,
         warehouseCode: null,
         remark: null
       },
       //编辑
       editFormData: {
+        concurrencyStamp: null,
         code: null,
-        name: null,
+        defaultLocationCode: null,
         description: null,
+        name: null,
         warehouseCode: null,
-        concurrencyStamp: null,
-        defaultLocationCode: null,
         remark: null
       },
       editOptions: {},

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

@@ -146,13 +146,13 @@ export default {
         { type: "filterSelect", label: "库位代码", prop: "locationCode", 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: "可用容量(%)", typeValue: number, prop: "availableCapacity", colSpan: 12 },
+        { type: "input", label: "可用容量(%)", prop: "availableCapacity", colSpan: 12, validType:'pointNumber' },
         { type: "select", label: "是否无穷大", prop: "isInfinity", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "库位代码", prop: "locationCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "可用容量(%)", typeValue: number, prop: "availableCapacity", colSpan: 12 },
+        { type: "input", label: "可用容量(%)", prop: "availableCapacity", colSpan: 12, validType:'pointNumber' },
         { type: "select", label: "是否无穷大", prop: "isInfinity", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

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

@@ -157,14 +157,15 @@ export default {
         warehouseCode: null,
         storeRelationType: 1,
         storeValue: null,
-        maxStock: 0,
-        minStock: 0,
-        safetyStock: 0,
+        maxStock: null,
+        minStock: null,
+        safetyStock: null,
         feedLine: 0,
         feedQty: 0,
         feedUM: null,
-        concurrencyStamp: null,
-        company: localStorage.getItem('company'),
+        // concurrencyStamp: null,
+        // company: localStorage.getItem('company'),
+        remark:"",
       },
       //编辑
       editFormData: {
@@ -172,14 +173,15 @@ export default {
         warehouseCode: null,
         storeRelationType: 1,
         storeValue: null,
-        maxStock: 0,
-        minStock: 0,
-        safetyStock: 0,
+        maxStock: null,
+        minStock: null,
+        safetyStock: null,
         feedLine: 0,
         feedQty: 0,
         feedUM: null,
         concurrencyStamp: null,
-        company: localStorage.getItem('company'),
+        // company: localStorage.getItem('company'),
+        remark:"",
       },
       editOptions: {},
       CreateForm: [
@@ -190,12 +192,13 @@ export default {
         { 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: "最大库存", valueType: Number, prop: "maxStock", colSpan: 12 },
-        { type: "input", label: "最小库存", valueType: Number, prop: "minStock", colSpan: 12 },
-        { type: "input", label: "安全库存", valueType: Number, prop: "safetyStock", colSpan: 12 },
-        { type: "input", label: "补料点", valueType: Number, prop: "feedLine", colSpan: 12 },
-        { type: "input", label: "补料数量", valueType: Number, prop: "feedQty", colSpan: 12 },
+        { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
+        { type: "input", label: "最小库存", validType:'pointNumber', prop: "minStock", colSpan: 12 },
+        { type: "input", label: "安全库存", validType:'pointNumber', prop: "safetyStock", colSpan: 12 },
+        { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 },
+        { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
+        { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 },
@@ -203,20 +206,30 @@ export default {
         { 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: "最大库存", valueType: Number, prop: "maxStock", colSpan: 12 },
-        { type: "input", label: "最小库存", valueType: Number, prop: "minStock", colSpan: 12 },
-        { type: "input", label: "安全库存", valueType: Number, prop: "safetyStock", colSpan: 12 },
-        { type: "input", label: "补料点", valueType: Number, prop: "feedLine", colSpan: 12 },
-        { type: "input", label: "补料数量", valueType: Number, prop: "feedQty", colSpan: 12 },
+        { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 },
+        { type: "input", label: "最小库存", validType:'pointNumber', prop: "minStock", colSpan: 12 },
+        { type: "input", label: "安全库存", validType:'pointNumber', prop: "safetyStock", colSpan: 12 },
+        { type: "input", label: "补料点", validType:'pointNumber', prop: "feedLine", colSpan: 12 },
+        { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 },
         { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 },
+        { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
           itemCode: [{ required: true, trigger: "change", message: "不可为空" },],
           storeRelationType: [{ required: true, trigger: "change", message: "不可为空" },],
           storeValue: [{ required: true, trigger: "change", message: "不可为空" },],
+          maxStock: [{ required: true, trigger: "change", message: "不可为空" },],
+          minStock: [{ required: true, trigger: "change", message: "不可为空" },],
+          safetyStock: [{ required: true, trigger: "change", message: "不可为空" },],
         },
-        editRule: {}
+        editRule: {
+          storeRelationType: [{ required: true, trigger: "change", message: "不可为空" },],
+          storeValue: [{ required: true, trigger: "change", message: "不可为空" },],
+          maxStock: [{ required: true, trigger: "change", message: "不可为空" },],
+          minStock: [{ required: true, trigger: "change", message: "不可为空" },],
+          safetyStock: [{ required: true, trigger: "change", message: "不可为空" },],
+        }
       },
     };
   },

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

@@ -164,7 +164,7 @@ export default {
         pramaryUM: 1,
         isFixed: false,
         multiLoc: 0,
-        company: null,
+        // company: null,
         itemCode: null,
       },
       //编辑
@@ -192,9 +192,9 @@ export default {
         { 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: "主存储容量", valueType: Number, prop: "umQty", colSpan: 12 },
+        { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "主存储单位", prop: "storeUM", colSpan: 12 },
-        { type: "input", label: "次要存储容量", valueType: Number, prop: "altUmQty", colSpan: 12 },
+        { type: "input", label: "次要存储容量", prop: "altUmQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "次要存储单位", prop: "altUm", colSpan: 12 },
         { type: "select", label: "存储单位", prop: "pramaryUM", options: "pramaryUm", colSpan: 12 },
         { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
@@ -207,9 +207,9 @@ export default {
         { 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: "主存储容量", valueType: Number, prop: "umQty", colSpan: 12 },
+        { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "主存储单位", prop: "storeUM", colSpan: 12 },
-        { type: "input", label: "次要存储容量", valueType: Number, prop: "altUmQty", colSpan: 12 },
+        { type: "input", label: "次要存储容量", prop: "altUmQty", colSpan: 12, validType:'pointNumber' },
         { type: "input", label: "次要存储单位", prop: "altUm", colSpan: 12 },
         { type: "select", label: "存储单位", prop: "pramaryUM", options: "pramaryUm", colSpan: 12 },
         { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 

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

@@ -133,11 +133,11 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
+        warehouseCode: null,
         name: null,
         description: null,
         type: 1,
         erpLocationCode: null,
-        warehouseCode: null,
         areaCode: null,
         locationGroupCode: null,
         workGroupCode: null,
@@ -147,36 +147,51 @@ export default {
         defaultInventoryStatus: 1,
         pickPriority: 1,
         pickOrder: 1,
-        locSwitch: {
-          enableMixItem: true,
-          enableMixLot: true,
-          enableMixStatus: true,
-          enableNegative: true,
-          enableKeepZero: true,
-          enableOpportunityCount: true,
-          enablePick: true,
-          enableOverPick: true,
-          enableWholeStore: true,
-          enableBreakStore: true,
-          enableShip: true,
-          enableReceive: true,
-          enableReturnToSupplier: true,
-          enableReturnFromCustomer: true
-        },
-        uom: null,
-        qty: 0,
+        enableMixItem: true,
+        enableMixLot: true,
+        enableMixStatus: true,
+        enableNegative: true,
+        enableKeepZero: true,
+        enableOpportunityCount: true,
+        enablePick: true,
+        enableOverPick: true,
+        enableWholeStore: true,
+        enableBreakStore: true,
+        enableShip: true,
+        enableReceive: true,
+        enableReturnToSupplier: true,
+        enableReturnFromCustomer: true,
+        enableSplitBox: true,
+        enableSplitPallet: true,
         code: null,
-        company: null,
+        // locSwitch: {
+        //   enableMixItem: true,
+        //   enableMixLot: true,
+        //   enableMixStatus: true,
+        //   enableNegative: true,
+        //   enableKeepZero: true,
+        //   enableOpportunityCount: true,
+        //   enablePick: true,
+        //   enableOverPick: true,
+        //   enableWholeStore: true,
+        //   enableBreakStore: true,
+        //   enableShip: true,
+        //   enableReceive: true,
+        //   enableReturnToSupplier: true,
+        //   enableReturnFromCustomer: true
+        // },
+        // uom: null,
+        // qty: 0,
+        // company: null,
       },
       //编辑
       editFormData: {
-        code: null,
         remark: null,
+        warehouseCode: null,
         name: null,
         description: null,
         type: 1,
         erpLocationCode: null,
-        warehouseCode: null,
         areaCode: null,
         locationGroupCode: null,
         workGroupCode: null,
@@ -186,26 +201,25 @@ export default {
         defaultInventoryStatus: 1,
         pickPriority: 0,
         pickOrder: 0,
-        locSwitch: {
-          enableMixItem: true,
-          enableMixLot: true,
-          enableMixStatus: true,
-          enableNegative: true,
-          enableKeepZero: true,
-          enableOpportunityCount: true,
-          enablePick: true,
-          enableOverPick: true,
-          enableWholeStore: true,
-          enableBreakStore: true,
-          enableShip: true,
-          enableReceive: true,
-          enableReturnToSupplier: true,
-          enableReturnFromCustomer: true,
-          enableSplitBox: true,
-          enableSplitPallet: true,
-        },
-        uom: null,
-        qty: 0,
+        enableMixItem: true,
+        enableMixLot: true,
+        enableMixStatus: true,
+        enableNegative: true,
+        enableKeepZero: true,
+        enableOpportunityCount: true,
+        enablePick: true,
+        enableOverPick: true,
+        enableWholeStore: true,
+        enableBreakStore: true,
+        enableShip: true,
+        enableReceive: true,
+        enableReturnToSupplier: true,
+        enableReturnFromCustomer: true,
+        enableSplitBox: true,
+        enableSplitPallet: true,
+        code: null,
+        // uom: null,
+        // qty: 0,
         concurrencyStamp: null,
       },
       editOptions: {},
@@ -221,31 +235,46 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/work-Group', 'WorkGroup', '工作组选择', this.CreateFormData) }, colSpan: 12 },
         { type: "input", label: "库位代码", prop: "code", colSpan: 12 },
         { 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: "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: "input", label: "行号", valueType: Number,prop: "rowCode", colSpan: 12 },
-        { type: "input", label: "列号", valueType: Number,prop: "columnCode", 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: "拣料优先级", valueType: Number, prop: "pickPriority", colSpan: 12 },
-        { type: "input", label: "拣料顺序", valueType: Number, prop: "pickOrder", 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: "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: "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 },
-        { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", 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: "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: "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 },
+        // { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
+        // { 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 },
       ],
@@ -261,37 +290,37 @@ export default {
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/work-Group")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/work-Group', 'WorkGroup', '工作组选择', this.editFormData) }, colSpan: 12 },
         { 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: "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: "input", label: "行号", valueType: Number,prop: "rowCode", colSpan: 12 },
-        { type: "input", label: "列号", valueType: Number,prop: "columnCode", 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: "拣料优先级", valueType: Number, prop: "pickPriority", colSpan: 12 },
-        { type: "input", label: "拣料顺序", valueType: Number, prop: "pickOrder", 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: "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: "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 },
-        { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", 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: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {
-          warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
+          // warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],//编辑必选
           locationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
           workGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
@@ -299,7 +328,7 @@ export default {
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
         },
         editRule: {
-          warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
+          // warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],//编辑必选
           locationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
           workGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],

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

@@ -128,62 +128,78 @@ export default {
       //新增
       CreateFormData: {
         remark: null,
-        description: null,
         warehouseCode: null,
+        name: null,
+        description: null,
         areaCode: null,
         groupType: 1,
         defaultInventoryStatus: 1,
         pickPriority: 1,
         overflowLocationGroup: null,
-        locSwitch: {
-          enableMixItem: true,
-          enableMixLot: true,
-          enableMixStatus: true,
-          enableNegative: true,
-          enableKeepZero: true,
-          enableOpportunityCount: true,
-          enablePick: true,
-          enableOverPick: true,
-          enableWholeStore: true,
-          enableBreakStore: true,
-          enableShip: true,
-          enableReceive: true,
-          enableReturnToSupplier: true,
-          enableReturnFromCustomer: true
-        },
+        enableMixItem: true,
+        enableMixLot: true,
+        enableMixStatus: true,
+        enableNegative: true,
+        enableKeepZero: true,
+        enableOpportunityCount: true,
+        enablePick: true,
+        enableOverPick: true,
+        enableWholeStore: true,
+        enableBreakStore: true,
+        enableShip: true,
+        enableReceive: true,
+        enableReturnToSupplier: true,
+        enableReturnFromCustomer: true,
+        enableSplitBox: true,
+        enableSplitPallet: true,
         code: null,
-        company: null,
-        name: null,
+        // locSwitch: {
+        //   enableMixItem: true,
+        //   enableMixLot: true,
+        //   enableMixStatus: true,
+        //   enableNegative: true,
+        //   enableKeepZero: true,
+        //   enableOpportunityCount: true,
+        //   enablePick: true,
+        //   enableOverPick: true,
+        //   enableWholeStore: true,
+        //   enableBreakStore: true,
+        //   enableShip: true,
+        //   enableReceive: true,
+        //   enableReturnToSupplier: true,
+        //   enableReturnFromCustomer: true
+        // },
+        // company: null,
       },
       //编辑
       editFormData: {
-        code: null,
         remark: null,
-        description: null,
         warehouseCode: null,
+        name: null,
+        description: null,
         areaCode: null,
         groupType: 1,
         defaultInventoryStatus: 1,
         pickPriority: 0,
         overflowLocationGroup: null,
-        locSwitch: {
-          enableMixItem: true,
-          enableMixLot: true,
-          enableMixStatus: true,
-          enableNegative: true,
-          enableKeepZero: true,
-          enableOpportunityCount: true,
-          enablePick: true,
-          enableOverPick: true,
-          enableWholeStore: true,
-          enableBreakStore: true,
-          enableShip: true,
-          enableReceive: true,
-          enableReturnToSupplier: true,
-          enableReturnFromCustomer: true
-        },
+        enableMixItem: true,
+        enableMixLot: true,
+        enableMixStatus: true,
+        enableNegative: true,
+        enableKeepZero: true,
+        enableOpportunityCount: true,
+        enablePick: true,
+        enableOverPick: true,
+        enableWholeStore: true,
+        enableBreakStore: true,
+        enableShip: true,
+        enableReceive: true,
+        enableReturnToSupplier: true,
+        enableReturnFromCustomer: true,
+        enableSplitBox: true,
+        enableSplitPallet: true,
+        code: null,
         concurrencyStamp: null,
-        name: null,
       },
       editOptions: {},
       CreateForm: [
@@ -197,20 +213,35 @@ export default {
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", 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: "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 },
-        { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", 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: "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: "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 },
+        // { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
+        // { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
+        // { 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 },
       ],
       editForm: [
@@ -224,20 +255,21 @@ export default {
         { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", 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: "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 },
-        { type: "objectSelect", label: "是否散件存储", prop: "locSwitch", showProp: "enableBreakStore", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否发出", prop: "locSwitch", showProp: "enableShip", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收", prop: "locSwitch", showProp: "enableReceive", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 },
-        { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", 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: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {
@@ -246,13 +278,13 @@ export default {
             { required: true, trigger: "blur", message: "不可为空" },
           ],
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
         },
         editRule: {
           name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选
           areaCode: [{ required: true, trigger: "change", message: "不可为空" }],
-          warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
+          // warehouseCode: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },
     };

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

@@ -134,12 +134,14 @@ export default {
       CreateFormData: {},
       //编辑
       editFormData: {
-        code: null,
-        name: null,
+        // code: null,
+        // name: null,
         description: null,
         transType: 0,
         inLocationTypes: null,
         outLocationTypes: null,
+        inLocationAreas: null,
+        outLocationAreas: null,
         itemStatuses: null,
         itemTypes: null,
         outInventoryStatuses: null,
@@ -152,15 +154,27 @@ export default {
         enabled: null,
         concurrencyStamp: null,
         transSubType: null,
+        remark: null,
       },
       editOptions: {},
       CreateForm: [],
       editForm: [
         { type: "input", label: "描述", prop: 'description', colSpan: 12 },
+        { type: "select", label: "是否可用", prop: 'enabled', options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "事务类型", prop: "transType", options: "TransTypeBase", colSpan: 12 },
         { type: "select", label: "事务子类型", prop: "transSubType", options: "transSubType", colSpan: 12 },
         { type: "selectArray", label: "入库库位类型清单", prop: 'inLocationTypes', options: "locationType", colSpan: 12 },
         { type: "selectArray", label: "出库库位类型清单", prop: 'outLocationTypes', options: "locationType", colSpan: 12 },
+        
+        { type: "filterSelect", label: "入库库区清单", prop: "inLocationAreas", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/area")},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '入库库区选择', this.editFormData) }, colSpan: 12 },
+        
+        { type: "filterSelect", label: "出库库区清单", prop: "outLocationAreas", optionsLabel: "name", optionsValue: "code", 
+          focus: (type,val) => { return this.getFilterList(type, val, "basedata/area")},
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '出库库区选择', this.editFormData) }, colSpan: 12 },
+        // { type: "input", label: "入库库区清单", prop: 'inLocationAreas', colSpan: 12 },
+        // { type: "input", label: "出库库区清单", prop: 'outLocationAreas', colSpan: 12 },
         { type: "selectArray", label: "物品状态清单", prop: 'itemStatuses', options: "ItemStatus", colSpan: 12 },
         { type: "selectArray", label: "物品类型清单", prop: 'itemTypes', options: "ItemType", colSpan: 12 },
         { type: "selectArray", label: "来源库存状态清单", prop: 'outInventoryStatuses', options: "inventoryStage", colSpan: 12 }, 
@@ -170,7 +184,7 @@ export default {
         { type: "select", label: "自动执行", prop: 'autoHandleRequest', options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "自动完成任务", prop: 'autoCompleteJob', options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "直接创建记录", prop: 'directCreateNote', options: "whetherOrNot", colSpan: 12 },
-        { type: "select", label: "是否可用", prop: 'enabled', options: "whetherOrNot", colSpan: 12 },
+        { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

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

@@ -108,11 +108,11 @@ export default {
       ],
       //新增
       CreateFormData: {
-        company: '',
+        // company: '',
         code: '',
         name: '',
         description: '',
-        warehouseCode: '',
+        warehouseCode: localStorage.getItem('warehouseCode'),
         remark: ''
       },
       //编辑
@@ -120,7 +120,7 @@ export default {
         code: null,
         name: '',
         description: '',
-        warehouseCode: '',
+        warehouseCode: localStorage.getItem('warehouseCode'),
         concurrencyStamp: '',
         remark: ''
       },
@@ -128,12 +128,14 @@ export default {
       CreateForm: [
         { type: "input", label: "工作组代码", prop: "code", colSpan: 12 },
         { type: "input", label: "工作组名称", prop: 'name', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", 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 },
         { type: "input", label: "工作组名称", prop: 'name', colSpan: 12 },
+        { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 },
         { type: "input", label: "描述", prop: "description", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

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,
@@ -130,15 +130,15 @@ export default {
       //新增
       CreateFormData: {
         remark: "",
-        bomId: "",
-        routingId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
-        enabled: true,
-        code: "",
-        company: "",
-        prodLineId: "",
         prodLineCode: "",
         itemCode: "",
-        itemId: ""
+        // bomId: "",
+        // routingId: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
+        // enabled: true,
+        // code: "",
+        // company: "",
+        // prodLineId: "",
+        // itemId: ""
       },
       //编辑
       editFormData: {

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

@@ -132,10 +132,11 @@ export default {
         description: null,
         type: 1,
         workshopCode: null,
-        rawLocation: null,
-        productLocation: null,
+        rawLocationCode: null,
+        productLocationCode: null,
+        rawLocationGroupCode: null,
         code: null,
-        company: null,
+        // company: null,
       },
       //编辑
       editFormData: {
@@ -145,8 +146,9 @@ export default {
         description: null,
         type: 1,
         workshopCode: null,
-        rawLocation: null,
-        productLocation: null,
+        rawLocationCode: null,
+        rawLocationGroupCode: null,
+        productLocationCode: null,
         concurrencyStamp: null,
       },
       editOptions: {
@@ -159,10 +161,13 @@ export default {
         { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "原料库位", prop: "rawLocation", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", 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: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
+        { type: "filterSelect", label: "成品库位", prop: "productLocationCode", 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: "description", colSpan: 12 },
@@ -175,10 +180,13 @@ export default {
         { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "原料库位", prop: "rawLocation", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", 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: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
+        { type: "filterSelect", label: "成品库位", prop: "productLocationCode", 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: "description", colSpan: 12 },

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

@@ -127,7 +127,7 @@ export default {
       ],
       //新增
       CreateFormData: {
-        company: null,
+        // company: null,
         code: null,
         name: null,
         description: null,

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

@@ -108,7 +108,7 @@ export default {
       ],
       //新增
       CreateFormData: {
-        company: '',
+        // company: '',
         code: '',
         name: '',
         description: '',
@@ -124,13 +124,13 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "车间代码", prop: "code", colSpan: 12 },
+        { 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 },
+        { 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/documentSetting/documentBasic.vue

@@ -142,7 +142,7 @@ export default {
         { type: "select", label: "事务类型", prop: "transactionType", options: "TransTypeBaseForStr", colSpan: 12 },
         { type: "input", label: "单号前缀", prop: "numberPrefix", colSpan: 12 },
         { type: "input", label: "单号格式", prop: "numberFormat", colSpan: 12 },
-        { type: "input", valueType: Number, label: "单号流水长度", prop: "numberSerialLength", colSpan: 12 },
+        { type: "input", label: "单号流水长度", prop: "numberSerialLength", colSpan: 12, validType:'number' },
         { type: "input", label: "单号分隔符", prop: "numberSeparator", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -153,7 +153,7 @@ export default {
         { type: "select", label: "事务类型", prop: "transactionType", options: "TransTypeBaseForStr", colSpan: 12 },
         { type: "input", label: "单号前缀", prop: "numberPrefix", colSpan: 12 },
         { type: "input", label: "单号格式", prop: "numberFormat", colSpan: 12 },
-        { type: "input", valueType: Number, label: "单号流水长度", prop: "numberSerialLength", colSpan: 12 },
+        { type: "input", label: "单号流水长度", prop: "numberSerialLength", colSpan: 12, validType:'number' },
         { type: "input", label: "单号分隔符", prop: "numberSeparator", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],

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

@@ -133,7 +133,8 @@ export default {
         warehouseCode: null,
         pictureBlobName: null,
         step: null,
-        formFile:[]
+        formFile:[],
+        remark:null,
       },
       //编辑
       editFormData: {
@@ -152,7 +153,8 @@ export default {
         pictureBlobName: null,
         step: null,
         formFile:[],
-        concurrencyStamp: null
+        concurrencyStamp: null,
+        remark:null,
       },
       editOptions: {},
       CreateForm: [
@@ -161,13 +163,15 @@ export default {
           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: "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: "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 },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/systemManage/Calendar.vue

@@ -110,20 +110,24 @@ export default {
         company: '',
         module: '',
         status: 1,
-        timeRange: {
-          beginTime: "2021-11-16T06:52:26.560Z",
-          endTime: "2021-11-16T06:52:26.561Z"
-        },
+        beginTime: "",
+        endTime: "",
+        // timeRange: {
+        //   beginTime: "2021-11-16T06:52:26.560Z",
+        //   endTime: "2021-11-16T06:52:26.561Z"
+        // },
         remark: ''
       },
       //编辑
       editFormData: {
         module: null,
         status: 1,
-        timeRange: {
-          beginTime: "2021-11-16T06:52:26.560Z",
-          endTime: "2021-11-16T06:52:26.561Z"
-        },
+        beginTime: "",
+        endTime: "",
+        // timeRange: {
+        //   beginTime: "2021-11-16T06:52:26.560Z",
+        //   endTime: "2021-11-16T06:52:26.561Z"
+        // },
         concurrencyStamp: '',
         remark: ''
       },
@@ -134,11 +138,15 @@ export default {
         { type: "input", label: "模块", prop: "module", colSpan: 12 },
         { type: "select", label: "状态", prop: 'status', options: "calendarStatus", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "dateTime", label: "开始时间", prop: 'beginTime', colSpan: 12 },
+        { type: "dateTime", label: "结束时间", prop: 'endTime', colSpan: 12 },
       ],
       editForm: [
         { type: "input", label: "模块", prop: "module", disabled:"true", colSpan: 12 },
         { type: "select", label: "状态", prop: 'status', options: "calendarStatus", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
+        { type: "dateTime", label: "开始时间", prop: 'beginTime', colSpan: 12 },
+        { type: "dateTime", label: "结束时间", prop: 'endTime', colSpan: 12 },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/systemManage/userManage.vue

@@ -438,6 +438,7 @@ export default {
         ],
         password: [
           // { required: true, trigger: "blur", validator: validpassword },
+          { required: true, trigger: "blur", message: "请输入密码" },
           {
             min: 6,
             max: 16,