Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/warehouseManage/bussinessType/index.vue

@@ -3,7 +3,7 @@
    <div class="top">
      <SearchCommonView
        :add-title="'新建'"
        :placeholder="'请输入入库类型'"
        :placeholder="'请输入业务类型'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
@@ -11,12 +11,16 @@
    </div>
    <div class="list-view">
      <div class="table">
        <TableCommonView
          ref="tableListRef"
          :table-list="tableList"
          :show-checkcol="false"
          @tableRowClick="tableRowClick"
        ></TableCommonView>
        <TableCommonView ref="tableListRef" :table-list="tableList" :show-checkcol="false">
          <template slot="tableButton">
            <el-table-column label="操作" width="100">
              <template slot-scope="scope">
                <el-button @click="tableRowClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                <el-button @click="tableRowClick(scope.row, '编辑')" type="text" size="small">编辑</el-button>
              </template>
            </el-table-column>
          </template>
        </TableCommonView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
@@ -42,7 +46,7 @@
  data() {
    return {
      tableList: {},
      keyword:'',
      keyword: "",
      editConfig: {
        visible: false,
        title: "新建",
@@ -77,15 +81,15 @@
      console.log(showcol)
      let tableColumn = [
        {
          label: "入库类型",
          label: "业务类型",
          prop: "name",
          isShowColumn: true,
          default: true
        },
        {
          label: "仓库",
          propType:'mulitple',
          propTwo:'name',
          propType: "mulitple",
          propTwo: "name",
          prop: "warehouse",
          isShowColumn: true,
          default: true
@@ -104,32 +108,32 @@
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.data.code === 200) {
          const list = res.data.data
        if (res.code === 200) {
          const list = res.data
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.data.data.total
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    refresh(){
      this.pagerOptions.currPage=1
    refresh() {
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 搜索
    getList(val) {
      this.keyword=val;
      this.pagerOptions.currPage=1
      this.keyword = val
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 行点击
    tableRowClick(row) {
      this.editConfig.title = "编辑"
      let obj=JSON.parse(JSON.stringify(row))
      for(let i in obj){
        if(i=='name'||i=='prefix'){
          obj[i]=obj[i]?obj[i]:''
        }else{
          obj[i]=obj[i]?obj[i]:null
    tableRowClick(row, val) {
      this.editConfig.title = val
      let obj = JSON.parse(JSON.stringify(row))
      for (let i in obj) {
        if (i == "name" || i == "prefix") {
          obj[i] = obj[i] ? obj[i] : ""
        } else {
          obj[i] = obj[i] ? obj[i] : null
        }
      }
      this.editConfig.infomation = { ...obj }
@@ -138,26 +142,26 @@
    // 新建
    addBtnClick() {
      this.editConfig.title = "新建"
      this.editConfig.infomation={
         name:'',
         prefix:'',
         // 作业类型
        baseOperationType:null,
      this.editConfig.infomation = {
        name: "",
        prefix: "",
        // 作业类型
        baseOperationType: null,
        // 退货类型
        returnOperationTypeID:null,
        returnOperationTypeID: null,
        // 创建欠单
        createBackorder:null,
        createBackorder: null,
        // 仓库
        warehouseId:null,
        warehouseId: null,
        // 显示作业详情
        showOperations:false,
        earlyOperations:null,
        showOperations: false,
        earlyOperations: null,
        // 保留方式
        reservationMethod:null,
        reservationMethod: 1,
        // 默认原位置
        defaultLocationSrcId:null,
        defaultLocationSrcId: null,
        // 默认目标位置
        defaultLocationDestId:null,
        defaultLocationDestId: null
      }
      this.editConfig.visible = true
    }