Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

haoxuan

2023-10-19 f73080c69548aba58d6a58e7e049d8eb79f9f7ed

 src/views/operate/scrap/index.vue

@@ -16,22 +16,43 @@
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        >
          <template slot="tableButton">
            <el-table-column fixed="right" label="操作" width="100">
              <template slot-scope="scope">
                <el-button
                  @click="examineClick(scope.row)"
                  type="text"
                  size="small"
                  >查看</el-button
                >
                <el-button type="text" v-if="scope.row.status!=4" size="small" @click="editClick(scope.row)">编辑</el-button>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        <PagerView
          class="page"
          :pager-options="pagerOptions"
          v-on="pagerEvents"
        />
      </div>
    </div>
    <!-- 新建/编辑 -->
    <AddScrapDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
    <AddScrapDialog
      v-if="editConfig.visible"
      :editCommonConfig="editConfig"
    />
  </div>
</template>

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getDisuseList } from "@/api/operate/scrap"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import { getDisuseList } from "@/api/operate/scrap";
// import DetailProduct from "@/views/productManage/product/DetailProduct"
import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog"
import AddScrapDialog from "@/views/operate/scrap/AddScrapDialog";

export default {
  name: "ScrapView",
@@ -46,16 +67,29 @@
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {}
        infomation: {},
        showEdit:false,
      },
      keyword: ""
    }
      keyword: "",
    };
  },
  created() {
    this.setTable()
    this.getData()
    this.setTable();
    this.getData();
  },
  methods: {
    // 查看
    examineClick(row) {
      this.editConfig.title = "查看";
      this.editConfig.infomation = { ...row };
      this.editConfig.visible = true;
    },
    editClick(row){
      console.log(row,"编辑")
      this.editConfig.title = "编辑";
      this.editConfig.infomation = { ...row };
      this.editConfig.visible = true;
    },
    setTable() {
      this.tableList = {
        tableInfomation: [],
@@ -63,61 +97,61 @@
        selectIndex: true,
        showcol: this.showcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol)
      }
      let allcol = []
        tableColumn: this.setTableColumn(this.showcol),
      };
      let allcol = [];
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
        if (!this.tableList.tableColumn[i].default) {
          const label = this.tableList.tableColumn[i].label
          allcol.push(label)
          const label = this.tableList.tableColumn[i].label;
          allcol.push(label);
        }
      }
      this.tableList.allcol = allcol
      this.tableList.allcol = allcol;
    },
    setTableColumn(showcol) {
      console.log(showcol)
      console.log(showcol);
      let tableColumn = [
        {
          label: "单号",
          prop: "number",
          isShowColumn: true,
          default: true
          default: true,
        },
        {
          label: "日期",
          prop: "operationDate",
          isShowColumn: true,
          default: true
          default: true,
        },
        {
          label: "产品",
          prop: "productName",
          isShowColumn: true,
          default: true
          default: true,
        },
        {
          label: "数量",
          prop: "amount",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "计量单位",
          prop: "unit",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "源位置",
          prop: "from",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "报废位置",
          prop: "to",
          isShowColumn: true,
          default: false
          default: false,
        },
        {
          label: "状态",
@@ -127,61 +161,61 @@
          default: false,
          status: true,
          isCallMethod: true,
          getCallMethod: this.getStatus
        }
      ]
      return tableColumn
          getCallMethod: this.getStatus,
        },
      ];
      return tableColumn;
    },
    selTableCol(val) {
      this.showcol = val
      this.tableList.tableColumn = this.setTableColumn(val)
      this.showcol = val;
      this.tableList.tableColumn = this.setTableColumn(val);
    },
    // 请求数据
    async getData() {
      await getDisuseList({
        number: this.keyword,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
        pageSize: this.pagerOptions.pageSize,
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data.map((item) => {
            return {
              ...item,
              from: item.fromLocation.name,
              to: item.toLocation.name
            }
          })
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.total
              to: item.toLocation.name,
            };
          });
          this.tableList.tableInfomation = list || [];
          this.pagerOptions.totalCount = res.total;
        }
      })
      });
    },
    // 搜索
    getList(val) {
      this.keyword = val
      console.log(val)
      this.pagerOptions.currPage = 1
      this.getData()
      this.keyword = val;
      console.log(val);
      this.pagerOptions.currPage = 1;
      this.getData();
    },
    // 行点击
    tableRowClick(row) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row }
      console.log(row);
      // this.editConfig.visible = true;
      // this.editConfig.title = "编辑";
      this.editConfig.infomation = { ...row };
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = {}
      this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.editConfig.infomation = {};
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成"
    }
  }
}
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成";
    },
  },
};
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->