diff --git a/src/assets/images/menu/xmgk_ckgl.png b/src/assets/images/menu/xmgk_ckgl.png
new file mode 100644
index 00000000..b0336c99
Binary files /dev/null and b/src/assets/images/menu/xmgk_ckgl.png differ
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index b89e821b..4bb2a837 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   
   // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
   // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
-  axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
+  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
@@ -80,7 +80,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
   // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
-  // axios.defaults.baseURL = 'http://192.168.34.221:8070' //郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.221:8070' //郭圣雄本地
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
   // axios.defaults.baseURL = 'http://101.43.164.214:12345/#/'//内蒙古线上
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
diff --git a/src/router/index.js b/src/router/index.js
index 9110577b..fe731918 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1070,28 +1070,46 @@ const routes2 = [
       // 仓库管理-------------------
       {
         path: "/warehouseManagement/basicInformation/warehouseList",
-        name: "物料管理_基础信息管理_仓库管理_仓库列表",
+        name: "物料管理_基础信息管理_仓库管理",
         component: () =>
           import("@/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue")
       },
       {
         path: "/warehouseManagement/basicInformation/InventorySituation",
-        name: "物料管理_基础信息管理_仓库管理_库存情况",
+        name: "物料管理_基础信息管理_库存情况",
         component: () =>
           import("@/views/projectFront/warehouseManagement/basicInformation/InventorySituation.vue")
       },
       {
         path: "/warehouseManagement/basicInformation/productClassification",
-        name: "物料管理_基础信息管理_货品管理_货品分类",
+        name: "物料管理_基础信息管理_货品管理",
         component: () =>
           import("@/views/projectFront/warehouseManagement/basicInformation/productClassification.vue")
       },
       {
         path: "/warehouseManagement/basicInformation/productManagement",
-        name: "物料管理_基础信息管理_货品管理_货品规格",
+        name: "物料管理_基础信息管理_供应商管理",
         component: () =>
           import("@/views/projectFront/warehouseManagement/basicInformation/productManagement.vue")
       },
+      {
+        path: "/warehouseManagement/basicInformation/materialReceiving",
+        name: "物料管理_基础信息管理_领料单位管理",
+        component: () =>
+          import("@/views/projectFront/warehouseManagement/basicInformation/materialReceiving.vue")
+      },
+      {
+        path: "/warehouseManagement/basicInformation/outsourcingManagement",
+        name: "物料管理_基础信息管理_部门或外加工管理",
+        component: () =>
+          import("@/views/projectFront/warehouseManagement/basicInformation/outsourcingManagement.vue")
+      },
+      {
+        path: "/warehouseManagement/basicInformation/employeeManagement",
+        name: "物料管理_基础信息管理_员工管理",
+        component: () =>
+          import("@/views/projectFront/warehouseManagement/basicInformation/employeeManagement.vue")
+      },
 
 
 
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/InventorySituation.vue b/src/views/projectFront/warehouseManagement/basicInformation/InventorySituation.vue
index a01a1a3f..ebf89176 100644
--- a/src/views/projectFront/warehouseManagement/basicInformation/InventorySituation.vue
+++ b/src/views/projectFront/warehouseManagement/basicInformation/InventorySituation.vue
@@ -2,7 +2,7 @@
   <div class="fullHeight">
     <div class="block fullHeight">
       <div class="system-left">
-        <div class="pageTitle">仓库</div>
+        <div class="pageTitle">库存情况</div>
         <div class="titleSearch">
           <el-input placeholder="请输入仓库名称" v-model="title"></el-input>
         </div>
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/employeeManagement.vue b/src/views/projectFront/warehouseManagement/basicInformation/employeeManagement.vue
new file mode 100644
index 00000000..cecc6850
--- /dev/null
+++ b/src/views/projectFront/warehouseManagement/basicInformation/employeeManagement.vue
@@ -0,0 +1,486 @@
+<template>
+  <div class="fullHeight whiteBlock">
+    <div style="padding: 15px 15px 0">
+      <p class="pageTitle">员工管理</p>
+      <el-form
+        :inline="true"
+        ref="searchForm"
+        :model="searchForm"
+        size="medium"
+      >
+       
+        <el-form-item
+          label="姓名"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="联系人电话"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+       
+        <el-form-item
+          label="备注"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+       
+        <el-form-item>
+          <el-button type="primary" plain @click="getList">{{
+            $t('message.energyManage.waybill.query')
+          }}</el-button>
+          <el-button type="warning" plain @click="refresh">{{
+            $t('message.deviceManage.refresh')
+          }}</el-button>
+          <el-button type="primary" size="medium" @click="add">新增</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="List">
+      
+        <el-table-column
+          prop="wayBillNumber"
+          label="姓名"
+          align="center"
+        ></el-table-column>
+       
+        <el-table-column
+          prop="materialSpecifications"
+          align="center"
+          label="电话"
+        ></el-table-column>
+        <el-table-column
+          prop="computeUnit"
+          align="center"
+          label="性别"
+        ></el-table-column>
+        <el-table-column
+          prop="wayBillNum"
+          label="联系地址"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="wayBillNum"
+          label="备注"
+          align="center"
+        >
+        </el-table-column>
+        
+        <el-table-column
+          :label="$t('message.deviceManage.operation')"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.edit') }}</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.delete') }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="pagInfo.pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pagInfo.pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(pagInfo.total)"
+        background
+      ></el-pagination>
+    </div>
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="
+        Popup.type == 'edit'
+          ? $t('message.energyManage.material.edit')
+          : $t('message.energyManage.material.add')
+      "
+      :visible.sync="Popup.show"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          ref="addEditForm"
+          :model="addEditForm"
+          :rules="addEditRules"
+          label-width="120px"
+          class="dialogFormBox"
+        >
+          
+         
+          <el-form-item
+            label="仓库名称"
+            prop="wayBillNumber"
+          >
+            <el-input
+              v-model="addEditForm.wayBillNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="仓库位置"
+            prop="wayBillNum"
+          >
+            <el-input
+              v-model="addEditForm.wayBillNum"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人电话"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="备注"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+        
+       
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="Popup.show = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.deviceManage.cancel') }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit"
+              size="medium"
+              >{{ $t('message.deviceManage.save') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addmaterialPurchaseWayBillApi,
+  editmaterialPurchaseWayBillApi,
+  deletematerialPurchaseWayBillApi,
+  materialPurchaseWayBillPageApi,
+  selectProcurementContractMaterialListApi,
+  selectProjectCooperationUnitListApi,
+  getMaterialPurchaseInfoApi,
+  materialPurchaseOrderPageApi
+} from '@/assets/js/api/materialManage'
+export default {
+  mounted() {
+    this.getFeedUnitList()
+    this.getPurchaseOrderList()
+    this.getList()
+  },
+  data() {
+    return {
+      addEditRules: {
+        purchaseOrderId: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        materialId: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        wayBillNumber: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        wayBillNum: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        carNumber: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        deliveryTime: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ]
+      },
+      addEditForm: {
+        carNumber: '',
+        deliveryTime: '',
+        materialId: '',
+        projectSn: '',
+        purchaseOrderId: '',
+        wayBillNum: '',
+        wayBillNumber: ''
+      },
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0 //总条数
+      },
+      List: [],
+      Popup: {
+        type: 'add',
+        show: false
+      },
+      allCompanyList: [],
+      contractList: [],
+      feedUnitList: [],
+      searchForm: {
+        materialName: '',
+        enterpriseId: ''
+      },
+      purchaseOrderList: [],
+      orderMaterialList: []
+    }
+  },
+  methods: {
+    //获取供料单位列表
+    getFeedUnitList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+        cooperationType: 1
+      }
+      selectProjectCooperationUnitListApi(data).then((res) => {
+        this.feedUnitList = res.result
+      })
+    },
+    //获取采购订单列表
+    getPurchaseOrderList() {
+      let json = {
+        projectSn: this.$store.state.projectSn,
+        pageNo: 1,
+        pageSize: 100,
+        state: 2
+      }
+      materialPurchaseOrderPageApi(json).then((result) => {
+        this.purchaseOrderList = result.result.records
+      })
+    },
+    //获取订单详细
+    getPurchaseOrderDetail() {
+      getMaterialPurchaseInfoApi({
+        purchaseOrderId: this.addEditForm.purchaseOrderId
+      }).then((res) => {
+        this.orderMaterialList = res.result.itemList
+      })
+    },
+    handle(type, show) {
+      //打开弹窗前的统一处理
+      this.Popup = {
+        type: type,
+        show: show
+      }
+    },
+    changeMaterial() {
+      this.allCompanyList.forEach((element) => {
+        if (element.id == this.addEditForm.materialId) {
+          // this.addEditForm.contractId=element.contractId
+          this.addEditForm.computeUnit = element.computeUnit
+        }
+      })
+    },
+    add() {
+      this.handle('add', true)
+    },
+    edit(obj) {
+      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.handle('edit', true)
+    },
+    deleteDev(obj) {
+      console.log('删除', obj)
+      this.$confirm(
+        this.$t('message.personnelPosition.beaconManage.table.confirmText') +
+          '【' +
+          obj.wayBillNumber +
+          '】?',
+        this.$t('message.personnelPosition.beaconManage.table.Tips'),
+        {
+          confirmButtonText: this.$t(
+            'message.personnelPosition.confirmButtonText'
+          ),
+          cancelButtonText: this.$t(
+            'message.personnelPosition.cancelButtonText'
+          ),
+          type: 'warning'
+        }
+      ).then(() => {
+        deletematerialPurchaseWayBillApi({ id: obj.id }).then((result) => {
+          if (result.success) {
+            this.$message.success(result.message)
+            this.getList()
+          }
+        })
+      })
+    },
+    submit() {
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.Popup.type === 'add') {
+            addmaterialPurchaseWayBillApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          } else if (this.Popup.type === 'edit') {
+            console.log('编辑信息', this.addEditForm)
+            editmaterialPurchaseWayBillApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          }
+          this.Popup.show = false
+        } else {
+          return false
+        }
+      })
+    },
+    refresh() {
+      this.$refs['searchForm'].resetFields()
+      this.pagInfo.pageNo = 1 //页数
+      this.pagInfo.pageSize = 10 //条数
+      this.getList()
+    },
+    getList() {
+      materialPurchaseWayBillPageApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        enterpriseId: this.searchForm.enterpriseId,
+        materialName: this.searchForm.materialName
+      }).then((result) => {
+        if (result.success) {
+          this.List = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+    },
+    close() {
+      this.addEditForm = {}
+      this.$nextTick(() => {
+        this.$refs.addEditForm.clearValidate()
+      })
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val
+      this.getList()
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.tables2 {
+  min-height: auto;
+}
+// .tableBtns {
+//     display: flex;
+//     justify-content: center;
+// }
+</style>
\ No newline at end of file
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/materialReceiving.vue b/src/views/projectFront/warehouseManagement/basicInformation/materialReceiving.vue
new file mode 100644
index 00000000..94c3a437
--- /dev/null
+++ b/src/views/projectFront/warehouseManagement/basicInformation/materialReceiving.vue
@@ -0,0 +1,493 @@
+<template>
+  <div class="fullHeight whiteBlock">
+    <div style="padding: 15px 15px 0">
+      <p class="pageTitle">领料单位管理</p>
+      <el-form
+        :inline="true"
+        ref="searchForm"
+        :model="searchForm"
+        size="medium"
+      >
+        <el-form-item
+          label="助查码"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="领料单位名称"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="联系人"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+       
+        <el-form-item
+          label="联系电话"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+       
+        <el-form-item>
+          <el-button type="primary" plain @click="getList">{{
+            $t('message.energyManage.waybill.query')
+          }}</el-button>
+          <el-button type="warning" plain @click="refresh">{{
+            $t('message.deviceManage.refresh')
+          }}</el-button>
+          <el-button type="primary" size="medium" @click="add">新增</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="List">
+      
+        <el-table-column
+          prop="wayBillNumber"
+          label="助查码"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="materialName"
+          align="center"
+          label="领料单位名称"
+        ></el-table-column>
+        <el-table-column
+          prop="materialSpecifications"
+          align="center"
+          label="联系人"
+        ></el-table-column>
+        <!-- 单位 -->
+        <el-table-column
+          prop="computeUnit"
+          align="center"
+          label="电话"
+        ></el-table-column>
+        <el-table-column
+          prop="wayBillNum"
+          label="备注"
+          align="center"
+        >
+        </el-table-column>
+        
+        <el-table-column
+          :label="$t('message.deviceManage.operation')"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.edit') }}</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.delete') }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="pagInfo.pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pagInfo.pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(pagInfo.total)"
+        background
+      ></el-pagination>
+    </div>
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="
+        Popup.type == 'edit'
+          ? $t('message.energyManage.material.edit')
+          : $t('message.energyManage.material.add')
+      "
+      :visible.sync="Popup.show"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          ref="addEditForm"
+          :model="addEditForm"
+          :rules="addEditRules"
+          label-width="120px"
+          class="dialogFormBox"
+        >
+          
+         
+          <el-form-item
+            label="仓库名称"
+            prop="wayBillNumber"
+          >
+            <el-input
+              v-model="addEditForm.wayBillNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="仓库位置"
+            prop="wayBillNum"
+          >
+            <el-input
+              v-model="addEditForm.wayBillNum"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人电话"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="备注"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+        
+       
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="Popup.show = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.deviceManage.cancel') }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit"
+              size="medium"
+              >{{ $t('message.deviceManage.save') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addmaterialPurchaseWayBillApi,
+  editmaterialPurchaseWayBillApi,
+  deletematerialPurchaseWayBillApi,
+  materialPurchaseWayBillPageApi,
+  selectProcurementContractMaterialListApi,
+  selectProjectCooperationUnitListApi,
+  getMaterialPurchaseInfoApi,
+  materialPurchaseOrderPageApi
+} from '@/assets/js/api/materialManage'
+export default {
+  mounted() {
+    this.getFeedUnitList()
+    this.getPurchaseOrderList()
+    this.getList()
+  },
+  data() {
+    return {
+      addEditRules: {
+        purchaseOrderId: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        materialId: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        wayBillNumber: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        wayBillNum: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        carNumber: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        deliveryTime: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ]
+      },
+      addEditForm: {
+        carNumber: '',
+        deliveryTime: '',
+        materialId: '',
+        projectSn: '',
+        purchaseOrderId: '',
+        wayBillNum: '',
+        wayBillNumber: ''
+      },
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0 //总条数
+      },
+      List: [],
+      Popup: {
+        type: 'add',
+        show: false
+      },
+      allCompanyList: [],
+      contractList: [],
+      feedUnitList: [],
+      searchForm: {
+        materialName: '',
+        enterpriseId: ''
+      },
+      purchaseOrderList: [],
+      orderMaterialList: []
+    }
+  },
+  methods: {
+    //获取供料单位列表
+    getFeedUnitList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+        cooperationType: 1
+      }
+      selectProjectCooperationUnitListApi(data).then((res) => {
+        this.feedUnitList = res.result
+      })
+    },
+    //获取采购订单列表
+    getPurchaseOrderList() {
+      let json = {
+        projectSn: this.$store.state.projectSn,
+        pageNo: 1,
+        pageSize: 100,
+        state: 2
+      }
+      materialPurchaseOrderPageApi(json).then((result) => {
+        this.purchaseOrderList = result.result.records
+      })
+    },
+    //获取订单详细
+    getPurchaseOrderDetail() {
+      getMaterialPurchaseInfoApi({
+        purchaseOrderId: this.addEditForm.purchaseOrderId
+      }).then((res) => {
+        this.orderMaterialList = res.result.itemList
+      })
+    },
+    handle(type, show) {
+      //打开弹窗前的统一处理
+      this.Popup = {
+        type: type,
+        show: show
+      }
+    },
+    changeMaterial() {
+      this.allCompanyList.forEach((element) => {
+        if (element.id == this.addEditForm.materialId) {
+          // this.addEditForm.contractId=element.contractId
+          this.addEditForm.computeUnit = element.computeUnit
+        }
+      })
+    },
+    add() {
+      this.handle('add', true)
+    },
+    edit(obj) {
+      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.handle('edit', true)
+    },
+    deleteDev(obj) {
+      console.log('删除', obj)
+      this.$confirm(
+        this.$t('message.personnelPosition.beaconManage.table.confirmText') +
+          '【' +
+          obj.wayBillNumber +
+          '】?',
+        this.$t('message.personnelPosition.beaconManage.table.Tips'),
+        {
+          confirmButtonText: this.$t(
+            'message.personnelPosition.confirmButtonText'
+          ),
+          cancelButtonText: this.$t(
+            'message.personnelPosition.cancelButtonText'
+          ),
+          type: 'warning'
+        }
+      ).then(() => {
+        deletematerialPurchaseWayBillApi({ id: obj.id }).then((result) => {
+          if (result.success) {
+            this.$message.success(result.message)
+            this.getList()
+          }
+        })
+      })
+    },
+    submit() {
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.Popup.type === 'add') {
+            addmaterialPurchaseWayBillApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          } else if (this.Popup.type === 'edit') {
+            console.log('编辑信息', this.addEditForm)
+            editmaterialPurchaseWayBillApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          }
+          this.Popup.show = false
+        } else {
+          return false
+        }
+      })
+    },
+    refresh() {
+      this.$refs['searchForm'].resetFields()
+      this.pagInfo.pageNo = 1 //页数
+      this.pagInfo.pageSize = 10 //条数
+      this.getList()
+    },
+    getList() {
+      materialPurchaseWayBillPageApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        enterpriseId: this.searchForm.enterpriseId,
+        materialName: this.searchForm.materialName
+      }).then((result) => {
+        if (result.success) {
+          this.List = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+    },
+    close() {
+      this.addEditForm = {}
+      this.$nextTick(() => {
+        this.$refs.addEditForm.clearValidate()
+      })
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val
+      this.getList()
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.tables2 {
+  min-height: auto;
+}
+// .tableBtns {
+//     display: flex;
+//     justify-content: center;
+// }
+</style>
\ No newline at end of file
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/outsourcingManagement.vue b/src/views/projectFront/warehouseManagement/basicInformation/outsourcingManagement.vue
new file mode 100644
index 00000000..8b0b856e
--- /dev/null
+++ b/src/views/projectFront/warehouseManagement/basicInformation/outsourcingManagement.vue
@@ -0,0 +1,480 @@
+<template>
+  <div class="fullHeight whiteBlock">
+    <div style="padding: 15px 15px 0">
+      <p class="pageTitle">部门或外加工管理</p>
+      <el-form
+        :inline="true"
+        ref="searchForm"
+        :model="searchForm"
+        size="medium"
+      >
+       
+        <el-form-item
+          label="名称"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="联系人"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+       
+        <el-form-item
+          label="联系电话"
+          prop="materialName"
+        >
+          <el-input
+            v-model="searchForm.materialName"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+       
+        <el-form-item>
+          <el-button type="primary" plain @click="getList">{{
+            $t('message.energyManage.waybill.query')
+          }}</el-button>
+          <el-button type="warning" plain @click="refresh">{{
+            $t('message.deviceManage.refresh')
+          }}</el-button>
+          <el-button type="primary" size="medium" @click="add">新增</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="List">
+      
+        <el-table-column
+          prop="wayBillNumber"
+          label="名称"
+          align="center"
+        ></el-table-column>
+       
+        <el-table-column
+          prop="materialSpecifications"
+          align="center"
+          label="联系人"
+        ></el-table-column>
+        <el-table-column
+          prop="computeUnit"
+          align="center"
+          label="电话"
+        ></el-table-column>
+        <el-table-column
+          prop="wayBillNum"
+          label="备注"
+          align="center"
+        >
+        </el-table-column>
+        
+        <el-table-column
+          :label="$t('message.deviceManage.operation')"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.edit') }}</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.delete') }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="pagInfo.pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pagInfo.pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(pagInfo.total)"
+        background
+      ></el-pagination>
+    </div>
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="
+        Popup.type == 'edit'
+          ? $t('message.energyManage.material.edit')
+          : $t('message.energyManage.material.add')
+      "
+      :visible.sync="Popup.show"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          ref="addEditForm"
+          :model="addEditForm"
+          :rules="addEditRules"
+          label-width="120px"
+          class="dialogFormBox"
+        >
+          
+         
+          <el-form-item
+            label="仓库名称"
+            prop="wayBillNumber"
+          >
+            <el-input
+              v-model="addEditForm.wayBillNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="仓库位置"
+            prop="wayBillNum"
+          >
+            <el-input
+              v-model="addEditForm.wayBillNum"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="负责人电话"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="备注"
+            prop="carNumber"
+          >
+            <el-input
+              v-model="addEditForm.carNumber"
+              :placeholder="$t('message.deviceManage.placeholder')"
+            ></el-input>
+          </el-form-item>
+        
+       
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="Popup.show = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.deviceManage.cancel') }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit"
+              size="medium"
+              >{{ $t('message.deviceManage.save') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addmaterialPurchaseWayBillApi,
+  editmaterialPurchaseWayBillApi,
+  deletematerialPurchaseWayBillApi,
+  materialPurchaseWayBillPageApi,
+  selectProcurementContractMaterialListApi,
+  selectProjectCooperationUnitListApi,
+  getMaterialPurchaseInfoApi,
+  materialPurchaseOrderPageApi
+} from '@/assets/js/api/materialManage'
+export default {
+  mounted() {
+    this.getFeedUnitList()
+    this.getPurchaseOrderList()
+    this.getList()
+  },
+  data() {
+    return {
+      addEditRules: {
+        purchaseOrderId: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        materialId: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        wayBillNumber: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        wayBillNum: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        carNumber: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        deliveryTime: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ]
+      },
+      addEditForm: {
+        carNumber: '',
+        deliveryTime: '',
+        materialId: '',
+        projectSn: '',
+        purchaseOrderId: '',
+        wayBillNum: '',
+        wayBillNumber: ''
+      },
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0 //总条数
+      },
+      List: [],
+      Popup: {
+        type: 'add',
+        show: false
+      },
+      allCompanyList: [],
+      contractList: [],
+      feedUnitList: [],
+      searchForm: {
+        materialName: '',
+        enterpriseId: ''
+      },
+      purchaseOrderList: [],
+      orderMaterialList: []
+    }
+  },
+  methods: {
+    //获取供料单位列表
+    getFeedUnitList() {
+      let data = {
+        projectSn: this.$store.state.projectSn,
+        cooperationType: 1
+      }
+      selectProjectCooperationUnitListApi(data).then((res) => {
+        this.feedUnitList = res.result
+      })
+    },
+    //获取采购订单列表
+    getPurchaseOrderList() {
+      let json = {
+        projectSn: this.$store.state.projectSn,
+        pageNo: 1,
+        pageSize: 100,
+        state: 2
+      }
+      materialPurchaseOrderPageApi(json).then((result) => {
+        this.purchaseOrderList = result.result.records
+      })
+    },
+    //获取订单详细
+    getPurchaseOrderDetail() {
+      getMaterialPurchaseInfoApi({
+        purchaseOrderId: this.addEditForm.purchaseOrderId
+      }).then((res) => {
+        this.orderMaterialList = res.result.itemList
+      })
+    },
+    handle(type, show) {
+      //打开弹窗前的统一处理
+      this.Popup = {
+        type: type,
+        show: show
+      }
+    },
+    changeMaterial() {
+      this.allCompanyList.forEach((element) => {
+        if (element.id == this.addEditForm.materialId) {
+          // this.addEditForm.contractId=element.contractId
+          this.addEditForm.computeUnit = element.computeUnit
+        }
+      })
+    },
+    add() {
+      this.handle('add', true)
+    },
+    edit(obj) {
+      this.addEditForm = JSON.parse(JSON.stringify(obj))
+      this.handle('edit', true)
+    },
+    deleteDev(obj) {
+      console.log('删除', obj)
+      this.$confirm(
+        this.$t('message.personnelPosition.beaconManage.table.confirmText') +
+          '【' +
+          obj.wayBillNumber +
+          '】?',
+        this.$t('message.personnelPosition.beaconManage.table.Tips'),
+        {
+          confirmButtonText: this.$t(
+            'message.personnelPosition.confirmButtonText'
+          ),
+          cancelButtonText: this.$t(
+            'message.personnelPosition.cancelButtonText'
+          ),
+          type: 'warning'
+        }
+      ).then(() => {
+        deletematerialPurchaseWayBillApi({ id: obj.id }).then((result) => {
+          if (result.success) {
+            this.$message.success(result.message)
+            this.getList()
+          }
+        })
+      })
+    },
+    submit() {
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.Popup.type === 'add') {
+            addmaterialPurchaseWayBillApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          } else if (this.Popup.type === 'edit') {
+            console.log('编辑信息', this.addEditForm)
+            editmaterialPurchaseWayBillApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          }
+          this.Popup.show = false
+        } else {
+          return false
+        }
+      })
+    },
+    refresh() {
+      this.$refs['searchForm'].resetFields()
+      this.pagInfo.pageNo = 1 //页数
+      this.pagInfo.pageSize = 10 //条数
+      this.getList()
+    },
+    getList() {
+      materialPurchaseWayBillPageApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        enterpriseId: this.searchForm.enterpriseId,
+        materialName: this.searchForm.materialName
+      }).then((result) => {
+        if (result.success) {
+          this.List = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+    },
+    close() {
+      this.addEditForm = {}
+      this.$nextTick(() => {
+        this.$refs.addEditForm.clearValidate()
+      })
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val
+      this.getList()
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+.tables2 {
+  min-height: auto;
+}
+// .tableBtns {
+//     display: flex;
+//     justify-content: center;
+// }
+</style>
\ No newline at end of file
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/productClassification.vue b/src/views/projectFront/warehouseManagement/basicInformation/productClassification.vue
index 13483311..98a715a5 100644
--- a/src/views/projectFront/warehouseManagement/basicInformation/productClassification.vue
+++ b/src/views/projectFront/warehouseManagement/basicInformation/productClassification.vue
@@ -3,10 +3,9 @@
     <div class="block fullHeight">
       <div class="system-left">
         <div class="pageTitle">
-          材料类别
+          货品管理
           <el-button
             type="primary"
-            plain
             size="small"
             style="float: right; margin-top: -2px"
             @click="addClass"
@@ -89,8 +88,9 @@
             style="height: 35px; line-height: 10px"
             >查询</el-button
           >
+          <el-button type="warning" plain @click="refresh" style="height: 35px; line-height: 10px">刷新</el-button>
           <el-button type="primary" style="height: 35px; line-height: 10px"
-            @click="SpecifAdd">新建</el-button
+            @click="SpecifAdd">新增</el-button
           >
         </div>
         <div class="table_box" style="margin: 13px">
@@ -386,6 +386,12 @@ export default {
     this.getListData()
   },
   methods: {
+    refresh() {
+      // this.$refs['searchForm'].resetFields()
+      // this.pagInfo.pageNo = 1 //页数
+      // this.pagInfo.pageSize = 10 //条数
+      // this.getList()
+    },
     //新增分类
     addClass() {
       this.title='新增分类'
@@ -677,7 +683,7 @@ export default {
 
 .rightButtom {
   position: absolute;
-  right: 13%;
+  right: 9%;
   top: 5%;
 }
 
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue b/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue
index eee9973b..9b3b7982 100644
--- a/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue
+++ b/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fullHeight whiteBlock">
     <div style="padding: 15px 15px 0">
-      <p class="pageTitle">供应商</p>
+      <p class="pageTitle">供应商管理</p>
       <el-form
         :inline="true"
         ref="searchForm"
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue b/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue
index f49bf7b5..73c3ecfd 100644
--- a/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue
+++ b/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="fullHeight whiteBlock">
     <div style="padding: 15px 15px 0">
-      <p class="pageTitle">仓库</p>
+      <p class="pageTitle">仓库管理</p>
       <el-form
         :inline="true"
         ref="searchForm"
@@ -43,19 +43,12 @@
           <el-button type="warning" plain @click="refresh">{{
             $t('message.deviceManage.refresh')
           }}</el-button>
-          <el-button type="primary" size="medium" @click="add">新建仓库</el-button>
+          <el-button type="primary" size="medium" @click="add">新增</el-button>
         </el-form-item>
       </el-form>
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
-        <!-- 序号 -->
-        <el-table-column
-          type="index"
-          :label="$t('message.energyManage.material.serialNo')"
-          width="55"
-         align="center"
-        ></el-table-column>
         <el-table-column
           prop="wayBillNumber"
           label="仓库名称"
@@ -71,7 +64,6 @@
           align="center"
           label="负责人"
         ></el-table-column>
-        <!-- 单位 -->
         <el-table-column
           prop="computeUnit"
           align="center"