zuozhengqing
2023-11-21 d897e9aac7689926551ae413a22430540f765846
供应商信息修改
7个文件已修改
35 ■■■■■ 已修改文件
src/components/makepager/SearchCommonView.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/commonDialog/SelectCommonDialog.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchaseManage/purchase/DetailSupplier.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchaseManage/purchase/components/AddPurchase.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/purchaseManage/purchase/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/supplierManage/supplier/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/makepager/SearchCommonView.vue
@@ -3,9 +3,9 @@
    <div class="search-top">
      <div class="search">
        <el-input v-if="inputSelect"  :placeholder="placeholder" v-model="searchInput" class="input-with-select" clearable>
          <el-select v-model="searchSelValue" slot="prepend" placeholder="请选择" class="search-sel">
          <!-- <el-select v-model="searchSelValue" slot="prepend" placeholder="请选择" class="search-sel">
            <el-option v-for="item in searchOptions" :key="item.value" :label="item.label" :value="item"> </el-option>
          </el-select>
          </el-select> -->
          <!-- <i slot="suffix" class="el-icon-search" style="cursor: pointer" @click="searchClick"></i> -->
        </el-input>
        <el-input v-else :placeholder="placeholder" v-model="searchInput" class="input-with-select" clearable>
@@ -94,7 +94,7 @@
  },
  methods: {
    searchClick() {
      this.$emit("searchClick", this.searchSelValue, this.searchInput)
      this.$emit("searchClick", this.searchInput)
    },
    resetClick() {
      this.searchSelValue = this.searchSel
src/views/other/commonDialog/SelectCommonDialog.vue
@@ -155,8 +155,7 @@
    async getProductList() {
      let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc
      await fn({
        productName: this.keywordType === "产品名称" ? this.keyword : "",
        productNumber: this.keywordType === "产品编号" ? this.keyword : "",
        keyword:this.keyword,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
@@ -187,13 +186,9 @@
      }
    },
    // 搜索
    searchClick(val, content) {
      console.log(val, content)
      this.search_map = {
        [val.value]: content
      }
    searchClick(content) {
      console.log( content)
      this.keyword = content
      this.keywordType = val.label
      this.getData()
    },
    resetClick() {
src/views/purchaseManage/purchase/DetailSupplier.vue
@@ -252,7 +252,7 @@
      this.formInfoList = [
        {
          str: "供应商名称",
          value: item.name,
          value: item.supplier.name,
        },
        {
          str: "合计",
@@ -288,7 +288,7 @@
          leftStr: "采购订单编号",
          leftValue: item.number,
          rightStr: "供应商名称",
          rightValue: item.name,
          rightValue: item.supplier.name,
        },
        {
          leftStr: "采购单状态",
src/views/purchaseManage/purchase/components/AddPurchase.vue
@@ -175,6 +175,7 @@
          <div class="basic-info-title" style="display: flex">产品信息</div>
          <div class="product-view">
            <CommonFormTableView
              :detailEnter=editCommonConfig.detailEnter
              :show-summary="showSummary"
              :recalculateShow="false"
              :product-table-list="productTableList"
@@ -296,6 +297,7 @@
      type: Object,
      default: () => {
        return {
          detailEnter:true,
          visible: false,
          title: "创建",
          infomation: {},
src/views/purchaseManage/purchase/components/SelectSupplierDialog.vue
@@ -128,6 +128,7 @@
      await getSupplierList({
        [val]: content,
        status:1,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
src/views/purchaseManage/purchase/index.vue
@@ -96,6 +96,7 @@
        visible: false,
        title: "创建",
        isDisabled:false,
        detailEnter:false,
        infomation: {
          supplierList:[]
        }
@@ -184,6 +185,7 @@
    async getSupplierData() {
      await getSupplierList({
        // [val]: content,
        status:1,
        page:1,
        pageSize: 10
      })
@@ -202,6 +204,7 @@
    },
    // 新建
    addBtnClick() {
      this.editConfig.detailEnter=false
      this.editConfig.isDisabled=false
      // this.editRow = {};
      // this.$refs.add.islook = true;
@@ -229,6 +232,8 @@
    // 编辑
    btnEdit(row) {
      this.editConfig.detailEnter=false
      this.editConfig.isDisabled=false
      this.tableLoading = true
      getPurchaseInfo({ id: row.ID }).then((res) => {
        if (res.code == 200) {
@@ -314,6 +319,7 @@
    },
    // 查看
    btnLook(row){
      this.editConfig.detailEnter=true
      this.editConfig.isDisabled=true
      this.tableLoading = true
      getPurchaseInfo({ id: row.ID }).then((res) => {
src/views/supplierManage/supplier/index.vue
@@ -277,7 +277,8 @@
      await getSupplierList({
        name: this.searchSupplierName,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
        pageSize: this.pagerOptions.pageSize,
        status:1,
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
@@ -348,7 +349,7 @@
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = { fileId: 0 }
      this.editConfig.infomation = { fileId: 0,responsiblePersonName:'admin'}
    },
    // 启用供应商
    async enableClick(row, value) {