合并分支冲突解决

zuozhengqing

2024-03-20 f4ed5ae8873f65c36b5cf37be264f6ec1e154647

 src/views/purchaseManage/purchase/index.vue

@@ -53,6 +53,12 @@
                  <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
                    >查看</el-button
                  >
                  <!-- <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
                    >到货确认</el-button
                  >
                  <el-button type="text" size="small" @click="btnLook(scope.row)" style="margin-right: 5px"
                    >去质检</el-button
                  > -->
                  <el-button
                    v-if="scope.row.status === 1"
                    type="text"
@@ -162,10 +168,11 @@
      { label: "数量", prop: "amount" },
      { label: "入库时间", prop: "overTime" },
      { label: "收货人", prop: "principal" },
      { label: "状态", prop: "status", isCallMethod: true, getCallMethod: this.getpurchaseStatus }
      { label: "状态", prop: "status", isCallMethod: true, getCallMethod: this.getreceiveStatusStatus }
    ]
    return {
      purchaseStatusList: getDataByType("purchaseStatus"),
      receiveStatusList: getDataByType("receiveStatus"),
      tableLoading: false,
      tableList: {}, // 列表
      selValueList: [],
@@ -259,6 +266,17 @@
        return "--"
      }
    },
    getreceiveStatusStatus(val) {
      if (val) {
        for (let i in this.receiveStatusList) {
          if (this.receiveStatusList[i].id == val) {
            return this.receiveStatusList[i].name
          }
        }
      } else {
        return "--"
      }
    },
    setColumnVisible(showCol, tableColumn) {
      return tableColumn.map((ele) => {
        return {