beyond 4.18.6

src/api/Supplier.js

@@ -173,6 +173,9 @@ export function create(query, query2) {
 // 供应商列表
 export function search(query) {
   var params = new URLSearchParams()
+  if (query.repositoryId !== '' && query.repositoryId !== null && query.repositoryId !== undefined) {
+    params.append('repositoryId', query.repositoryId) // 你要传给后台的参数值 key/value
+  }
   if (query.isEffective !== '' && query.isEffective !== null && query.isEffective !== undefined) {
     params.append('isEffective', query.isEffective) // 你要传给后台的参数值 key/value
   }

src/views/StockArrival/AddStockArrival.vue

@@ -23,7 +23,7 @@
               <el-col :span="6">
                 <el-form-item :label="$t('StockArrival.supplierId')" prop="supplierId" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
                   <el-input v-model="supplierId" size="mini" style="margin-left: 18px;width:200px" clearable @focus="handlechoose"/>
-                  <my-supplier :control.sync="empcontrol" @supplierName="supplierName"/>
+                  <my-supplier :control.sync="empcontrol" :supp2.sync="supp2" @supplierName="supplierName"/>
                 </el-form-item>
               </el-col>
               <!--              <el-col :span="6">-->
@@ -375,6 +375,7 @@ export default {
       IsSourceNumber: false,
       // 带入的供应商
       supp: null,
+      supp2: null,
       // 结算方式
       paymentIds: [],
       // 合计数据
@@ -525,6 +526,7 @@ export default {
     },
     repositoryname(val) {
       console.log(val)
+      this.supp2 = val.id
       this.arrivalRepositoryId = val.repositoryName
       this.personalForm.arrivalRepositoryId = val.id
     },
@@ -766,7 +768,13 @@ export default {
     },
     // 供应商输入框focus事件触发
     handlechoose() {
-      this.empcontrol = true
+      if (this.arrivalRepositoryId === undefined || this.arrivalRepositoryId === null || this.arrivalRepositoryId === '') {
+        this.$notify.error({
+          title: 'wrong',
+          message: '请先选择仓库',
+          duration: 0
+        })
+      } else { this.empcontrol = true }
     },
     // 供应商列表返回数据
     supplierName(val) {

src/views/StockArrival/components/MyDialog.vue

@@ -23,7 +23,7 @@
               <el-col :span="12">
                 <el-form-item :label="$t('StockArrival.supplierId')" prop="supplierId" style="margin-left: 18px;width: 100%;margin-bottom: 0;">
                   <el-input v-model="supplierId" size="mini" style="margin-left: 18px;width: 200px" clearable @focus="handlechoose"/>
-                  <my-supplier :control.sync="empcontrol" @supplierName="supplierName"/>
+                  <my-supplier :control.sync="empcontrol" :supp2.sync="supp2" @supplierName="supplierName"/>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -345,6 +345,7 @@ export default {
       }
     }
     return {
+      supp2: null,
       repositorycontrol: false,
       arrivalRepositoryId: '',
       IsCurrency: false,
@@ -453,6 +454,7 @@ export default {
     },
     editdata() {
       this.personalForm = this.editdata
+      this.supp2 = this.personalForm.supplierId
       this.arrivalRepositoryId = this.personalForm.arrivalRepositoryName
       this.supplierId = this.personalForm.supplierName
       this.stockPersonId = this.personalForm.stockPersonName
@@ -475,6 +477,7 @@ export default {
       this.repositorycontrol = true
     },
     repositoryname(val) {
+      this.supp2 = val.id
       console.log(val)
       this.arrivalRepositoryId = val.repositoryName
       this.personalForm.arrivalRepositoryId = val.id
@@ -685,7 +688,13 @@ export default {
     },
     // 供应商输入框focus事件触发
     handlechoose() {
-      this.empcontrol = true
+      if (this.arrivalRepositoryId === undefined || this.arrivalRepositoryId === null || this.arrivalRepositoryId === '') {
+        this.$notify.error({
+          title: 'wrong',
+          message: '请先选择仓库',
+          duration: 0
+        })
+      } else { this.empcontrol = true }
     },
     // 供应商列表返回数据
     supplierName(val) {

src/views/StockArrival/components/MySupplier.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="employeeVisible" :control="control" :close-on-press-escape="false" top="10px" title="选择供应商" append-to-body @close="$emit('update:control', false)">
+  <el-dialog :visible.sync="employeeVisible" :control="control" :supp2="supp2" :close-on-press-escape="false" top="10px" title="选择供应商" append-to-body @close="$emit('update:control', false)">
     <div class="filter-container">
       <!-- 搜索条件栏目 -->
       <el-input v-model="getemplist.productName" :placeholder="$t('saleBillList.productName')" class="filter-item" clearable @keyup.enter.native="handleFilter"/>
@@ -144,6 +144,10 @@ export default {
     query: {
       type: Boolean,
       default: false
+    },
+    supp2: {
+      type: Number,
+      default: null
     }
   },
   data() {
@@ -171,6 +175,7 @@ export default {
       listLoading: true,
       // 供应商列表查询加展示参数
       getemplist: {
+        repositoryId: this.supp2,
         id: '',
         supplierName: '',
         typeId: '',
@@ -208,6 +213,11 @@ export default {
           this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 200
         }, 100)
       }
+    },
+    supp2() {
+      this.getemplist.repositoryId = this.supp2
+      this.getlist()
+      console.log(this.supp2)
     }
   },
   beforeCreate() {