物资管理添加供应商筛选

src/views/modules/materialManagement/purchase/PurchaseList.vue

@@ -87,6 +87,10 @@
         </el-date-picker>
       </el-form-item>
 
+      <el-form-item v-if="showHideItem" label="供应商" prop="supplierName">
+        <el-input size="small" v-model="searchForm.supplierName" :readonly="true" placeholder="请选择供应商" @focus="openSupplierChoose"></el-input>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="default" @click="showHide" size="small" :icon="showHideIcon">{{showHideName}}</el-button>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
@@ -167,6 +171,8 @@
         <UpdateInfoForm ref="updateInfoForm" @refreshList="refreshList"></UpdateInfoForm>
         <SeeWareHouseList  ref="seeWareHouseList"></SeeWareHouseList>
         <WareHouseAddForm ref="wareHouseAddForm"></WareHouseAddForm>
+        <SupplierChooseForm ref="supplierChooseForm" @getSupplier="getSupplier"></SupplierChooseForm>
+
       </div>
     </div>
   </div>
@@ -187,6 +193,7 @@
   import pick from 'lodash.pick'
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import SupplierChooseForm from '@/views/modules/materialManagement/supplier/SupplierChooseForm'
   export default {
     data () {
       return {
@@ -202,7 +209,9 @@
           status: '',
           contractDates: [],
           procurementType: '',
-          createBy: ''
+          createBy: '',
+          supplierId: '',
+          supplierName: ''
         },
         dataList: [],
         tablePage: {
@@ -242,7 +251,8 @@
       UpdateInfoForm,
       SeeWareHouseList,
       WareHouseAddForm,
-      UserSelect
+      UserSelect,
+      SupplierChooseForm
     },
     computed: {
       userName () {
@@ -361,6 +371,7 @@
       },
       resetSearch () {
         this.$refs.searchForm.resetFields()
+        this.searchForm.supplierId = '' // 重置时清空供应商筛选
         this.refreshList()
       },
       start () {
@@ -531,6 +542,14 @@
           }
         }
         return false
+      },
+      getSupplier (row) {
+        this.searchForm.supplierId = row.id
+        this.searchForm.supplierName = row.name
+      },
+      // 打开供应商选择组件
+      openSupplierChoose () {
+        this.$refs.supplierChooseForm.init()
       }
     }
   }

src/views/modules/materialManagement/supplier/SupplierChooseForm.vue

@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <el-dialog
+      title="选择供应商"
+      :close-on-click-modal="false"
+      v-dialogDrag
+      width="1200px"
+      height="500px"
+      @close="close"
+      append-to-body
+      @keyup.enter.native=""
+      :visible.sync="visible">
+      <div style="height: calc(100% - 80px);">
+        <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @submit.native.prevent>
+          <!-- 搜索框-->
+          <el-form-item label="供应商名称" prop="name">
+            <el-input size="small" v-model="searchForm.name" placeholder="请输入供应商名称" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="telPhone">
+            <el-input size="small" v-model="searchForm.telPhone" placeholder="请输入联系电话" clearable></el-input>
+          </el-form-item>
+          <el-form-item label="联系人名称" prop="linkName">
+            <el-input size="small" v-model="searchForm.linkName" placeholder="请输入联系人名称" clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button type="primary" @click="list()" size="small" icon="el-icon-search">查询</el-button>
+            <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <vxe-table
+          border="inner"
+          auto-resize
+          resizable
+          height="400px"
+          :loading="loading"
+          size="small"
+          ref="xTable"
+          show-header-overflow
+          show-overflow
+          highlight-hover-row
+          :menu-config="{}"
+          :print-config="{}"
+          @sort-change=""
+          :sort-config="{remote:true}"
+          :data="dataList"
+          :row-config="{isCurrent: true}"
+          :radio-config="{trigger: 'row'}"
+        >
+          <vxe-column type="seq" width="60" title="序号"></vxe-column>
+          <vxe-column type="radio" width="40px"></vxe-column>
+          <vxe-column min-width="230" align="center" title="供应商名称" field="name"></vxe-column>
+          <vxe-column min-width="230" align="center" title="联系电话" field="telPhone"></vxe-column>
+          <vxe-column min-width="230" align="center" title="地址" field="address"></vxe-column>
+          <vxe-column min-width="130" align="center" title="创建人" field="createName"></vxe-column>
+          <vxe-column min-width="200" align="center" title="创建时间" field="createDate"></vxe-column>
+        </vxe-table>
+        <vxe-pager
+          background
+          size="small"
+          :current-page="tablePage.currentPage"
+          :page-size="tablePage.pageSize"
+          :total="tablePage.total"
+          :page-sizes="[10, 20, 100, 1000, {label: '全量数据', value: 1000000}]"
+          :layouts="['PrevPage', 'JumpNumber', 'NextPage', 'FullJump', 'Sizes', 'Total']"
+          @page-change="currentChangeHandle">
+        </vxe-pager>
+      </div>
+      <span slot="footer" class="dialog-footer">
+      <el-button size="small" @click="close()" icon="el-icon-circle-close">关闭</el-button>
+      <el-button size="small" type="primary" v-if="method != 'view'" @click="getSupplier()" icon="el-icon-circle-check" v-noMoreClick>确定</el-button>
+    </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import SupplierService from '@/api/materialManagement/SupplierService'
+  export default {
+    data () {
+      return {
+        title: '',
+        method: '',
+        visible: false,
+        loading: false,
+        tablePage: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10,
+          orders: []
+        },
+        dataList: [],
+        searchForm: {
+          name: '',
+          telPhone: '',
+          linkName: ''
+        }
+      }
+    },
+    supplierService: null,
+    created () {
+      this.supplierService = new SupplierService()
+    },
+    components: {
+    },
+    methods: {
+      init () {
+        this.visible = true
+        this.list()
+      },
+      // 表单提交
+      getSupplier () {
+        let row = this.$refs.xTable.getRadioRecord()
+        if (this.commonJS.isEmpty(row)) {
+          this.$message.error('请选择一条数据')
+          return
+        }
+        this.close()
+        this.$emit('getSupplier', row)
+      },
+      list () {
+        this.loading = true
+        this.supplierService.list({
+          'current': this.tablePage.currentPage,
+          'size': this.tablePage.pageSize,
+          'orders': this.tablePage.orders,
+          ...this.searchForm
+        }).then(({data}) => {
+          this.dataList = data.records
+          this.tablePage.total = data.total
+          this.loading = false
+        })
+      },
+      // 当前页
+      currentChangeHandle ({currentPage, pageSize}) {
+        this.tablePage.currentPage = currentPage
+        this.tablePage.pageSize = pageSize
+        this.list()
+      },
+      resetSearch () {
+        this.$refs.searchForm.resetFields()
+        this.list()
+      },
+      close () {
+        this.$refs.searchForm.resetFields()
+        this.visible = false
+      }
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-dialog__body {
+    padding-top: 0px;
+    padding-bottom: 15px;
+  }
+</style>

src/views/modules/materialManagement/wareHouse/WareHouseList.vue

@@ -59,6 +59,9 @@
           end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item v-if="showHideItem" label="供应商" prop="supplierName">
+        <el-input size="small" v-model="searchForm.supplierName" placeholder="请选择供应商" :readonly="true" @focus="openSupplierChoose" ></el-input>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="default" @click="showHide" size="small" :icon="showHideIcon">{{showHideName}}</el-button>
@@ -142,6 +145,7 @@
         </vxe-pager>
 <!--        <UpdateInfoForm ref="updateInfoForm" @refreshDataList="refreshList"></UpdateInfoForm>-->
         <WareHouseAddForm ref="wareHouseAddForm" @refreshList="refreshList"></WareHouseAddForm>
+        <SupplierChooseForm ref="supplierChooseForm" @getSupplier="getSupplier"></SupplierChooseForm>
       </div>
     </div>
   </div>
@@ -161,6 +165,7 @@
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
   import pick from 'lodash.pick'
+  import SupplierChooseForm from '@/views/modules/materialManagement/supplier/SupplierChooseForm'
 export default {
     data () {
       return {
@@ -176,7 +181,9 @@ export default {
           handledByOffice: '',
           wareHouseDates: [],
           procurementType: '',
-          createBy: ''
+          createBy: '',
+          supplierId: '',
+          supplierName: ''
         },
         dataList: [],
         tablePage: {
@@ -213,7 +220,8 @@ export default {
       SelectTree,
       // UpdateInfoForm
       WareHouseAddForm,
-      UserSelect
+      UserSelect,
+      SupplierChooseForm
     },
     computed: {
       userName () {
@@ -333,6 +341,7 @@ export default {
       },
       resetSearch () {
         this.$refs.searchForm.resetFields()
+        this.searchForm.supplierId = '' // 重置时清空供应商筛选
         this.refreshList()
       },
       // 发起物资管理-入库修改
@@ -501,6 +510,14 @@ export default {
           }
         }
         return false
+      },
+      getSupplier (row) {
+        this.searchForm.supplierId = row.id
+        this.searchForm.supplierName = row.name
+      },
+      // 打开供应商选择组件
+      openSupplierChoose () {
+        this.$refs.supplierChooseForm.init()
       }
     }
   }

src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -63,7 +63,9 @@
 <!--          end-placeholder="结束日期">-->
 <!--        </el-date-picker>-->
 <!--      </el-form-item>-->
-
+      <el-form-item label="供应商" prop="supplierName">
+        <el-input size="small" v-model="searchForm.supplierName" placeholder="请选择供应商" :readonly="true" @focus="openSupplierChoose" ></el-input>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
         <el-button @click="resetSearch()" size="small" icon="el-icon-refresh-right">重置</el-button>
@@ -138,6 +140,7 @@
         <WareHouseAddForm ref="wareHouseAddForm" @refreshList="refreshList"></WareHouseAddForm>
         <WareHouseHistory ref="wareHouseHistory"></WareHouseHistory>
         <WareHouseHistoryPopup ref="wareHouseHistoryPopup"></WareHouseHistoryPopup>
+        <SupplierChooseForm ref="supplierChooseForm" @getSupplier="getSupplier"></SupplierChooseForm>
       </div>
     </div>
   </div>
@@ -157,6 +160,7 @@
   import ProcessService from '@/api/flowable/ProcessService'
   import UserService from '@/api/sys/UserService'
   import SelectUserTree from '@/views/modules/utils/treeUserSelect'
+  import SupplierChooseForm from '@/views/modules/materialManagement/supplier/SupplierChooseForm'
   export default {
     data () {
       return {
@@ -169,7 +173,9 @@
           wareHouseManOffice: '',
           wareHouseDates: [],
           procurementType: '',
-          createBy: ''
+          createBy: '',
+          supplierId: '',
+          supplierName: ''
         },
         dataList: [],
         tablePage: {
@@ -207,7 +213,8 @@
       WareHouseHistory,
       WareHouseHistoryPopup,
       SelectTree,
-      WareHouseAddForm
+      WareHouseAddForm,
+      SupplierChooseForm
     },
     computed: {
       userName () {
@@ -274,6 +281,7 @@
       },
       resetSearch () {
         this.$refs.searchForm.resetFields()
+        this.searchForm.supplierId = '' // 重置时清空供应商筛选
         this.refreshList()
       },
       // 修改提醒状态 启用/停用
@@ -304,6 +312,14 @@
           this.refreshList()
           this.loading = false
         })
+      },
+      getSupplier (row) {
+        this.searchForm.supplierId = row.id
+        this.searchForm.supplierName = row.name
+      },
+      // 打开供应商选择组件
+      openSupplierChoose () {
+        this.$refs.supplierChooseForm.init()
       }
     }
   }