Merge branch 'master' of ssh://192.168.5.5:29418/web/SRM

haoxuan

2023-11-15 a6649a3319e9f5e9260848872d8cddabfcfc7553

 src/views/supplierManage/supplier/index.vue

@@ -4,14 +4,14 @@
      <div class="filter">
        <div class="filter-card">
          <CommonSearch
              :show-add="true"
              add-title="新建"
              @addCommonClick="addBtnClick"
              :show-download="false"
              :amount-view="false"
              :show-action-btn="false"
              :placeholder="'请输入供应商名称'"
              @searchClick="onFilterSearch"
            :show-add="true"
            add-title="新建"
            @addCommonClick="addBtnClick"
            :show-download="true"
            :amount-view="false"
            :show-action-btn="false"
            :placeholder="'请输入供应商名称'"
            @searchClick="onFilterSearch"
          />
        </div>
      </div>
@@ -19,21 +19,22 @@
        <div class="body-card">
          <div class="list-view">
            <TableCommonView
                ref="tableSupplier"
                :table-list="tableList"
                @selCommonClick="selCommonClick"
                @tableRowClick="tableRowClick"
                @selTableCol="selTableCol"
              ref="tableSupplier"
              :table-list="tableList"
              @selCommonClick="selCommonClick"
              @selTableCol="selTableCol"
              @tableRowClick="tableRowClick"
              :selectClassRow="selectRow"
            >
              <template slot="tableButton">
                <el-table-column label="操作" width="100">
                  <template slot-scope="scope">
                    <el-button
                        v-if="scope.row.status === 0"
                        @click="enableClick(scope.row, '启用')"
                        type="text"
                        size="small"
                    >启用</el-button
                      v-if="scope.row.status === 0"
                      @click="enableClick(scope.row, '启用')"
                      type="text"
                      size="small"
                      >启用</el-button
                    >
                    <el-button v-else @click="enableClick(scope.row, '停用')" type="text" size="small">停用</el-button>
                    <el-button @click="modifyClick(scope.row)" type="text" size="small">修改</el-button>
@@ -47,22 +48,22 @@
          </div>
        </div>
      </div>

    </div>
    <div class="bottom">
      <div class="simple-filter">
        <div class="simple-filter-card">
          <CommonSearch
              :show-add="false"
              :show-download="false"
              :amount-view="false"
              :show-action-btn="false"
              :placeholder="'请输入产品名称'"
              @searchClick="onProductFilterSearch"
            :show-add="false"
            :show-download="false"
            :amount-view="false"
            :show-screen="false"
            :show-action-btn="false"
            :placeholder="'请输入产品名称'"
            @searchClick="onProductFilterSearch"
          >
            <template slot="leftButton">
              <div class="sub-title"><span class="sub-title-decorator"></span>可提供的产品</div>
              <el-button type="primary" size="mini">创建采购单</el-button>
              <el-button type="primary" size="mini" @click="creatPurchase">创建采购单</el-button>
            </template>
            <template slot="rightButton">
              <el-button type="primary" size="mini" @click="addNewProductClick">添加新产品</el-button>
@@ -74,11 +75,11 @@
        <div class="body-card">
          <div class="list-view">
            <TableCommonView
                ref="tableListProduct"
                :table-list="productTableList"
                @selCommonClick="selCommonClick"
                @getSelectArray="getSelectArray"
                @selTableCol="selProductTableCol"
              ref="tableListProduct"
              :table-list="productTableList"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
              @selTableCol="selProductTableCol"
            >
              <template slot="tableButton">
                <el-table-column label="操作" width="170">
@@ -93,10 +94,10 @@
          </div>
          <div class="btn-pager">
            <PagerView
                class="page"
                :pager-options="productPagerOptions"
                @size-change="productChangeHandler"
                @current-change="currentProductHandler"
              class="page"
              :pager-options="productPagerOptions"
              @size-change="productChangeHandler"
              @current-change="currentProductHandler"
            />
          </div>
        </div>
@@ -110,6 +111,8 @@
    <RaleteSupplierList v-if="raleteSupplierConfig.visible" :common-config="raleteSupplierConfig" />
    <!-- 添加新产品 -->
    <AddNewProduct v-if="newProductConfig.visible" :add-common-config="newProductConfig" />
    <!-- 新建/编辑 -->
    <AddPurchase v-if="editPurchaseConfig.visible" :edit-common-config="editPurchaseConfig" />
  </div>
</template>

@@ -121,16 +124,17 @@
import RaleteSupplierList from "@/views/supplierManage/supplier/RaleteSupplierList"
import AddNewProduct from "@/views/supplierManage/supplier/AddNewProduct"
import { getProductList, deleteProduct } from "@/api/productManage/product"
import AddPurchase from "@/views/purchaseManage/purchase/components/AddPurchase"

export default {
  name: "SupplierManage",
  props: {},
  components: { DetailSupplier, AddSupplier, RaleteSupplierList, AddNewProduct },
  components: { DetailSupplier, AddSupplier, RaleteSupplierList, AddNewProduct, AddPurchase },
  mixins: [pageMixin],
  computed: {},
  data() {
    return {
      searchSupplierName: '',
      searchSupplierName: "",
      tableList: {}, // 供应商列表
      productTableList: {}, // 产品列表
      selValueList: [],
@@ -160,7 +164,7 @@
        totalCount: 0
      },
      supplierId: 0,
      showCol:['供应商编号','供应商名称','供应商类型','所属行业','联系人','联系电话','状态'],
      showCol: ["供应商编号", "供应商名称", "供应商类型", "所属行业", "联系人", "联系电话", "状态"],
      tableColumn: [
        { label: "供应商编号", prop: "number", min: 190, isCommonClick: true },
        { label: "供应商名称", prop: "name", min: 130, default: true },
@@ -171,8 +175,8 @@
        { label: "状态", prop: "status_name", min: 130 },
        { label: "创建时间", prop: "created_at", min: 130 }
      ],
      showProductCol:['产品编码','产品名称','产品规格','单位','采购价格','供货时长(天)','物流时长(天)'],
      productColumn:[
      showProductCol: ["产品编码", "产品名称", "产品规格", "单位", "采购价格", "供货时长(天)", "物流时长(天)"],
      productColumn: [
        { label: "产品编码", prop: "number", min: 190 },
        { label: "产品名称", prop: "name", min: 130, default: true },
        { label: "产品规格", prop: "specifications", min: 130 },
@@ -180,7 +184,16 @@
        { label: "采购价格", prop: "purchasePrice", min: 130 },
        { label: "供货时长(天)", prop: "deliveryTime", min: 130 },
        { label: "物流时长(天)", prop: "shippingDuration", min: 130 }
      ]
      ],
      editPurchaseConfig: {
        // 创建采购
        visible: false,
        title: "创建",
        infomation: {
          supplierName: ""
        }
      },
      selectRow: {}
    }
  },
  created() {
@@ -189,19 +202,19 @@
    this.getData()
  },
  methods: {
    setColumnVisible(showCol){
      return  this.tableColumn.map(ele=>{
    setColumnVisible(showCol) {
      return this.tableColumn.map((ele) => {
        return {
          ...ele,
          isShowColumn: showCol.includes(ele.label)
        }
      })
    },
    setProductColumnVisible(showCol){
      return  this.productColumn.map(ele=>{
    setProductColumnVisible(showCol) {
      return this.productColumn.map((ele) => {
        return {
          ...ele,
          isShowColumn:showCol.includes(ele.label)
          isShowColumn: showCol.includes(ele.label)
        }
      })
    },
@@ -213,9 +226,9 @@
        ref: "tableListRef",
        showcol: this.showCol,
        allcol: [],
        tableColumn: this.setColumnVisible(this.showCol),
        tableColumn: this.setColumnVisible(this.showCol)
      }
      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
      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++) {
@@ -225,8 +238,8 @@
      }
    },
    selTableCol(val) {
      this.showcol = val;
      this.tableList.tableColumn = this.setColumnVisible(val);
      this.showcol = val
      this.tableList.tableColumn = this.setColumnVisible(val)
    },
    setProductTable() {
      this.productTableList = {
@@ -235,7 +248,7 @@
        selectIndex: true,
        showcol: this.showProductCol,
        allcol: [],
        tableColumn: this.setProductColumnVisible(this.showProductCol),
        tableColumn: this.setProductColumnVisible(this.showProductCol)
      }
      this.searchProductOptions = []
      for (let i = 0; i < this.productTableList.tableColumn.length; i++) {
@@ -244,12 +257,14 @@
        this.searchProductOptions.push({ value: value, label: label })
      }

      this.productTableList.allcol = this.productTableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
      console.log('this.productTableList',this.productTableList)
      this.productTableList.allcol = this.productTableList.tableColumn
        .filter((ele) => !ele.default)
        .map((ele) => ele.label)
      console.log("this.productTableList", this.productTableList)
    },
    selProductTableCol(val) {
      this.showProductCol = val;
      this.productTableList.tableColumn = this.setProductColumnVisible(val);
      this.showProductCol = val
      this.productTableList.tableColumn = this.setProductColumnVisible(val)
    },
    // 请求数据
    getData() {
@@ -262,33 +277,36 @@
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        console.log(res.data)
        if (res.data.code === 200) {
          const list = res.data.data.list.map((item) => {
        console.log(res)
        if (res.code === 200) {
          const list = res.data.list.map((item) => {
            return {
              ...item,
              id: item.ID,
              status_name: item.status === 0 ? "未启用" : "启用"
            }
          })
          console.log(list)
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.data.data.total
          this.pagerOptions.totalCount = res.data.total
          if (list && list.length > 0) {
            this.supplierId = this.tableList.tableInfomation[0].ID
            this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
          } else {
            this.supplierId = 0
          }
          this.$nextTick(() => {
            this.$refs.tableSupplier.$refs.table.setCurrentRow(this.tableList.tableInfomation[0])
          })
          // this.$nextTick(() => {
          //   this.$refs.tableSupplier.$refs.table.setCurrentRow(this.tableList.tableInfomation[0])
          // })

          // 重新获取供应商列表后应该重置产品列表页码
          this.productPagerOptions.currPage = 1;
          this.productPagerOptions.currPage = 1
          // 如果供应商列表为空,则可提供产品列表也应为空
          if (list.length){
          if (list.length) {
            this.getProductList()
          }else {
            this.productTableList.tableInfomation=[]
            this.productPagerOptions.currPage = 1;
          } else {
            this.productTableList.tableInfomation = []
            this.productPagerOptions.currPage = 1
            this.productPagerOptions.totalCount = 0
          }
        }
@@ -314,15 +332,15 @@
      })
    },
    // 搜索供应商
    onFilterSearch(searchText){
      this.searchSupplierName = searchText ??''
    onFilterSearch(searchText) {
      this.searchSupplierName = searchText ?? ""
      this.pagerOptions.currPage = 1
      this.getSupplierList()
    },
    // 搜索产品
    onProductFilterSearch(searchText){
    onProductFilterSearch(searchText) {
      this.productPagerOptions.currPage = 1
      this.getProductList('name', searchText)
      this.getProductList("name", searchText)
    },
    // 新建供应商
    addBtnClick() {
@@ -398,6 +416,7 @@
    tableRowClick(row) {
      console.log(row)
      this.productPagerOptions.currPage = 1
      this.selectRow = row
      this.supplierId = row.ID
      this.getProductList()
    },
@@ -416,6 +435,15 @@
    currentProductHandler(val) {
      this.productPagerOptions.currPage = val
      this.getProductList()
    },
    // 创建采购单
    creatPurchase() {
      this.editPurchaseConfig.visible = true
      this.editPurchaseConfig.title = "创建"
      this.editPurchaseConfig.infomation = {
        supplierId: this.selectRow.ID,
        supplierName: this.selectRow.name
      }
    }
  }
}
@@ -423,32 +451,32 @@

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.supplier{
.supplier {
  height: 100%;
  overflow: hidden;
  .top{
  .top {
    position: relative;
    height: 55%;
    .body{
    .body {
      position: relative;
      height: calc(100% - 92px);
    }
  }
  .bottom{
  .bottom {
    position: relative;
    height: 45%;
    .body{
    .body {
      position: relative;
      height: calc(100% - 40px);
      padding-top: 0;
    }
  }
  .filter{
  .filter {
    height: 80px;
    display: flex;
    align-items: center;
    padding: 12px 20px 0 20px;
    &-card{
    &-card {
      height: 80px;
      display: flex;
      align-items: center;
@@ -459,13 +487,13 @@
      background-color: #fff;
    }
  }
  .simple-filter{
  .simple-filter {
    height: 40px;
    box-sizing: border-box;
    display: flex;
    align-items: center;
    padding: 0 20px;
    &-card{
    &-card {
      height: 80px;
      display: flex;
      align-items: center;
@@ -473,7 +501,7 @@
      flex: 1;
    }
  }
  .body{
  .body {
    box-sizing: border-box;
    padding: 10px 20px;
    border-radius: 12px;
@@ -504,7 +532,7 @@
    }
  }
}
.sub-title{
.sub-title {
  flex-shrink: 0;
  margin-right: 20px;
  font-size: 16px;
@@ -513,7 +541,7 @@
  line-height: 28px;
  position: relative;
  padding-left: 12px;
  &-decorator{
  &-decorator {
    position: absolute;
    height: 100%;
    width: 4px;
@@ -522,5 +550,4 @@
    left: 0;
  }
}

</style>