Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie

# Conflicts:
#	src/main/resources/mapper_xml/DepotHeadMapper.xml

jshERP-web/src/components/jeecg/JEditableTable.vue

@@ -481,7 +481,7 @@
 
                     <!-- update-begin-author:jsh date:20210308 for：popupJsh -->
                     <template v-else-if="col.type === formTypes.popupJsh">
-                      <div style="width: 260px" :key="i">
+                      <div :key="i">
                         <a-tooltip
                           :id="id"
                           placement="top"

jshERP-web/src/components/jeecgbiz/JSelectList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="width: 100%">
     <a-input-group v-if="kind === 'material'" compact style="width: 100%; top: 0px">
       <a-select
         placeholder="输入批次号或名称"
@@ -12,6 +12,7 @@
         notFoundContent="需在商品管理先新增才能使用"
         @search="handleSearch"
         @change="handleChange"
+        style="width: 100%"
       >
         <div slot="dropdownRender" slot-scope="menu">
           <v-nodes :vnodes="menu" />
@@ -25,7 +26,7 @@
           </div>
         </div>
         <a-select-option v-for="item in materialData" :key="item.batchNumber">
-          {{ item.materialStr }}
+          {{ item.batchNumber }}
         </a-select-option>
       </a-select>
       <a-button icon="search" @click="onSearch" />

jshERP-web/src/views/system/modules/userSupplierModal.vue

@@ -109,6 +109,7 @@ export default {
           formData.type = 'UserSupplier'
           formData.keyId = this.roleId
           formData.value = this.checkedKeys.map((item) => Number(item))
+
           let obj
           checkUserBusiness({ type: 'UserSupplier', keyId: this.roleId }).then((res) => {
             if (res.data && res.data.id) {