bugfix

src/components/DialogJustForm.vue

@@ -445,7 +445,8 @@ export default {
               if (res.code === 0) {
                 this.$message.success(method === "POST" ? "添加成功" : "更新成功");
                 this.$emit("refreshDataList");
-                if (method === "POST") this.handleClose();
+                // if (method === "POST") this.handleClose();
+                this.handleClose();
               } else {
                 this.$message({
                   message: `${res.code}: ${res.msg}`,

src/views/modules/pms/materialStorage/config.js

@@ -12,11 +12,11 @@ export default function () {
     { prop: "code", label: "料仓编码" },
     { prop: "typeDictValue", label: "料仓类型", filter: dictFilter('liaocang') },
     // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
-    { prop: "material", label: "物料" },
+    // { prop: "material", label: "物料" },
-    { prop: "materialTypeDictValue", label: "物料类型", filter: dictFilter('material_category') },
+    // { prop: "materialTypeDictValue", label: "物料类型", filter: dictFilter('material_category') },
-    { prop: "density", label: "物料堆积密度" },
+    // { prop: "density", label: "物料堆积密度" },
-    { prop: "dosLow", label: "加料下限" },
+    // { prop: "dosLow", label: "加料下限" },
-    { prop: "dosHigh", label: "加料上限" },
+    // { prop: "dosHigh", label: "加料上限" },
     { prop: "description", label: "描述" },
     { prop: "remark", label: "备注" },
     {
@@ -74,6 +74,8 @@ export default function () {
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入料仓名称" },
           },
+        ],
+        [
           {
             input: true,
             label: "料仓编码",
@@ -96,15 +98,15 @@ export default function () {
             rules: { required: true, message: "必填项不能为空", trigger: "change" },
             elparams: { placeholder: "请选择料仓类型" },
           },
-          {
+          // {
-            select: true,
+          //   select: true,
-            label: "物料",
+          //   label: "物料",
-            prop: "materialId",
+          //   prop: "materialId",
-            fetchData: () => this.$http.get("/pms/material/page", { params: { key: '', limit: 999, page: 1 } }),
+          //   fetchData: () => this.$http.get("/pms/material/page", { params: { key: '', limit: 999, page: 1 } }),
-            options: [],
+          //   options: [],
-            rules: { required: true, message: "必填项不能为空", trigger: "change" },
+          //   rules: { required: true, message: "必填项不能为空", trigger: "change" },
-            elparams: { placeholder: "请选择物料" },
+          //   elparams: { placeholder: "请选择物料" },
-          },
+          // },
           // {
           //   input: true,
           //   label: "加料下限",

src/views/modules/pms/materialStorageDynamic/config.js

@@ -12,9 +12,9 @@ export default function () {
     { prop: "code", label: "料仓编码" },
     { prop: "typeDictValue", label: "料仓类型", filter: dictFilter('liaocang') },
     // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
-    { prop: "material", label: "物料" },
+    { prop: "material", label: "原料" },
-    { prop: "materialTypeDictValue", label: "物料类型", filter: dictFilter('material_category') },
+    { prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter('material_category') },
-    { prop: "density", label: "物料堆积密度" },
+    { prop: "density", label: "原料堆积密度" },
     { prop: "dosLow", label: "加料下限" },
     { prop: "dosHigh", label: "加料上限" },
     { prop: "description", label: "描述" },
@@ -46,16 +46,16 @@ export default function () {
         name: "查询",
       },
     },
-    {
+    // {
-      button: {
+    //   button: {
-        type: "primary",
+    //     type: "primary",
-        name: "新增",
+    //     name: "新增",
-        permission: "pms:materialStorage:save"
+    //     permission: "pms:materialStorage:save"
-      },
+    //   },
-      bind: {
+    //   bind: {
-        plain: true,
+    //     plain: true,
-      }
+    //   }
-    },
+    // },
   ];
 
   /**
@@ -98,12 +98,12 @@ export default function () {
           },
           {
             select: true,
-            label: "物料",
+            label: "原料",
             prop: "materialId",
             fetchData: () => this.$http.get("/pms/material/page", { params: { key: '', limit: 999, page: 1 } }),
             options: [],
             rules: { required: true, message: "必填项不能为空", trigger: "change" },
-            elparams: { placeholder: "请选择物料" },
+            elparams: { placeholder: "请选择原料" },
           },
           // {
           //   input: true,

src/views/modules/pms/materialUpload/config.js

@@ -12,7 +12,8 @@ export default function () {
     { prop: "endTime", label: "结束上料时间", filter: timeFilter },
     { prop: "material", label: "物料" },
     { prop: "qty", label: "上料数量" },
-    { prop: "storeCode", label: "料仓" },
+    // { prop: "storeCode", label: "料仓" },
+    { prop: "storeName", label: "料仓" },
     { prop: "upPos", label: "上料位点" },
     // { prop: "typeDictValue", label: "过渡车", filter: val => ['否', '是'][val] },
     // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
@@ -59,13 +60,13 @@ export default function () {
   const headFormFields = [
     {
       prop: "materialId",
-      label: "物料",
+      label: "原料",
       // default: { value: "" },
       select: [],
       // 绑定数据获取函数
       fn: () => this.$http.get("/pms/material/page", { params: { page: 1, limit: 999 } }),
       bind: {
-        placeholder: "请选择物料",
+        placeholder: "请选择原料",
         filterable: true,
       },
     },