Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/sales/salesReturn/index.vue

@@ -16,7 +16,7 @@
        >
          <template slot="leftButton">
            <el-button size="small" type="primary"  @click="addBtnClick">新建</el-button>
            <el-button size="small"  @click="delClick">删除</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
      </div>
@@ -28,16 +28,16 @@
          <TableCommonView
              ref="tableListRef"
              :table-list="tableList"
              :select-box="!isDetail"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
              @selTableCol="selTableCol"
          >
            <template slot="tableButton">
              <el-table-column label="操作" width="90">
                <template slot-scope="scope">
                  <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
                  <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button> -->
                  <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button>
                </template>
              </el-table-column>
            </template>
@@ -129,7 +129,19 @@
        label: "销售退货单编号"
      },
      keyword: "",
      keywordType: ""
      keywordType: "",
      tableColumn: [
        { label: "销售退货单编号", prop: "number", min: 120, isCommonClick: true ,default:true },
        { label: "客户名称", prop: "client_name", min: 90, isClientClick: true },
        { label: "退货日期", prop: "returnDate", min: 130 },
        { label: "状态", prop: "salesReturnStatus_name" },
        { label: "退入仓库", prop: "repository" },
        { label: "应退款", prop: "refundabe" },
        { label: "已退款", prop: "refunded" },
        { label: "销售负责人", prop: "member_name" }
        // { label: "修改时间", prop: "modifyTime", isTime: true, min: 130 }
      ],
      showCol:["销售退货单编号", "客户名称", "退货日期", "状态", "退入仓库", "应退款", "已退款", "销售负责人"]
    }
  },
  created() {
@@ -146,25 +158,31 @@
  methods: {
    setTable() {
      this.tableList = {
        selectIndex: true,
        tableInfomation: [],
        tableColumn: [
          { label: "销售退货单编号", prop: "number", min: 120, isCommonClick: true },
          { label: "客户名称", prop: "client_name", min: 90, isClientClick: true },
          { label: "退货日期", prop: "returnDate", min: 130 },
          { label: "状态", prop: "salesReturnStatus_name" },
          { label: "退入仓库", prop: "repository" },
          { label: "应退款", prop: "refundabe" },
          { label: "已退款", prop: "refunded" },
          { label: "销售负责人", prop: "member_name" }
          // { label: "修改时间", prop: "modifyTime", isTime: true, min: 130 }
        ]
        allcol: [],
        showcol: this.showCol,
        tableColumn:this.setColumnVisible(this.showCol)
      }
      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
      this.searchOptions = []
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
        const label = this.tableList.tableColumn[i].label
        const value = this.tableList.tableColumn[i].prop
        this.searchOptions.push({ value: value, label: label })
      }
    },
    setColumnVisible(showCol){
      return  this.tableColumn.map(ele=>{
        return {
          ...ele,
          isShowColumn:showCol.includes(ele.label)
        }
      })
    },
    selTableCol(val) {
      this.showcol = val;
      this.tableList.tableColumn = this.setColumnVisible(val);
    },
    // 请求数据
    async getData() {
@@ -307,15 +325,6 @@
      border-radius: 12px;
      height: 100%;
      overflow: hidden;
    }

    .supplier-search {
      display: flex;
      align-items: center;
      .add-view {
        margin-left: auto;
        margin-right: 20px;
      }
    }
    .list-view {
      height: calc(100% - 60px);