update 0710反馈

2023-07-14 15:25:17 +08:00
parent 5b9e03a5a7
commit 7ce44fadd9
8 changed files with 117 additions and 55 deletions
--- a/src/views/modules/pms/bomDetails/config.js
+++ b/src/views/modules/pms/bomDetails/config.js
@@ -139,11 +139,12 @@ export default function () {
      props: [
        { type: "index", label: "序号" },
        { prop: "material", label: "原料", isEditField: true },
+        { prop: "materialDesc", label: "原料描述", isEditField: true },
+        { prop: "materialName", label: "中文名称", isEditField: true },
        { width: 130, prop: "qty", label: "配方原料重量", filter: (val) => (!!val ? val + " kg" : "-"), isEditField: true },
        { width: 130, prop: "sumqty", label: "配方总重量", filter: (val) => (!!val ? val + " kg" : "-"), isEditField: true },
-        { prop: "percent", label: "配比 [%]", filter: (val) => (!!val ? val + " %" : "-"), isEditField: true },
-        { prop: "remark", label: "备注", isEditField: true },
-        { prop: "materialDesc", label: "原料描述", isEditField: true },
+        // { prop: "percent", label: "配比 [%]", filter: (val) => (!!val ? val + " %" : "-"), isEditField: true },
+        // { prop: "remark", label: "备注", isEditField: true },
        { prop: "createTime", label: "添加时间", filter: timeFilter },
        {
          prop: "operations",
@@ -169,11 +170,12 @@ export default function () {
        [
          {
            select: true,
-            label: "物料",
+            label: "原料",
            prop: "materialId",
            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请选择物料", filterable: true },
+            elparams: { placeholder: "请选择原料", filterable: true },
            options: [],
+            optionLabel: 'code',
            customLabel: 'description',
            fetchData: () => this.$http.get("/pms/material/page", { params: { limit: 999, page: 1 } }),
          },
@@ -181,10 +183,10 @@ export default function () {
        [
          {
            input: true,
-            label: "物料重量[kg]",
+            label: "原料重量[kg]",
            prop: "qty",
            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入物料重量" },
+            elparams: { placeholder: "请输入原料重量" },
          },
        ],
        [
--- a/src/views/modules/pms/material/components/ListViewWithHead.vue
+++ b/src/views/modules/pms/material/components/ListViewWithHead.vue
@@ -112,7 +112,7 @@ export default {
      topBtnConfig: null,
      totalPage: 100,
      page: 1,
-      size: 20, // 默认20
+      size: 100, // 默认20
      dataList: [],
      tableLoading: false,
      subdialogVisible: false,
--- a/src/views/modules/pms/materialStorageDynamic/config.js
+++ b/src/views/modules/pms/materialStorageDynamic/config.js
@@ -34,6 +34,7 @@ export default function () {
      ],
    },
  ];
+  tableProps.defaultPageSize = 100;

  const headFormFields = [
    {
@@ -108,6 +109,7 @@ export default function () {
            prop: "materialId",
            fetchData: () => this.$http.get("/pms/material/page", { params: { key: '', limit: 999, page: 1 } }),
            options: [],
+            optionLabel: 'code',
            customLabel: 'description',
            rules: { required: true, message: "必填项不能为空", trigger: "change" },
            elparams: { filterable: true, placeholder: "请选择原料" },
--- a/src/views/modules/pms/materialStorageQty/index.vue
+++ b/src/views/modules/pms/materialStorageQty/index.vue
@@ -3,6 +3,17 @@
    <section class="container-title" style="margin-top: 10px; display: flex; align-items: center">
      <div class="brand-color-line"></div>
      <span style="line-height: 20px">料仓料位</span>
+      <!-- 导航器  -->
+      <div class="float-right__pagination" style="flex: 1 auto; display:flex; align-items:center; justify-content: flex-end;">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handlePageChange"
+          :current-page.sync="page"
+          :page-size.sync="limit"
+          :page-sizes="[20, 50, 100, 200, 1000]"
+          :total="totalPage"
+          layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+      </div>
    </section>
    <section class="container-content">
      <div class="dialy-storage" v-if="dailyStorage.length">
@@ -17,8 +28,7 @@
            padding-left: 16px;
            top: 10px;
            left: -16px;
-          "
-        >
+          ">
          日料仓
        </h3>
        <div class="storage-list" style="padding: 12px 0; display: flex; flex-wrap: wrap">
@@ -31,8 +41,7 @@
            :material="st.material ?? '默认物料'"
            :total="2"
            :unit-value="st.unitDictValue"
-            :ratio="st.ratio"
-          />
+            :ratio="st.ratio" />
        </div>
      </div>
      <div class="middle-storage" v-if="middleStorage.length">
@@ -47,8 +56,7 @@
            padding-left: 16px;
            top: 10px;
            left: -16px;
-          "
-        >
+          ">
          中间仓
        </h3>
        <div class="middle-list" style="padding: 12px 0; display: flex; flex-wrap: wrap">
@@ -61,8 +69,7 @@
            :material="st.material ?? '默认物料'"
            :total="2"
            :unit-value="st.unitDictValue"
-            :ratio="st.ratio"
-          />
+            :ratio="st.ratio" />
        </div>
      </div>
      <div class="unknown-storage" v-if="unknownStorage.length">
@@ -77,8 +84,7 @@
            padding-left: 16px;
            top: 10px;
            left: -16px;
-          "
-        >
+          ">
          未知仓
        </h3>
        <div class="unknown-list" style="padding: 12px 0; display: flex; flex-wrap: wrap">
@@ -91,8 +97,7 @@
            :material="st.material ?? '默认物料'"
            :total="2"
            :unit-value="st.unitDictValue"
-            :ratio="st.ratio"
-          />
+            :ratio="st.ratio" />
        </div>
      </div>
    </section>
@@ -108,6 +113,9 @@ export default {
  props: {},
  data() {
    return {
+      limit: 100,
+      page: 1,
+      totalPage: 0,
      middleStorage: [],
      dailyStorage: [],
      unknownStorage: [],
@@ -123,12 +131,25 @@ export default {
      this.unknownStorage.splice(0);
    },

+    handleSizeChange(val) {
+      this.page = 1;
+      this.limit = val;
+      this.getList();
+    },
+
+    handlePageChange(val) {
+      this.getList();
+    },
+
    getList(storageType) {
      this.resetAllStorages();
-      const params = storageType ? { limit: this.limit, page: this.page, typeDictValue: storageType } : { limit: this.limit, page: this.page };
+      const params = storageType
+        ? { limit: this.limit, page: this.page, typeDictValue: storageType }
+        : { limit: this.limit, page: this.page };
      this.$http.get("/pms/materialStorageDynamic/page", { params }).then(({ data: res }) => {
        if (res.code === 0) {
          if ("list" in res.data) {
+            this.totalPage = res.data.total;
            res.data.list.forEach((item) => {
              if (item.typeDictValue === "1") {
                this.dailyStorage.push(item);
@@ -169,4 +190,8 @@ export default {
  background: #0b58ff;
  /* position: absolute; */
 }
+
+.float-right__pagination >>> .el-pagination {
+  margin: 0;
+}
 </style>
--- a/src/views/modules/pms/shapeStep/config.js
+++ b/src/views/modules/pms/shapeStep/config.js
@@ -105,7 +105,7 @@ export default function () {
            label: "工艺编码",
            prop: "code",
            rules: { required: true, message: "必填项不能为空", trigger: "blur" },
-            elparams: { placeholder: "请输入混料程序编码" }, // disabled: true },
+            elparams: { placeholder: "请输入混料工艺编码" }, // disabled: true },
          },
        ],
        // [
@@ -138,7 +138,7 @@ export default function () {
        // { type: 'index', label: '序号' },
        // { prop: "createTime", label: "添加时间", filter: timeFilter },
        { prop: "name", label: "参数名称", isEditField: true },
-        { prop: "code", label: "参数编码", isEditField: true },
+        // { prop: "code", label: "参数编码", isEditField: true },
        // { prop: "specifications", label: "规格", isEditField: true },
        { width: 80, prop: "value", label: "参数值", isEditField: true },
        // { prop: "valueFloor", label: "参数值下限", isEditField: true },