new 7.24

config/routes.js

@@ -211,11 +211,11 @@ export default [
         name: '供应商管理',
         component: './platform/Provide',
       },
-      {
-        path: '/store/customer',
-        name: '客户管理',
-        component: './platform/Custom',
-      },
+      // {
+      //   path: '/store/customer',
+      //   name: '客户管理',
+      //   component: './platform/Custom',
+      // },
       {
         path: '/store/location',
         name: '库位管理',

src/pages/craft/Materiel/fields.js

-import regValue from "@/utils/regValue";
-import {
-  unitSelect,
-  serialNumberRuleSelect,
-  processLineSelect,
-  bmTableSelect,
-} from "@/services/craft";
+import { selectionBoxAll, StoreAreaselection ,factorySelect,storeselectionBoxAll} from "@/services/system.js";
 import { doFetch } from "@/utils/doFetch";
 
 export default {
@@ -139,10 +133,10 @@ export default {
     type: "select",
     title: "默认仓库",
     name: ["storeId"],
+    linked:true,
     required: false,
     options: {
-      database: (params) =>
-        doFetch({ url: "/ngic-auth/sysStore/selectionBoxAll", params }),
+      database: selectionBoxAll,
       params: {},
     },
   },
@@ -151,11 +145,46 @@ export default {
     type: "select",
     title: "默认库区",
     name: ["storeAreaId"],
+    belinked: {
       options: {
-      database: (params) =>
-        doFetch({ url: "/ngic-auth/sysStoreArea/selection", params }),
-      params: {},
+        database: StoreAreaselection,
+        params: {
+          storeId: "linked",
+        },
       },
+    },
+    linked: true,
     required: false,
   },
+
+  // factoryId: {
+  //   value: null,
+  //   type: "select",
+  //   title: "所属工厂",
+  //   name: ["factoryId"],
+  //   required: true,
+  //   options: {
+  //     database: factorySelect,
+  //     params: {},
+  //   },
+  //   linked: true,
+  // },
+  // storeId: {
+  //   value: null,
+  //   type: "select",
+  //   title: "所属仓库",
+  //   name: ["storeId"],
+  //   required: true,
+  //   linked: true,
+  //   belinked: {
+  //     options: {
+  //       database: storeselectionBoxAll,
+  //       params: {
+  //         factoryId: "linked",
+  //       },
+  //     },
+  //   },
+  // },
+
+
 };

src/pages/system/Reservoir/fields.js

 import { doFetch } from "@/utils/doFetch";
-import { factorySelect } from "@/services/system";
+import {
+  factorySelect,
+  shopSelectByFactory,
+  StoreAreaselection,
+  storeselectionBoxAll,
+} from "@/services/system";
 export default {
   storePositionCode: {
     value: null,
@@ -36,8 +41,7 @@ export default {
     linked: true,
     belinked: {
       options: {
-        database: () =>
-          doFetch({ url: "/ngic-auth/sysStore/selectionBox", params: {} }),
+        database: storeselectionBoxAll,
         params: {
           factoryId: "linked",
         },
@@ -52,8 +56,7 @@ export default {
     required: true,
     belinked: {
       options: {
-        database: () =>
-          doFetch({ url: "/ngic-auth/sysStoreArea/selection", params: {} }),
+        database: StoreAreaselection,
         params: {
           storeId: "linked",
         },
@@ -61,6 +64,7 @@ export default {
     },
     linked: true,
   },
+
   status: {
     value: 1,
     type: "select",

src/pages/system/Reservoir/index.jsx

@@ -394,7 +394,6 @@ const Materiel = (props) => {
               params = {
                 ...firstValues,
                 ...difrid,
-                factoryId: materieTypeId,
                 materieProductUnitList,
               };
               url = "/ngic-auth/sysStorePosition/save";

src/pages/system/Station/fields.js

@@ -6,11 +6,11 @@ import {
 } from "@/services/system";
 import regValue from "@/utils/regValue";
 export default {
-  stationCode: {
+  stationNo: {
     value: null,
     type: "input",
     title: "工位编号",
-    name: ["stationCode"],
+    name: ["stationNo"],
     required: true,
   },
   stationName: {
@@ -32,78 +32,23 @@ export default {
     },
     linked: true,
   },
-  shopId: {
-    value: null,
-    type: "select",
-    title: "所属车间",
-    name: ["shopId"],
-    required: true,
-    belinked: {
-      options: {
-        database: shopSelectByFactory,
-        params: { factoryId: "linked" },
-      },
-    },
-    linked: true,
-  },
-  sectionId: {
-    value: null,
-    type: "select",
-    title: "所属工段",
-    name: ["sectionId"],
-    required: true,
-    belinked: {
-      options: {
-        database: sectionSelectByShop,
-        params: { shopId: "linked", factoryId: "linked" },
-      },
-    },
-  },
-  productionLineId: {
-    value: null,
-    type: "select",
-    title: "所属产线",
-    name: ["productionLineId"],
-    required: true,
-    belinked: {
-      options: {
-        database: productionLineSelectByShop,
-        params: { shopId: "linked", factoryId: "linked" },
-      },
-    },
-  },
-  stationType: {
+  remark: {
     value: null,
     type: "select",
-    title: "工位类型",
-    name: ["stationType"],
+    title: "启用状态",
+    name: ["remark"],
     required: false,
     options: [
       {
-        label: "待加工",
-        value: 0,
+        label: "启用",
+        value: 1,
       },
       {
-        label: "在加工",
-        value: 1,
+        label: "停用",
+        value: 2,
       },
     ],
-  },
-  stationDifficultyCoefficient: {
-    value: null,
-    type: "inputnumber",
-    title: "难易系数",
-    name: ["stationDifficultyCoefficient"],
-    required: false,
-    ...regValue(null, 6, 3),
-  },
-  capacity: {
-    value: null,
-    type: "inputnumber",
-    title: "能力",
-    name: ["capacity"],
-    required: false,
-    ...regValue(null, 6, 3),
+    col: { span: 24 },
   },
   remark: {
     value: null,
@@ -111,6 +56,7 @@ export default {
     title: "描述",
     name: ["remark"],
     required: false,
+
     col: { span: 24 },
   },
 };

src/pages/system/Station/index.jsx

@@ -97,8 +97,8 @@ const Station = (props) => {
     columns = [
       {
         title: "工位编号",
-        dataIndex: "stationCode",
-        key: "stationCode",
+        dataIndex: "stationNo",
+        key: "stationNo",
       },
       {
         title: "工位名称",
@@ -128,24 +128,13 @@ const Station = (props) => {
         },
       },
       {
-        title: "所属工厂",
+        title: "启用状态",
         dataIndex: "factoryName",
         key: "factoryName",
-      },
-      {
-        title: "所属车间",
-        dataIndex: "shopName",
-        key: "shopName",
-      },
-      {
-        title: "所属工段",
-        dataIndex: "sectionName",
-        key: "sectionName",
-      },
-      {
-        title: "所属产线",
-        dataIndex: "productionLineName",
-        key: "productionLineName",
+        search:false,
+        render: (_, row) => {
+          return row?.status ? '启用' : '禁用'
+        }
       },
       {
         title: "描述",

src/pages/system/Store/index.jsx

@@ -136,7 +136,6 @@ const Store = (props) => {
         for (let i in defaultFields) {
           defaultFields[i].value = record[i];
         }
-        console.log(defaultFields);
         dispatch({ type: "edit", fields: defaultFields, curitem: record });
       }),
       getPrem("sysDepartment_deleteById", action, "删除", null, {

src/services/system.js

@@ -36,6 +36,13 @@ export async function storeselectionBoxAll(params) {
     data: params,
   });
 }
+//库区下拉
+export async function StoreAreaselection(params) {
+  return request(`/srwms/ngic-auth/sysStoreArea/selection`, {
+    method: "POST",
+    data: params,
+  });
+}
 //根据工厂id查询车间下拉
 export async function storeselectionBox(params) {
   return request(`/srwms/ngic-auth/sysStore/selectionBox`, {