修改bug

api/pda/material.js

@@ -15,3 +15,40 @@ export async function returnPage(params) {
   }
   return Promise.reject(data.message);
 }
+
+export async function returnPickPage(params) {
+  const data = await get(
+    Vue.prototype.apiUrl + `/mes/pickorder/returnPage`,
+    params,
+    true
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}
+
+export async function refundable(params) {
+  const data = await postJ(
+    Vue.prototype.apiUrl + `/mes/returnmaterials/refundable`,
+    params,
+    true
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}
+
+// 保存
+export async function save(params) {
+  const data = await postJ(
+    Vue.prototype.apiUrl + `/mes/returnmaterials/save`,
+    params,
+    true
+  );
+  if (data.code == 0) {
+    return data.data;
+  }
+  return Promise.reject(data.message);
+}

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.23",
+    "versionName" : "V1.0.3.24",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {
@@ -10,8 +10,9 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://192.168.1.110:18086/",
-                    // "target" : "http://192.168.1.125:18086/",
-                    "target" : "http://192.168.1.251:18086/",
+                    "target" : "http://192.168.1.125:18086/",
+                    // "target" : "http://192.168.1.251:18086/",
+                    // "target": "http://192.168.1.251:18186",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages.json

@@ -1792,6 +1792,20 @@
 				"navigationBarTextStyle": "white"
 			}
 		},
+		{
+			"path": "pages/pda/material_return/components/addMaterialReturn",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
+		{
+			"path": "pages/pda/material_return/components/choosePickOrder",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white"
+			}
+		},
 
 		{
 			"path": "pages/pda/feeding/outbound/index",

pages/pda/material_return/components/addMaterialReturn.vue

@@ -0,0 +1,450 @@
+<template>
+  <view class="page">
+    <!-- 顶部标题栏 -->
+    <uni-nav-bar
+      fixed
+      statusBar
+      left-icon="back"
+      title="新建退料单"
+      background-color="#157A2C"
+      color="#fff"
+      @clickLeft="back"
+    />
+
+    <view class="fixed-form">
+      <view class="form-section">
+        <view class="form-item">
+          <text class="label">退料单编号</text>
+          <uni-easyinput v-model="returnForm.code" disabled />
+        </view>
+        <view class="form-item">
+          <text class="label">退料单名称</text>
+          <uni-easyinput
+            v-model="returnForm.name"
+            placeholder="请输入领料单名称"
+          />
+        </view>
+        <view class="form-item">
+          <text class="label">退料单场景</text>
+          <zxz-uni-data-select
+            :localdata="sceneList"
+            v-model="returnForm.scene"
+            dataValue="value"
+            format="{label}"
+            dataKey="label"
+            filterable
+          />
+        </view>
+
+        <view class="form-item">
+          <text class="label">退料描述</text>
+          <uni-easyinput
+            v-model="returnForm.remark"
+            placeholder="请输入退料描述"
+          />
+        </view>
+        <view class="btn-add">
+          <button type="primary" size="mini" @click="choosePick">
+            选择领料单
+          </button>
+        </view>
+      </view>
+    </view>
+
+    <!-- 页面主体滚动区域 -->
+    <scroll-view class="material-scroll" scroll-y v-if="returnList.length != 0">
+      <view v-for="(item, idx) in returnList" :key="item.id">
+        <view class="form-section">
+          <view class="form-item">
+            <text
+              style="
+                width: 32%;
+                font-size: 28rpx;
+                color: #666;
+                margin-bottom: 4rpx;
+              "
+              >领料单编号：</text
+            >
+            <text style="font-size: 28rpx; color: #666">{{ item.code }}</text>
+          </view>
+
+          <view class="form-item">
+            <text
+              style="
+                width: 32%;
+                font-size: 28rpx;
+                color: #666;
+                margin-bottom: 4rpx;
+              "
+              >领料单创建时间：</text
+            >
+            <text style="font-size: 28rpx; color: #666">{{
+              item.createTime
+            }}</text>
+          </view>
+        </view>
+
+        <!-- 物料列表 -->
+        <view class="material-list">
+          <view
+            class="material-card"
+            v-for="(mate, index) in item.pickOutInList"
+            :key="mate.id"
+          >
+            <!-- 删除按钮 -->
+            <view class="delete-btn" @click.stop="removeItem(idx, index)">
+              <uni-icons
+                custom-prefix="iconfont"
+                type="icon-shanchu"
+                size="28"
+                color="#fa3534"
+              />
+            </view>
+
+            <!-- 卡片内容 -->
+            <view class="card-content">
+              <view class="card-row">
+                <text class="label">编码：</text>
+                <text class="value">{{ mate.code }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">名称：</text>
+                <text class="value">{{ mate.name }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">类型：</text>
+                <text class="value">{{
+                  typeName[Number(mate.rootCategoryLevelId)]
+                }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">型号：</text>
+                <text class="value">{{ mate.modelType }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">规格：</text>
+                <text class="value">{{ mate.specification }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">型号：</text>
+                <text class="value">{{ mate.modelType }}</text>
+              </view>
+              <view class="card-row" v-if="clientEnvironmentId == 3">
+                <text class="label">刻码：</text>
+                <text class="value">{{ mate.extInfo.engrave }}</text>
+              </view>
+              <view class="card-row" v-if="clientEnvironmentId == 3">
+                <text class="label">物料代号：</text>
+                <text class="value">{{ mate.extInfo.materielCode }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">关联工单编码：</text>
+                <text class="value">{{ mate.workOrderCode }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">工序：</text>
+                <text class="value">{{ mate.taskName }}</text>
+              </view>
+              <view class="card-row">
+                <text class="label">退还数量：</text>
+                <text class="value">{{ mate.quantity }}{{ mate.unit }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </scroll-view>
+
+    <!-- 底部操作按钮 -->
+    <view class="footer-btn">
+      <button @click="close" size="mini">取消</button>
+      <button type="primary" @click="save" size="mini">提交</button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getCode } from "@/api/pda/selfBuiltPickOrder.js";
+import { typeName } from "@/pages/pda/feeding/common.js";
+import { getByCode } from "@/api/pda/common.js";
+import { refundable, save } from "@/api/pda/material.js";
+
+export default {
+  data() {
+    return {
+      returnForm: {
+        code: "",
+        name: "",
+        scene: "",
+        remark: "",
+        type: 1,
+      },
+      returnList: [],
+      selectionData: [],
+      typeName,
+      sceneList: [],
+      clientEnvironmentId:
+        uni.getStorageSync("userInfo") &&
+        uni.getStorageSync("userInfo").clientEnvironmentId,
+    };
+  },
+
+  onLoad() {
+    this.getByCodeFn();
+    this.getOrderCode();
+  },
+
+  onShow() {
+    uni.$off("setSelectList");
+
+    uni.$on("setSelectList", (selectList, id) => {
+      let ids = [];
+      selectList.forEach((it) => {
+        ids.push(it.id);
+      });
+
+      refundable(ids).then((res) => {
+        this.returnList = res;
+        console.log(res, "返回的数据");
+      });
+    });
+  },
+
+  methods: {
+    async getByCodeFn() {
+      await getByCode("returnScenario").then((res) => {
+        let _arr = [];
+        res.map((item) => {
+          const key = Object.keys(item)[0];
+          const value = item[key];
+          _arr.push({ label: value, value: key });
+        });
+
+        this.sceneList = _arr;
+      });
+    },
+
+    async getOrderCode() {
+      this.returnForm.code = await getCode("pick_order_code");
+    },
+
+    deepCopy(obj, hash = new WeakMap()) {
+      if (obj === null) return null;
+      if (obj instanceof Date) return new Date(obj);
+      if (obj instanceof RegExp) return new RegExp(obj);
+      if (typeof obj !== "object" && typeof obj !== "function") return obj;
+      if (hash.has(obj)) return hash.get(obj);
+
+      const result = Array.isArray(obj) ? [] : {};
+      hash.set(obj, result);
+
+      return Object.keys(obj).reduce((acc, key) => {
+        acc[key] = this.deepCopy(obj[key], hash);
+        return acc;
+      }, result);
+    },
+
+    checkItem(row) {
+      row.checked = !row.checked;
+    },
+
+    limitNum(row) {
+      if (row.demandQuantity > row.measureQuantity) {
+        row.demandQuantity = row.measureQuantity;
+      }
+    },
+
+    removeItem(idx, index) {
+      this.returnList[idx].pickOutInList.splice(index, 1);
+    },
+
+    choosePick() {
+      const storageKey = Date.now() + "";
+      uni.setStorageSync(storageKey, this.returnList || []);
+      uni.navigateTo({
+        url: `/pages/pda/material_return/components/choosePickOrder?storageKey=${storageKey}`,
+      });
+    },
+
+    save() {
+      if (!this.returnForm.name) {
+        return uni.showToast({ title: "请输入退料单名称", icon: "none" });
+      }
+
+      if (this.returnList.length == 0) {
+        return uni.showToast({ title: "请选择领料单", icon: "none" });
+      }
+
+      let param = {
+        ...this.returnForm,
+        pickOrderList: this.returnList,
+      };
+
+      save(param).then((res) => {
+        uni.showToast({ title: "提交成功" });
+        setTimeout(() => {
+          uni.navigateBack();
+        }, 500);
+      });
+    },
+
+    close(refresh) {
+      uni.$emit("closePick", refresh);
+      uni.navigateBack();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background-color: #f7f7f7;
+}
+
+.scroll-container {
+  flex: 1;
+  padding: 10rpx 16rpx;
+  overflow-y: auto;
+}
+
+/* 固定表单区域 */
+.fixed-form {
+  position: sticky;
+  top: var(--status-bar-height, 0) + 88rpx; // 兼容有状态栏高度
+  z-index: 10;
+  background: #f7f7f7;
+  padding: 0 16rpx;
+}
+
+/* 可滚动物料列表 */
+.material-scroll {
+  flex: 1;
+  overflow-y: auto;
+  padding: 10rpx 16rpx;
+  margin-top: 16rpx;
+  padding-bottom: 115rpx;
+}
+
+/* 顶部表单 */
+.form-section {
+  background: #fff;
+  border-radius: 12rpx;
+  padding: 16rpx;
+  margin-bottom: 16rpx;
+
+  .form-item {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    margin-bottom: 12rpx;
+
+    .label {
+      width: 22%;
+      font-size: 28rpx;
+      color: #666;
+      margin-bottom: 4rpx;
+    }
+
+    uni-easyinput {
+      flex: 1;
+    }
+  }
+
+  .btn-add {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
+
+/* 物料列表卡片 */
+.material-list {
+  display: flex;
+  flex-direction: column;
+  gap: 16rpx;
+
+  .material-card {
+    position: relative;
+    background: #fff;
+    border-radius: 12rpx;
+    padding: 16rpx;
+    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+    transition: background 0.2s;
+
+    &:active {
+      background: #f5f5f5;
+    }
+
+    .delete-btn {
+      position: absolute;
+      top: 8rpx;
+      right: 8rpx;
+      width: 40rpx;
+      height: 40rpx;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      z-index: 10;
+      background: rgba(255, 255, 255, 0.8);
+      border-radius: 50%;
+      box-shadow: 0 1rpx 3rpx rgba(0, 0, 0, 0.2);
+    }
+
+    .card-content {
+      display: flex;
+      flex-direction: column;
+      gap: 8rpx;
+
+      .card-row {
+        display: flex;
+        // flex-wrap: wrap;
+        align-items: center;
+
+        .label {
+          width: 22%;
+          flex-shrink: 0;
+          font-size: 26rpx;
+          color: #666;
+          margin-bottom: 4rpx;
+        }
+        .input-row {
+          display: flex;
+          align-items: center;
+          gap: 8rpx;
+
+          uni-easyinput {
+            flex: 1; // 占满剩余空间
+            min-width: 0; // ✅允许收缩，防止换行
+          }
+
+          .unit {
+            flex-shrink: 0; // 单位宽度固定
+            font-size: 24rpx;
+            color: #666;
+          }
+        }
+      }
+    }
+  }
+}
+
+/* 底部固定按钮 */
+.footer-btn {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  background: #fff;
+  padding: 16rpx;
+  display: flex;
+  justify-content: space-between;
+  box-shadow: 0 -2rpx 6rpx rgba(0, 0, 0, 0.05);
+  z-index: 20;
+}
+
+/deep/ .uni-easyinput__content-input {
+  padding-left: 0;
+}
+</style>

pages/pda/material_return/components/choosePickOrder.vue

@@ -0,0 +1,306 @@
+<template>
+  <view class="content-box">
+    <!-- 顶部导航栏 -->
+    <uni-nav-bar
+      fixed
+      statusBar
+      left-icon="back"
+      title="领料单列表"
+      background-color="#157A2C"
+      color="#fff"
+      @clickLeft="back"
+    />
+
+    <!-- 搜索栏 -->
+    <view class="searchBox rx-bc">
+      <u--input
+        v-model="searchFrom.keyWord"
+        placeholder="请输入关键字搜索"
+        clearable
+        shape="round"
+        class="searchInput"
+      />
+      <u-button
+        @click="doSearch"
+        type="success"
+        size="small"
+        class="u-reset-button"
+        text="搜索"
+      />
+    </view>
+
+    <!-- 列表内容 -->
+    <scroll-view scroll-y class="list-scroll" @scrolltolower="scrolltolower">
+      <checkbox-group @change="checkboxChange">
+        <view
+          class="list-item rx-bs"
+          v-for="(item, index) in pickList"
+          :key="index"
+          @click="toggleCheck(item, index)"
+        >
+          <view class="item-left">
+            <checkbox
+              :value="item.code"
+              :checked="item.checked"
+              :disabled="item.disabled"
+              color="#157A2C"
+              @click="toggleCheck(item, index)"
+            />
+          </view>
+
+          <view class="item-right">
+            <view class="title">{{ item.code }}</view>
+
+            <view class="info-row">
+              <text>领料单编号</text>{{ item.code }}
+            </view>
+            <view class="info-row">
+              <text>关联工单编号</text>{{ item.joinWorkOrderCode }}
+            </view>
+            <view class="info-row">
+              <text>领料仓库</text>{{ item.joinWarehouseName }}
+            </view>
+            <view class="info-row"> <text>牌号</text>{{ item.brandNum }} </view>
+            <view class="info-row">
+              <text>类型</text>{{ typeMap[item.type] }}
+            </view>
+            <view class="info-row">
+              <text>状态</text>
+              <view :class="'tag tag-' + item.status">
+                {{ statusList[item.status] }}
+              </view>
+            </view>
+
+            <view class="info-row">
+              <text>领料时间</text>{{ item.createTime }}
+            </view>
+          </view>
+        </view>
+      </checkbox-group>
+
+      <!-- 无数据情况 -->
+      <view v-if="pickList.length == 0" style="margin-top: 20vh">
+        <u-empty iconSize="150" textSize="32" text="暂无数据"> </u-empty>
+      </view>
+    </scroll-view>
+
+    <!-- 底部操作栏 -->
+    <view class="bottom-wrapper rx-bc">
+      <checkbox
+        :checked="seletedAll"
+        @tap="_seletedAll"
+        color="#157A2C"
+        class="searchInput"
+      >
+        {{ seletedAll ? "取消全选" : "全选" }}
+      </checkbox>
+
+      <u-button
+        type="success"
+        size="small"
+        :disabled="!checkListLen"
+        @click="jumpAdd"
+      >
+        选择({{ checkListLen }})
+      </u-button>
+    </view>
+  </view>
+</template>
+
+<script>
+import { returnPickPage } from "@/api/pda/material.js";
+
+export default {
+  data() {
+    return {
+      pickList: [],
+      searchFrom: { keyWord: "" },
+      page: 1,
+      size: 10,
+      isEnd: false,
+      seletedAll: false,
+      statusList: ["未领料", "领料中", "已出库", "已驳回"],
+      typeMap: { 1: "自建领料", 2: "工单领料", 3: "委外领料" },
+    };
+  },
+
+  onShow() {
+    this.getList(true);
+  },
+
+  computed: {
+    checkListLen() {
+      return this.pickList.filter((i) => i.checked).length;
+    },
+  },
+
+  methods: {
+    async getList(reset = false) {
+      if (reset) {
+        this.page = 1;
+        this.pickList = [];
+        this.isEnd = false;
+      }
+
+      const params = {
+        pageNum: this.page,
+        size: this.size,
+        ...this.searchFrom,
+      };
+
+      const res = await returnPickPage(params);
+      this.pickList = [
+        ...this.pickList,
+        ...res.list.map((v) => ({ ...v, checked: false })),
+      ];
+      this.isEnd = this.pickList.length >= res.count;
+    },
+
+    scrolltolower() {
+      if (this.isEnd) return;
+      this.page++;
+      this.getList();
+    },
+
+    doSearch() {
+      this.getList(true);
+    },
+
+    checkboxChange(e) {
+      const values = e.detail.value;
+      this.pickList.forEach(
+        (item) => (item.checked = values.includes(item.code))
+      );
+      this.seletedAll = values.length === this.pickList.length;
+    },
+
+    toggleCheck(item, index) {
+      if (item.disabled) return;
+      this.pickList[index].checked = !item.checked;
+    },
+
+    _seletedAll() {
+      this.seletedAll = !this.seletedAll;
+      this.pickList.forEach(
+        (i) => (i.checked = this.seletedAll && !i.disabled)
+      );
+    },
+
+    jumpAdd() {
+      const selectionDataList = this.pickList.filter((i) => i.checked);
+      uni.$emit("setSelectList", selectionDataList);
+      uni.navigateBack();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+$content-padding: 24rpx;
+$theme: #157a2c;
+
+.content-box {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  background: #f6f6f6;
+}
+
+.searchBox {
+  padding: 20rpx $content-padding;
+  background: #fff;
+  display: flex;
+  gap: 20rpx;
+}
+
+.searchInput {
+  flex: 1; // ✅ 自动充满剩余空间
+  min-width: 540rpx; // ✅ 防止太窄（可调整）
+}
+
+.list-scroll {
+  flex: 1;
+  overflow: hidden;
+  padding-bottom: 10rpx;
+}
+
+.list-item {
+  background: #fff;
+  margin: 16rpx $content-padding;
+  padding: 22rpx;
+  border-radius: 14rpx;
+  display: flex;
+  gap: 26rpx;
+  transition: 0.2s;
+  &:active {
+    background: #eef7f0;
+  }
+}
+
+.item-left {
+  width: 60rpx;
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  padding-top: 12rpx;
+}
+
+.item-right {
+  flex: 1;
+  font-size: 26rpx;
+  color: #333;
+
+  .title {
+    font-weight: 700;
+    font-size: 30rpx;
+    color: $theme;
+    margin-bottom: 12rpx;
+  }
+
+  .info-row {
+    margin: 6rpx 0;
+    display: flex;
+    align-items: center;
+    text {
+      width: 160rpx;
+      color: $theme;
+      font-weight: 500;
+      display: inline-block;
+    }
+  }
+
+  .tag {
+    display: inline-block;
+    padding: 4rpx 14rpx;
+    border-radius: 8rpx;
+    font-size: 22rpx;
+    margin-left: 8rpx;
+    &-0 {
+      background: #ffe7e6;
+      color: #d8453d;
+    }
+    &-1 {
+      background: #fff7d9;
+      color: #c78a00;
+    }
+    &-2 {
+      background: #e6f7ec;
+      color: #1b9a40;
+    }
+    &-3 {
+      background: #f2f2f2;
+      color: #666;
+    }
+  }
+}
+
+.bottom-wrapper {
+  height: 90rpx;
+  background: #fff;
+  padding: 0 $content-padding;
+  border-top: 1rpx solid #eee;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>

pages/pda/material_return/index/index.vue

@@ -22,6 +22,7 @@
       </uni-section>
 
       <button class="search_btn" @click="doSearch">搜索</button>
+      <button class="search_btn" @click="addMaterialReturn">新增</button>
 
       <!-- <button class="search_btn" @click="addMaterial">新增</button> -->
     </view>
@@ -161,6 +162,14 @@ export default {
       });
     },
 
+    addMaterialReturn() {
+      uni.navigateTo({
+        url: `/pages/pda/material_return/components/addMaterialReturn`,
+      });
+
+      // pages/pda/material_return/components/addMaterialReturn
+    },
+
     produceFn() {
       // this.getList();
     },

pages/pda/selfBuiltPickOrder/components/addPick.vue

@@ -11,28 +11,28 @@
       @clickLeft="back"
     />
 
-    <!-- 页面主体滚动区域 -->
-    <scroll-view class="scroll-container" scroll-y="true" scroll-with-animation>
-      <!-- 顶部表单 -->
-      <view class="form-section">
-        <view class="form-item">
-          <text class="label">领料单编号</text>
-          <uni-easyinput v-model="pickForm.pickCode" disabled />
-        </view>
-        <view class="form-item">
-          <text class="label">领料单名称</text>
-          <uni-easyinput
-            v-model="pickForm.pickName"
-            placeholder="请输入领料单名称"
-          />
-        </view>
-        <view class="btn-add">
-          <button type="primary" size="mini" @click="openPicking">
-            添加物料
-          </button>
-        </view>
+    <!-- 顶部表单 -->
+    <view class="form-section">
+      <view class="form-item">
+        <text class="label">领料单编号</text>
+        <uni-easyinput v-model="pickForm.pickCode" disabled />
+      </view>
+      <view class="form-item">
+        <text class="label">领料单名称</text>
+        <uni-easyinput
+          v-model="pickForm.pickName"
+          placeholder="请输入领料单名称"
+        />
+      </view>
+      <view class="btn-add">
+        <button type="primary" size="mini" @click="openPicking">
+          添加物料
+        </button>
       </view>
+    </view>
 
+    <!-- 页面主体滚动区域 -->
+    <scroll-view class="scroll-container" scroll-y="true" scroll-with-animation>
       <!-- 物料列表 -->
       <view class="material-list">
         <view
@@ -200,10 +200,6 @@ export default {
       }, result);
     },
 
-    openPicking() {
-      // this.$refs.pickingRef.open(this.objPick);
-    },
-
     checkItem(row) {
       row.checked = !row.checked;
     },
@@ -335,6 +331,7 @@ export default {
   flex: 1;
   padding: 10rpx 16rpx;
   overflow-y: auto;
+  padding-bottom: 115rpx;
 }
 
 /* 顶部表单 */

pages/pda/workOrder/search/index.vue

@@ -506,7 +506,8 @@ export default {
       let params = {};
       console.log(this.classIds, "option", this.isType);
       if (this.isType == "feed") {
-        params.ids = [1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 26, 9, 28];
+        // params.ids = [1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 26, 9, 28];
+        params.ids = ["4, 5, 7, 8, 11, 14, 26"];
       } else if (this.isType == "pick") {
         // params.ids = [1, 5, 7, 8, 10, 13, 14, 23, 26, 9, 28]
         params.ids = [9, 23, 2, 1, 4, 14, 5, 8, 16, 13, 15, 6, 10, 22];
@@ -515,7 +516,7 @@ export default {
         if (this.clientEnvironmentId == 2) {
           params["ids"] = [7];
         } else {
-          params["ids"] = [4, 7];
+          params["ids"] = [4, 5, 7, 8, 11, 14, 26];
         }
       } else if (this.isType == "zdy") {
         params["ids"] = JSON.parse(this.classIds);