diff --git a/src/api/base/base.js b/src/api/base/base.js
new file mode 100644
index 0000000..09a25cd
--- /dev/null
+++ b/src/api/base/base.js
@@ -0,0 +1,325 @@
+import request from '@/utils/request'
+
+// 工程项目-列表
+export function getProjectList(query) {
+  return request({
+    url: '/material/bm_project/list',
+    method: 'get',
+    params: query
+  })
+}
+//工程项目--新增
+export function addProject(data) {
+  return request({
+    url: '/material/bm_project',
+    method: 'post',
+    data: data
+  })
+}
+
+// 工程项目--修改
+export function updateProject(data) {
+  return request({
+    url: '/material/bm_project',
+    method: 'put',
+    data: data
+  })
+}
+// //工程项目--删除
+export function delProject(proId) {
+  return request({
+    url: '/material/bm_project/' + proId,
+    method: 'delete'
+  })
+}
+
+// 工程项目
+export function getProjectUserList(query) {
+  return request({
+    url: '/material/bm_unit_person/getDeptUserTree',
+    method: 'get',
+    params: {
+      query,  
+      isTree: 1 // 添加 isTree 参数
+    }
+  });
+}
+// 标段工程-列表
+export function ProjectLotList(query) {
+  return request({
+    url: '/material/base/bmProjectLot/projectLotAll',
+    method: 'get',
+    params: query
+  })
+}
+//标段工程--新增
+export function addProjectLot(data) {
+  return request({
+    url: '/material/base/bmProjectLot',
+    method: 'post',
+    data: data
+  })
+}
+
+// 标段工程--修改
+export function updateProjectLot(data) {
+  return request({
+    url: '/material/base/bmProjectLot',
+    method: 'put',
+    data: data
+  })
+}
+//标段工程--删除
+export function delProjectLot(lotId) {
+  return request({
+    url: '/material/base/bmProjectLot/' + lotId,
+    method: 'delete'
+  })
+}
+//工程项目下拉数据
+export function getProjectSelect(data) {
+  return request({
+    url: '/material/base/bmProjectInfo/getProjectLot',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 往来单位-列表
+export function unitInfoAll(query) {
+  return request({
+    url: '/material/bm_unit/list',
+    method: 'get',
+    params: query
+  })
+}
+//往来单位--新增
+export function addUnit(data) {
+  return request({
+    url: '/material/bm_unit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 往来单位--修改
+export function updateUnit(data) {
+  return request({
+    url: '/material/bm_unit',
+    method: 'put',
+    data: data
+  })
+}
+// 往来单位--删除
+export function delUnit(unitId) {
+  return request({
+    url: '/material/bm_unit/' + unitId,
+    method: 'delete'
+  })
+}
+
+
+// 往来单位-人员配置-左侧人员
+export function getUserList(query) {
+  return request({
+    url: '/material/bm_unit_person/getDeptUserTree',
+    method: 'get',
+    params: query
+  })
+}
+
+// 往来单位-人员配置-右侧单位
+export function getTypeList(query) {
+  return request({
+    url: '/material/bm_unit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 往来单位-人员配置-保存按钮
+export function unitPersonAll(query) {
+  return request({
+    url: '/material/bm_unit_person/bind',
+    method: 'post',
+    data: query
+  })
+}
+
+// 往来单位-人员配置-解绑
+export function delUnitPerson(unitId) {
+  return request({
+    url: '/material/bm_unit_person/' + unitId,
+    method: 'delete'
+  })
+}
+
+
+// 字典表数据库
+// 单位类型-列表
+export function unitTypeList(query) {
+  return request({
+    url: '/material/bm_unit_type/list',
+    method: 'get',
+    params: query
+  })
+}
+// 单位类型-列表-下拉
+export function unitTypeListAll(query) {
+  return request({
+    url: '/material/bm_unit_type/list',
+    method: 'get',
+    params: query
+  })
+}
+// 标签编号-列表
+export function getMaMachineLabelApi(query) {
+  return request({
+    url: '/material/base/maMachineLabel/list',
+    method: 'get',
+    params: query
+  })
+}
+//单位类型--新增
+export function addMaMachineLabelApi(data) {
+  return request({
+    url: '/material/bm_unit_type',
+    method: 'post',
+    data: data
+  })
+}
+// 单位类型-详情
+export function unitTypeDetail(typeId) {
+  return request({
+    url: `/material/bm_unit_type/${typeId}`,
+    method: 'get',
+  })
+}
+//单位类型--新增
+export function addUnitType(data) {
+  return request({
+    url: '/material/bm_unit_type',
+    method: 'post',
+    data: data
+  })
+}
+
+// 单位类型--修改
+export function updateUnitType(data) {
+  return request({
+    url: '/material/bm_unit_type',
+    method: 'put',
+    data: data
+  })
+}
+
+export function statusUnitType(data) {
+  return request({
+    url: '/material/base/dic/status',
+    method: 'put',
+    params: data
+  })
+}
+
+//单位类型--删除
+export function delUnitType(typeIds) {
+  return request({
+    url: '/material/bm_unit_type/' + typeIds,
+    method: 'delete'
+  })
+}
+
+
+
+// 资产属性管理-列表
+export function propInfoList(query) {
+  return request({
+    url: '/material/bm_asset_attributes/list',
+    method: 'get',
+    params: query
+  })
+}
+//资产属性管理--新增
+export function addPropInfo(data) {
+  return request({
+    url: '/material/bm_asset_attributes',
+    method: 'post',
+    data: data
+  })
+}
+
+// 资产属性管理--修改
+export function updatePropInfo(data) {
+  return request({
+    url: '/material/bm_asset_attributes',
+    method: 'put',
+    data: data
+  })
+}
+//资产属性管理--删除
+export function delPropInfo(id) {
+  return request({
+    url: `/material/bm_asset_attributes/${id}`,
+    method: 'delete'
+  })
+}
+
+// 资产属性管理-详情
+export function PropDetail(id) {
+  return request({
+    url: `/material/bm_asset_attributes/${id}`,
+    method: 'get',
+  })
+}
+
+
+
+// // 资产属性配置-左侧人员
+// export function getProLists(query) {
+//   return request({
+//     url: '/material/base/maPropInfo/lists',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 资产属性配置-右侧list
+// export function getMaTypeList(query) {
+//   return request({
+//     url: '/material/base/maPropInfo/getMaTypeList',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 资产属性配置-保存按钮
+// export function savePropInfo(query) {
+//   return request({
+//     url: '/material/base/maPropInfo/save',
+//     method: 'post',
+//     data: query
+//   })
+// }
+
+// // 资产属性配置-解绑
+// export function UnbindPropInfo(unitId) {
+//   return request({
+//     url: '/material/base/maPropSet/' + unitId,
+//     method: 'delete'
+//   })
+// }
+
+
+// 获取设备信息-qrCode
+export function getMachineByQrCode(query) {
+  return request({
+    url: '/material/base/machine/getMachineByQrCode',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+
diff --git a/src/api/baseGround/manufacturer.js b/src/api/baseGround/manufacturer.js
index 1815f1b..d3cbc8d 100644
--- a/src/api/baseGround/manufacturer.js
+++ b/src/api/baseGround/manufacturer.js
@@ -1,64 +1,48 @@
 import request from '@/utils/request'
 
 //机具类型管理列表信息
-export function getListHouse(query) {
+export function getListFacturer(query) {
   return request({
-      url: '/material/wh_house_info/list',
+      url: '/material/ma_supplier_info/list',
       method: 'get',
       params: query,
   })
 }
 
 //查看机具类型管理列表详细信息
-export function getHouseDetail(id) {
+export function getFacturerDetail(id) {
   return request({
-      url: '/material/wh_house_info/'+ id,
+      url: '/material/ma_supplier_info/'+ id,
       method: 'get',
   })
 }
 
 
-// 物资名称下拉框-
-export function queryKeeperNameApi(query) {
-  return request({
-    url: '/material/ma_type/selectMaTypeListByTypeId',
-    method: 'get',
-    params: query
-  })
-}
-
 // 仓库管理--删除
-export function delHouse(id) {
+export function delFacturer(id) {
   return request({
-      url: '/material/wh_house_info/' + id,
+      url: '/material/ma_supplier_info/' + id,
       method: 'delete',
   })
 }
 
 // 仓库管理--修改
-export function editHouse(data) {
+export function editFacturer(data) {
   return request({
-      url: '/material/wh_house_info',
+      url: '/material/ma_supplier_info',
       method: 'put',
       data: data,
   })
 }
 
 // 仓库管理--新增
-export function addHouse(data) {
+export function addFacturer(data) {
   return request({
-      url: '/material/wh_house_info',
+      url: '/material/ma_supplier_info',
       method: 'post',
       data: data,
   })
 }
 
-// 工程项目-列表
-export function getProjectList(query) {
-  return request({
-    url: '/material/base/bmProjectInfo/projectInfoAll',
-    method: 'get',
-    params: query
-  })
-}
+
 
diff --git a/src/api/system/upload.js b/src/api/system/upload.js
index 815d5b7..c8edd2e 100644
--- a/src/api/system/upload.js
+++ b/src/api/system/upload.js
@@ -12,6 +12,20 @@ export function imgUpLoad(param){
     })
   }
 
+  export function imgUpLoadTwo(param){
+    const formData = new FormData()
+    formData.append('file', param.file)
+    formData.append('fileType', param.type)
+    return request({
+      url: '/file/upload',
+      method: 'post',
+      data: formData,
+      header:'multipart/form-data'
+    })
+  }
+
+
+
 //资源文件上传
 export function fileUpLoad(param){
     const formData = new FormData()
diff --git a/src/assets/file.png b/src/assets/file.png
new file mode 100644
index 0000000..9289fcd
Binary files /dev/null and b/src/assets/file.png differ
diff --git a/src/views/base/assetAttributeManagement/index.vue b/src/views/base/assetAttributeManagement/index.vue
index d144269..ce457fd 100644
--- a/src/views/base/assetAttributeManagement/index.vue
+++ b/src/views/base/assetAttributeManagement/index.vue
@@ -181,12 +181,12 @@
 // import {
 //   refreshCache,
 // } from '@/api/system/dict/type'
-// import {
-//   addPropInfo,
-//   delPropInfo,
-//   propInfoList,
-//   updatePropInfo,
-// } from '@/api/base/base'
+import {
+  addPropInfo,
+  delPropInfo,
+  propInfoList,
+  updatePropInfo,
+} from '@/api/base/base'
 // import { deptTreeSelect } from '@/api/system/user'
 // import Treeselect from '@riophae/vue-treeselect'
 // import '@riophae/vue-treeselect/dist/vue-treeselect.css'
diff --git a/src/views/base/comeAndGo/index.vue b/src/views/base/comeAndGo/index.vue
index 3b0e530..00d92da 100644
--- a/src/views/base/comeAndGo/index.vue
+++ b/src/views/base/comeAndGo/index.vue
@@ -252,7 +252,7 @@
 </template>
 
 <script>
-// import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
+import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
 // import { unitTypeListAll } from '@/api/base/base'
 import { deptTreeSelect } from '@/api/system/user'
 import Treeselect from '@riophae/vue-treeselect'
diff --git a/src/views/base/comeAndGo/people.vue b/src/views/base/comeAndGo/people.vue
index 2fa1880..97e238b 100644
--- a/src/views/base/comeAndGo/people.vue
+++ b/src/views/base/comeAndGo/people.vue
@@ -383,7 +383,7 @@
 <script>
 
 import { deptTreeSelect } from "@/api/system/user";
-// import { getUserList, getTypeList, unitPersonAll, delUnitPerson } from "@/api/base/base";
+import { getUserList, getTypeList, unitPersonAll, delUnitPerson } from "@/api/base/base";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index 2e81586..b279eaf 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -339,14 +339,14 @@
 </template>
 
 <script>
-// import {
-//     addProject,
-//     delProject,
-//     getProjectList,
-//     updateProject,
-//     getProjectUserList,
-// } from '@/api/base/base'
-// import { unitTypeList } from '@/api/base/base'
+import {
+    addProject,
+    delProject,
+    getProjectList,
+    updateProject,
+    getProjectUserList,
+} from '@/api/base/base'
+import { unitTypeList } from '@/api/base/base'
 // import { deptTreeSelect } from '@/api/system/user'
 // import Treeselect from '@riophae/vue-treeselect'
 // import '@riophae/vue-treeselect/dist/vue-treeselect.css'
diff --git a/src/views/base/unit/index.vue b/src/views/base/unit/index.vue
index 2e1ddbc..595f792 100644
--- a/src/views/base/unit/index.vue
+++ b/src/views/base/unit/index.vue
@@ -242,14 +242,14 @@
 </template>
 
 <script>
-// import {
-//   addUnitType,
-//   delUnitType,
-//   unitTypeList,
-//   updateUnitType,
-//   statusUnitType,
-//   unitTypeDetail,
-// } from '@/api/base/base'
+import {
+  addUnitType,
+  delUnitType,
+  unitTypeList,
+  updateUnitType,
+  statusUnitType,
+  unitTypeDetail,
+} from '@/api/base/base'
 
 export default {
   name: 'Unit',
diff --git a/src/views/materialsManage/manufacturer/index.vue b/src/views/materialsManage/manufacturer/index.vue
index 5ad6126..06957a6 100644
--- a/src/views/materialsManage/manufacturer/index.vue
+++ b/src/views/materialsManage/manufacturer/index.vue
@@ -43,19 +43,7 @@
                           @queryTable="getList"
                       ></right-toolbar>
       </el-row>
-      <!-- <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['bracelet:construction:export']"
-          >导出数据</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row> -->
+
   
       <el-table v-loading="loading" :data="houseList" ref="multipleTable" row-key="teamId">
         <!-- <el-table-column type="selection" width="55" align="center" :reserve-selection="true" /> -->
@@ -64,12 +52,12 @@
             <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="厂家名称" align="center" prop="houseName" sortable/>
-        <el-table-column label="厂家地址" align="center" prop="physicalName" sortable/>
-        <el-table-column label="法人代表" align="center" prop="geoLocation" sortable/>
-        <el-table-column label="主要联系人" align="center" prop="houseName" sortable/>
-        <el-table-column label="联系电话" align="center" prop="houseName" sortable/>
-        <el-table-column label="主要经营范围" align="center" prop="houseName" sortable/>
+        <el-table-column label="厂家名称" align="center" prop="supplier" sortable/>
+        <el-table-column label="厂家地址" align="center" prop="address" sortable/>
+        <el-table-column label="法人代表" align="center" prop="legalPerson" sortable/>
+        <el-table-column label="主要联系人" align="center" prop="primaryContact" sortable/>
+        <el-table-column label="联系电话" align="center" prop="phone" sortable/>
+        <el-table-column label="主要经营范围" align="center" prop="businessScope" sortable/>
         <el-table-column label="备注" align="center" prop="remark" sortable>
         </el-table-column>
         <el-table-column label="操作" align="center" width="180">
@@ -105,24 +93,22 @@
       />
   
      <!-- 新增或修改弹窗 -->
-     <el-dialog :title="title" :visible.sync="showHouse" width="600px"   append-to-body>
+     <el-dialog :title="title" :visible.sync="showHouse" width="1000px"   append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="120px" >
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="厂家名称" prop="leasePrice" >
+                        <el-form-item label="厂家名称" prop="supplier" >
                             <el-input
-                                v-model="form.leasePrice"
-                                type="number"
+                                v-model="form.supplier"
                                 placeholder="请输入厂家名称"
-                                maxlength="10"
+                                maxlength="30"
                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="厂家地址" prop="buyPrice">
+                        <el-form-item label="厂家地址" prop="address">
                             <el-input
-                                v-model="form.buyPrice"
-                                type="number"
+                                v-model="form.address"
                                 placeholder="请输入厂家地址"
                                 maxlength="30"
                             />
@@ -132,20 +118,18 @@
      
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="法人代表" prop="leasePrice" >
+                        <el-form-item label="法人代表" prop="legalPerson" >
                             <el-input
-                                v-model="form.leasePrice"
-                                type="number"
+                                v-model="form.legalPerson"
                                 placeholder="请输入法人代表"
                                 maxlength="10"
                             />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="主要联系人" prop="buyPrice">
+                        <el-form-item label="主要联系人" prop="primaryContact">
                             <el-input
-                                v-model="form.buyPrice"
-                                type="number"
+                                v-model="form.primaryContact"
                                 placeholder="请输入主要联系人"
                                 maxlength="30"
                             />
@@ -155,65 +139,81 @@
 
                 <el-row>
                     <el-col :span="12">
-                        <el-form-item label="待报废数量" prop="leasePrice" >
+                        <el-form-item label="联系电话" prop="phone" >
                             <el-input
-                                v-model="form.leasePrice"
-                                type="number"
-                                placeholder="请输入待报废数量"
-                                maxlength="10"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="丢失数量" prop="buyPrice">
-                            <el-input
-                                v-model="form.buyPrice"
-                                type="number"
-                                placeholder="请输入丢失数量"
-                                maxlength="30"
+                                v-model="form.phone"
+                                placeholder="请输入联系电话"
+                                maxlength="11"
                             />
                         </el-form-item>
                     </el-col>
                 </el-row> 
-
-           <el-row :gutter="24">  
-            <el-col :span="20">
-           <el-form-item label="所属组织">
-                            <el-select
-                                v-model="form.parentId"
-                                filterable
-                                placeholder="请选择所属组织"
-                                style="width: 100%;"
-
-                            >
-                                <el-option 
-                                    v-for="keeper in keeperDataRange"
-                                    :key="keeper.value"
-                                    :label="keeper.label"
-                                    :value="keeper.value"
-                                ></el-option>
-
-                            </el-select>
-           </el-form-item>
-
-          </el-col> 
-        </el-row> 
-           <el-row :gutter="24">  
-             <el-col :span="20">
-               <el-form-item label="备注" prop="remark">
+           <el-row >  
+             <el-col :span="12">
+               <el-form-item label="主要联系范围" prop="businessScope">
                 <el-input
                   type="textarea"
-                  :rows="5"
-                  placeholder="请输入备注"
-                  v-model="form.remark"
-                  maxlength="50"
+                  :rows="6"
+                  placeholder="输入内容"
+                  v-model="form.businessScope"
                   show-word-limit
                   >
                 </el-input>
                 </el-form-item>      
              </el-col> 
-           </el-row> 
 
+            <el-col :span="12">
+               <el-form-item label="备注" prop="remark">
+                <el-input
+                  type="textarea"
+                  :rows="6"
+                  placeholder="请输入备注"
+                  v-model="form.remark"
+                  maxlength="100"
+                  show-word-limit
+                  >
+                </el-input>
+                </el-form-item> 
+            </el-col>
+           </el-row> 
+        <el-form-item label="营业执照">
+          <el-upload
+              class = "upload-demo"
+              action="#"
+              :file-list="businessLicenseList"
+              :show-file-list="true"
+              :auto-upload="false"
+              list-type="picture-card"
+              accept=".png, .jpg, .jpeg, .pdf, .doc, .docx"
+              :on-change="handleChangeBusinessList"
+              :class="{ disabled: uploadDisabled }"
+              :on-preview="picturePreview"
+              :on-remove="handleRemoveElectricianImgList"
+          >
+
+           <!-- 文件格式下载，图片格式预览 -->
+           <div slot="file" slot-scope="{file}">
+              <img v-if="isImage(file)" class="el-upload-list__item-thumbnail"  :src="file.url" alt="">
+              <div v-else class="picture-card-container" >
+                <img class="picture-card" :src="urlTemp" alt="">
+                <p class="file-name">{{ file.name }}</p>
+              </div>
+              <span class="el-upload-list__item-actions">
+                <span v-if="updataIf(file)" class="el-upload-list__item-delete" @click="handleDownload(file)">
+                <i class="el-icon-download" />
+                </span>
+                <span v-else class="el-upload-list__item-preview" @click="picturePreview(file)">
+                <i class="el-icon-zoom-in" />
+                </span>
+                <span class="el-upload-list__item-delete" @click="handleRemoveElectricianImgList(file)">
+                <i class="el-icon-delete" />
+                </span>
+              </span>
+          </div>
+
+              <i class="el-icon-plus avatar-uploader-icon" ></i>
+          </el-upload>
+        </el-form-item>
           
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -222,11 +222,16 @@
         </div>
       </el-dialog>
   
+      <!-- 图片查看弹窗 -->
+    <el-dialog :visible.sync="dialogVisible" width="500px" height="500px" >
+      <img width="100%" height="500px" :src="dialogImageUrl"  />
+    </el-dialog>
     </div>
   </template> 
   
   <script>
-  import { getListHouse,getHouseDetail,editHouse,addHouse,delHouse } from "@/api/baseGround/manufacturer";
+  import { getListFacturer,getFacturerDetail,editFacturer,addFacturer,delFacturer } from "@/api/baseGround/manufacturer";
+  import { imgUpLoadTwo, fileUpLoad } from '@/api/system/upload'
   import { downloadFile } from '@/utils/download'
   export default {
     name: "Post",
@@ -284,59 +289,160 @@
             teamId: undefined,
           },
 
-
-        // 表单参数
+        fileList:[],
+        businessLicenseList:[],
+        businessLicenseFileList:[],
+        delBusinessFileIdList:[],
+       //图片查看弹窗
+        dialogImageUrl: '',
+        dialogVisible: false,
+       // 表单参数
         form: {},
-              // 表单校验
-              rules: {
-                houseName: [
-                    {
-                        required: true,
-                        message: '仓库名称不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                geoLocation: [
-                    {
-                        required: false,
-                        message: '地理位置不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                physicalName: [
-                    {
-                        required: false,
-                        message: '实物库不能为空',
-                        trigger: 'blur',
-                    },
-                ],
-                leasePrice: [
-                    {
-                        required: true,
-                        message: '请选择所属组织',
-                        trigger: 'change',
-                    },
-                ],
-                remark: [
-                    {
-                        required: false,
-                        message: '备注不能为空',
-                        trigger: 'blur',
-                    },
-                ],
+       // 表单校验
+       rules: {
                 
-
             },
       };
     },
+    computed: {
+   
+      //图片上传1张后，隐藏上传框
+      uploadDisabled() {
+          return this.fileList.length > 0
+      },
+    },
     created() {
       this.getList();
     },
     methods: {
-      /** 查询岗位列表 */
+    //提交时循环fileList 获取raw文件
+      getFileData() {
+        const fileTwo = []
+        this.businessLicenseList.forEach(item => {
+          if (item?.hasOwnProperty('raw')) {
+            fileTwo.push(item.raw)
+          }
+        })
+        return { fileTwo }
+      },
+
+      // 图片上传
+        imgUpLoadTwo(param, name, index) {
+            console.log(param, 'image')
+            param.type = 'ma'
+            imgUpLoadTwo(param)
+                .then((res) => {
+                    if (res.code == 200) {
+                        this.imageUrl = res.data.fileUrl
+                    } else {
+                        // this.$msgError(res.msg)
+                        this.$modal.msgError(res.msg)
+                    }
+                })
+                .catch((error) => {
+                    // this.$msgError(error)
+                    this.$modal.msgError(error)
+                })
+        },
+      
+      //上传组件-图片查看
+      picturePreview(file) {
+        this.dialogImageUrl = file.url;
+        const parts = file.name.split('.');
+        const extension = parts.pop();
+        if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+          const windowName = file.name;
+          window.open(file.url,windowName)
+        }else{
+          this.dialogVisible = true
+        }
+      },
+        handleRemoveElectricianImgList(file, fileList) {
+          let sum = 0
+          this.businessLicenseList.forEach((item, index) => {
+              if (item.uid == file.uid) {
+                  sum = index
+              }
+          })
+         
+         
+          this.businessLicenseList.splice(sum, 1)
+      },
+
+        isImage(file){
+          this.urlTemp = require('@/assets/file.png');
+          if(this.updataIf(file)){
+              return false
+        }else{
+          return true
+        }
+      },
+    // 判断文件类型,图片预览，文件下载
+     updataIf(e) {
+              if (e.fileName) {
+                const parts = e.fileName.split('.');
+                const extension = parts.pop();
+                  if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+                      return false
+                  } else {
+                  return true
+                  }
+              } else {
+                const parts = e.name.split('.');
+                const extension = parts.pop();
+                  if (extension === 'png' || extension === 'jpeg' || extension === 'jpg') {
+                      return false
+                  } else {
+                      return true
+                  }
+              }
+          },
+
+      handleChangeBusinessList(file, fileList) {
+        const fileListTemp = fileList.filter(item => {
+                      return item.uid != file.uid
+                  });
+        const parts = file.name.split('.');
+        const extension = parts.pop();
+        if(fileList.length > 3){
+          this.$message.warning('最多上传3张营业执照')
+          fileList = fileList.filter(item => {
+              return item.uid != file.uid
+          })
+        }else if(!(extension === 'pdf' || extension === 'png' || extension === 'jpg' || extension === 'jpeg')){
+              this.$message.warning('文件格式不正确')
+              fileList = fileList.filter(item => {
+                  return item.uid != file.uid
+              })
+        }else if(file.size > 1024 * 1024 * 10){
+                  this.$message.warning('文件大小不能超过10Mb')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(file.name.length > 40){
+                  this.$message.warning('文件名长度不能超过40个字符')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }else if(fileListTemp.some(item =>item.name === file.name)){
+                  this.$message.warning('文件名重复')
+                  fileList = fileList.filter(item => {
+                      return item.uid != file.uid
+                  })
+        }
+        fileList.forEach(file=>{
+                  if(extension === 'doc'||extension === 'docx'||extension === 'pdf'){
+                      this.urlTemp = require('../../../assets/file.png');
+                  
+                  }
+        }),
+        this.businessLicenseList = fileList;
+        console.log('businessLicenseList',this.businessLicenseList)
+      },
+
       getList() {
         this.loading = true;
-        getListHouse(this.queryParams).then(response => {
+        getListFacturer(this.queryParams).then(response => {
           this.houseList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -352,8 +458,8 @@
 
         handleUpdate(row){
           this.reset()
-          const houseId = row.houseId 
-            getHouseDetail(houseId).then((response) => {
+          const supplierId = row.supplierId 
+            getFacturerDetail(supplierId).then((response) => {
                 this.form = response.data;
             
                 this.showHouse = true
@@ -376,19 +482,44 @@
         //** 提交按钮 */
         submitForm() { 
           this.$refs["form"].validate(valid => {
-          if (valid) {
-              if (this.form.houseId != undefined) {
-                editHouse(this.form).then(response => {
+          if (valid) {           
+              if (this.form.supplierId != undefined) {
+                 const reqData = new FormData();
+                editFacturer(this.form).then(response => {
                   this.$modal.msgSuccess("修改成功");
                   this.showHouse = false;
                   this.getList();
+                  this.businessLicenseList=[];
+                  this.delBusinessFileIdList=[];
                 });
               } else {
-    
-                addHouse(this.form).then(response => {
+                const reqData = new FormData()
+                const {fileTwo} = this.getFileData()
+                fileTwo.forEach(item=>{
+                let obj={file: item}
+                imgUpLoadTwo(obj)
+                  .then((res) => {
+                      if (res.code == 200) {
+                          this.imageUrl = res.data.fileUrl
+                          this.businessLicenseFileList.push(this.imageUrl);
+                      } else {
+                          // this.$msgError(res.msg)
+                          this.$modal.msgError(res.msg)
+                      }
+                  })
+                  .catch((error) => {
+                      // this.$msgError(error)
+                      this.$modal.msgError(error)
+                })
+                })
+                  this.form.businessLicenseFileList=this.businessLicenseFileList
+                addFacturer(this.form).then(response => {
                   this.$modal.msgSuccess("新增成功");
                   this.showHouse = false;
                   this.getList();
+                  this.businessLicenseList=[];
+                  this.delBusinessFileIdList=[];
+                   this.businessLicenseFileList=[];
                 });
             }
             }
@@ -398,16 +529,17 @@
         // 取消按钮
         cancel() {
           this.showHouse = false;
+           this.businessLicenseList=[];
           this.reset();
         },
 
         /** 删除按钮操作 */
         handleDelete(row) {
-            const houseIds = row.houseId
+            const supplierId = row.supplierId
             this.$modal
                 .confirm('是否确认删除数据项？')
                 .then(function () {
-                    return delHouse(houseIds)
+                    return delFacturer(supplierId)
                 })
                 .then(() => {
                     this.$modal.msgSuccess('删除成功')
@@ -453,4 +585,62 @@
           display: none;
       }
   }
+  ::v-deep .el-upload-list--picture-card{
+  display: flex;
+}
+::v-deep .el-upload-list__item {
+  margin-bottom: 20px;
+  overflow: revert;
+}
+::v-deep .el-upload-list__item-actions{
+  overflow:hidden; 
+}
+.upload-demo{
+  display: flex;
+}
+.el-upload-list__item-thumbnail{
+  height: 145px!important;
+}
+.picture-card-container{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: relative;
+}
+.picture-card{
+  width: 100%;
+  height: 100%;
+  object-fit:cover;
+  justify-content: center;
+  // border: 1px solid  #ddd;
+  // border-radius: 4px;
+}
+.file-name{
+  width: 90%;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  position: absolute;
+  bottom: -35px;
+  margin-top: 8px;
+  text-align: center;
+  font-size: 12px;
+  color:#333;
+  z-index: 999999;
+}
+.file-overlay{
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+  font-size: 20px;
+}
   </style>
\ No newline at end of file