Merge branch 'dev' into songshankun/add-token

songshankun

2023-11-03 cf6a4b874aed82592eea78294715c7c688f9b248

 src/views/warehouseManage/position/index.vue

@@ -15,15 +15,38 @@
          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" @refresh="refresh" :positionList="tableList.tableInfomation" :edit-common-config="editConfig" />
    <AddDialog
      v-if="editConfig.visible"
      @refresh="refresh"
      :positionList="tableList.tableInfomation"
      :edit-common-config="editConfig"
    />
  </div>
</template>

@@ -31,7 +54,7 @@
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getLocationList } from "@/api/warehouseManage/warehouse"
import AddDialog from "@/views/warehouseManage/position/AddDialog"
import { getDataByType } from "@/api/data";
import { getDataByType } from "@/api/data"
export default {
  name: "WarehouseView",
  props: {},
@@ -47,7 +70,7 @@
        title: "新建",
        infomation: {}
      },
      positionTypeList: getDataByType("positionType"),
      positionTypeList: getDataByType("positionType")
    }
  },
  created() {
@@ -58,7 +81,8 @@
    setTable() {
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
        selectBox: false,
        selectIndex: true,
        showcol: this.showcol,
        allcol: [],
        tableColumn: this.setTableColumn(this.showcol)
@@ -87,21 +111,21 @@
          isShowColumn: true,
          default: true,
          conversion: true,
          getStatus: this.getTypesList,
          getStatus: this.getTypesList
        }
      ]
      return tableColumn
    },
    getTypesList(val){
      let string='--'
      if(val){
    getTypesList(val) {
      let string = "--"
      if (val) {
        for (let i in this.positionTypeList) {
          if (this.positionTypeList[i].id == val) {
            return this.positionTypeList[i].name;
            return this.positionTypeList[i].name
          }
        }
      }
      return string;
      return string
    },
    selTableCol(val) {
      this.showcol = val
@@ -115,43 +139,42 @@
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data?res.data:[]
          const list = res.data ? res.data : []
          this.tableList.tableInfomation = list
          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) {
      console.log(row)
      this.editConfig.title = "编辑"
    tableRowClick(row,val) {
      this.editConfig.title =  val=='look'?'查看':"编辑"
      this.editConfig.infomation = { ...row }
      this.editConfig.infomation.parentId=Number(this.editConfig.infomation.parentId);
      this.editConfig.infomation.parentId = this.editConfig.infomation.parentId?Number(this.editConfig.infomation.parentId):null
      this.editConfig.visible = true
    },
    // 新建
    addBtnClick() {
      this.editConfig.infomation={
        name:'',
        parentId:null,
        type:3,
        isScrapLocation:null,
        isReturnLocation:null,
        replenishLocation:null,
        countFrequency:0,
        recentlyCount:'',
        nextCount:'',
        notes:'',
      this.editConfig.infomation = {
        name: "",
        parentId: null,
        type: 3,
        isScrapLocation: null,
        isReturnLocation: null,
        replenishLocation: null,
        countFrequency: 0,
        recentlyCount: "",
        nextCount: "",
        notes: ""
      }
      this.editConfig.visible = true
      this.editConfig.title = "新建"