Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXi...

wanshenmean

12 小时以前 d14030746fcd0310d3c9b028fe2c0a5b78984eb6

 Code/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue

@@ -15,7 +15,7 @@
</template>

<script>
import extend from "@/extension/stock/stockInfo.js";
import extend from "@/extension/stock/stockInfo.jsx";
import {
  defineComponent,
  getCurrentInstance,
@@ -28,6 +28,7 @@
const TEXT = {
  pageName: "库存信息",
  palletCode: "托盘编号",
  stockStatus: "库存状态",
  locationCode: "货位编号",
  warehouse: "仓库",
  creator: "创建人",
@@ -63,26 +64,35 @@
      sortName: "id",
    });

    const editFormFields = ref({
     const editFormFields = ref({
      palletCode: "",
      palletType: 0,
      warehouseId: 0,
      mesUploadStatus: "",
      stockStatus: "",
      locationCode: "",
      locationDetails: ""
    });


    const editFormOptions = ref([
      [
        { field: "palletCode", title: TEXT.palletCode, type: "string" },
        { field: "stockStatus", title: TEXT.stockStatus, type: "select", dataKey: "stockStatusEmun", data: []},
        { field: "locationCode", title: TEXT.locationCode, type: "string" },
      ],
    ]);

    const searchFormFields = ref({
      palletCode: "",
      stockStatus: "",
      locationCode: "",
    });

    const searchFormOptions = ref([
      [
        { title: TEXT.palletCode, field: "palletCode", type: "like" },
        { title: TEXT.stockStatus, field: "stockStatus", type: "selectList", dataKey: "stockStatusEmun", data: [] },
        { title: TEXT.locationCode, field: "locationCode", type: "like" },
      ],
    ]);
@@ -104,6 +114,22 @@
        type: "string",
        width: 120,
        align: "left",
      },
      {
        field: "stockStatus",
        title: TEXT.stockStatus,
        type: "int",
        width: 120,
        align: "left",
        bind: { key: "stockStatusEmun", data: [] },
      },
      {
        field: "mesUploadStatus",
        title: "MES状态",
        type: "int",
        width: 120,
        align: "left",
        bind: { key: "mesUploadStatusEnum", data: [] },
      },
      {
        field: "locationCode",
@@ -223,7 +249,7 @@

    const loadStockStatusOptions = async () => {
      try {
        const result = await proxy.http.post("/api/Sys_Dictionary/GetVueDictionary", ["stockStatusEmun"]);
        const result = await proxy.http.post("/api/Sys_Dictionary/GetVueDictionary", ["stockStatusEmun", "mesUploadStatusEnum"]);
        const matched = (result || []).find((item) => item.dicNo === "stockStatusEmun");
        stockStatusOptions.value = matched ? matched.data || [] : [];
      } catch (error) {