update [ty] 原料|上料-料仓

public/index.html

@@ -38,9 +38,9 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.103:8080/pms-am';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.49:8080/pms-am'; // tengyun
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.62:8080/pms-am'; // tao
-    window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
+    // window.SITE_CONFIG['apiURL'] = 'http://192.168.1.21:8080/pms-am'; // xv
     </script>
   <% } %>
   <!-- 集成测试环境 -->

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

@@ -11,8 +11,9 @@ export default function () {
     { prop: "code", label: "原料编码" },
     { prop: "typeDictValue", label: "类别", filter: dictFilter("material_category") }, // subcomponent: {/** TODO: create a new component for this option */} },
     { prop: "type", label: "原料类型" },
-    { prop: "enName", label: "英文名称" },
+    { prop: "brandsOwner", label: "品牌" },
-    { prop: "enAb", label: "英文缩写" },
+    { prop: "dosLow", label: "加料下限" },
+    { prop: "dosHigh", label: "加料上限" },
     { prop: "density", label: "堆积密度" },
     // { prop: "description", label: "详情", subcomponent: TableTextComponent },
     { prop: "description", label: "原料描述", },
@@ -143,19 +144,42 @@ export default function () {
         [
           {
             input: true,
-            label: "英文名称",
+            label: "加料下限",
-            prop: "enName",
+            prop: "dosLow",
-            elparams: { placeholder: "请输入英文名称" },
+            rules: [
+              { required: true, message: "必填项不能为空", trigger: "blur" },
+              { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) },
+            ],
+            elparams: { placeholder: "请输入加料下限" },
           },
           {
             input: true,
-            label: "缩写",
+            label: "加料上限",
-            prop: "enAb",
+            prop: "dosHigh",
-            elparams: { placeholder: "请输入缩写" },
+            rules: [
-          },
+              { required: true, message: "必填项不能为空", trigger: "blur" },
-          { input: true, label: "原料描述", prop: "description", elparams: { placeholder: "原料描述" } },
+              { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) },
+            ],
+            elparams: { placeholder: "请输入加料上限" },
+          },
+          {
+            input: true,
+            label: "品牌",
+            prop: "brandsOwner",
+            elparams: { placeholder: "请输入品牌" },
+          },
+        ],
+        [
+          // {
+          //   input: true,
+          //   label: "缩写",
+          //   prop: "enAb",
+          //   elparams: { placeholder: "请输入缩写" },
+          // },
+          { input: true, label: "原料描述", prop: "description", elparams: { placeholder: "原料描述" } },
+          { input: true, label: "中文描述", prop: "remark", elparams: { placeholder: "备注" } },
+          {}
         ],
-        [{ input: true, label: "中文描述", prop: "remark", elparams: { placeholder: "备注" } }],
       ],
       operations: [
         { name: "add", label: "保存", type: "primary", permission: "pms:material:save", showOnEdit: false },

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

@@ -14,8 +14,8 @@ export default function () {
     // { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
     { prop: "materialTypeDictValue", label: "物料类型", filter: dictFilter('material_category') },
     { prop: "density", label: "物料堆积密度" },
-    { prop: "dosHigh", label: "加料上限" },
     { prop: "dosLow", label: "加料下限" },
+    { prop: "dosHigh", label: "加料上限" },
     { prop: "description", label: "描述" },
     { prop: "remark", label: "备注" },
     {
@@ -79,7 +79,10 @@ export default function () {
             prop: "code",
             rules: { required: true, message: "必填项不能为空", trigger: "blur" },
             elparams: { placeholder: "请输入料仓编码" },
-          }, {
+          },
+        ],
+        [
+          {
             select: true,
             label: "料仓类型",
             prop: "typeDictValue",
@@ -90,7 +93,37 @@ export default function () {
               { label: '日料仓', value: '1' },
             ],
             rules: { required: true, message: "必填项不能为空", trigger: "change" },
+            elparams: { placeholder: "请选择料仓类型" },
           },
+          {
+            select: true,
+            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: "请选择物料" },
+          },
+          // {
+          //   input: true,
+          //   label: "加料下限",
+          //   prop: "dosLow",
+          //   rules: [
+          //     { required: true, message: "必填项不能为空", trigger: "blur" },
+          //     { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) },
+          //   ],
+          //   elparams: { placeholder: "请输入加料下限" },
+          // },
+          // {
+          //   input: true,
+          //   label: "加料上限",
+          //   prop: "dosHigh",
+          //   rules: [
+          //     { required: true, message: "必填项不能为空", trigger: "blur" },
+          //     { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) },
+          //   ],
+          //   elparams: { placeholder: "请输入加料上限" },
+          // },
         ],
         [{ textarea: true, label: "描述信息", prop: "description", elparams: { placeholder: "描述信息" } }],
         [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],