JLHWEB:1、修复详情页提示文件报错提示；2、修正床垫清单字段名称

JLHWEB/src/components/LjDetail/components/BaseForm.vue

@@ -5,6 +5,7 @@
       :model="searchParam"
       :label-position="publicAttr.labelPosition"
       :label-width="publicAttr.labelWidth"
+      hide-required-asterisk
       :rules="rules"
       @submit.prevent
       @keyup.enter="handleKeyDown"
@@ -2631,6 +2632,13 @@ defineExpose({
     color: $color-text-primary-text;
     padding-right: $space-b1;
   }
+  :deep(.el-form-item) {
+    &.is-required {
+      .el-form-item__label {
+        color: var(--lj-color-dust-red-5) !important;
+      }
+    }
+  }
   // &:not(.is-editable) {
   //   :deep(.el-form-item) {
   //     .el-form-item__label {

JLHWEB/src/components/LjDetail/index.vue

@@ -252,7 +252,7 @@ const loadDwLayout = (data: any) => {
  * @param params
  */
 const defaultRequest = (params: any) => {
-  if (!props.requestAuto) return undefined;
+  if (!props.requestAuto || !props.dsname) return undefined;
   console.log("defaultRequest props, params :>> ", props, props.dsname, params);
   let newParams: any = {};
   params.pageNum && (newParams.pageindex = params.pageNum);
@@ -263,7 +263,7 @@ const defaultRequest = (params: any) => {
   delete params.orderstr;
   newParams.queryParams = JSON.parse(JSON.stringify(params));
 
-  newParams.dsname = props.dsname ?? dwnameBasic.value;
+  newParams.dsname = props.dsname;
   return CommonDynamicSelect(newParams, dwnameBasic.value);
 };
 const defaultDataCallback = (data: any) => {

JLHWEB/src/languages/modules/zh-cn/sys.json

@@ -93,6 +93,7 @@
     "empty": "未发现默认布局模版：",
     "singleEmpty": "未发现用户个性布局模版",
     "settings": "设置为默认布局",
+    "settingsAndDelete": "重置默认布局（删除全部个性布局）",
     "successToLayout": "成功设置默认布局",
     "addMenu": "常用标记",
     "removeMenu": "移除标记"

JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -715,7 +715,8 @@ export const useHooks = (t?: any) => {
         editable: ALLOW_EDIT_STATE,
         group: "单据信息",
         order: 4,
-        span: 1
+        span: 1,
+        rules: [{ required: true, message: "系统物料名称不能为空" }]
       }
     },
     {
@@ -815,23 +816,23 @@ export const useHooks = (t?: any) => {
     },
     {
       field: "erp_mtrlengname",
-      title: "旧床垫编码",
+      title: "英文名称",
       basicinfo: {
         el: "input",
         editable: ALLOW_EDIT_STATE,
         group: "单据信息",
-        order: 7,
+        order: 8,
         span: 1
       }
     },
     {
       field: "old_mtrlname",
-      title: "旧物料名称",
+      title: "旧编码",
       basicinfo: {
         el: "input",
         editable: ALLOW_EDIT_STATE,
         group: "单据信息",
-        order: 8,
+        order: 7,
         span: 1
       }
     }