Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/warehouseManage/warehouse/index.vue

@@ -3,7 +3,7 @@
    <div class="top">
      <SearchCommonView
        :add-title="'新建'"
        :placeholder="'请输入单号'"
        :placeholder="'请输入仓库'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
@@ -15,22 +15,39 @@
          ref="tableListRef"
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        >
        <template slot="tableButton">
            <el-table-column label="操作" width="120" fixed="right">
              <template slot-scope="scope">
                <el-button
                  @click="tableRowClick(scope.row,'edit')"
                  type="text"
                  size="small"
                  >编辑</el-button
                >
                <el-button
                  type="text"
                  size="small"
                  @click="tableRowClick(scope.row,'look')"
                  >查看</el-button
                >
              </template>
            </el-table-column>
          </template>
      </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
      </div>
    </div>
    <!-- 新建/编辑 -->
    <AddDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
    <AddDialog v-if="editConfig.visible" @refresh="refresh" :edit-common-config="editConfig" />
  </div>
</template>

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getProductList } from "@/api/product/product"
// import DetailProduct from "@/views/productManage/product/DetailProduct"
import { getWarehouseList } from "@/api/warehouseManage/warehouse"
import AddDialog from "@/views/warehouseManage/warehouse/AddDialog"

export default {
@@ -42,7 +59,7 @@
  data() {
    return {
      tableList: {},
      searchOptions: [],
      keyword:'',
      editConfig: {
        visible: false,
        title: "新建",
@@ -58,7 +75,8 @@
    setTable() {
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol)
@@ -77,19 +95,19 @@
      let tableColumn = [
        {
          label: "仓库",
          prop: "id",
          prop: "name",
          isShowColumn: true,
          default: true
        },
        {
          label: "库存位置",
          prop: "deviceName",
          prop: "warehouseLocation",
          isShowColumn: true,
          default: true
        },
        {
          label: "地址",
          prop: "id",
          prop: "address",
          isShowColumn: true,
          default: true
        }
@@ -101,39 +119,45 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getData(val, content) {
      await getProductList({
        [val]: content,
    async getData() {
      await getWarehouseList({
        keyword: this.keyword,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.data.code === 200) {
          const list = res.data.data.list.map((item) => {
            return {
              ...item,
              supplierNumber: item.supplier.number,
              status: "草稿",
              preTime: "2023-09-04 11:20:00"
            }
          })
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.data.data.total
        if (res.code == 200) {
          const list = res.data?res.data:[]
          this.tableList.tableInfomation = list
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    refresh(){
      this.pagerOptions.currPage=1
      this.getData()
    },
    // 搜索
    getList(val) {
      console.log(val)
      this.keyword=val;
      this.pagerOptions.currPage=1
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
    tableRowClick(row,val) {
      this.editConfig.title = val=='look'?'查看':"编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.visible = true
    },
    // 新建
    addBtnClick() {
      this.editConfig.infomation={
        address:'',
        buyToResupply:null,
        code:'',
        name:'',
        inboundTransportation:1,
        outboundTransportation:1,
      }
      this.editConfig.visible = true
      this.editConfig.title = "新建"
    }