From 815b4a7d590469bd388fbbff50f67d5d26c1fc36 Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Sat, 15 Apr 2023 18:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=89=88-=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E3=80=81=E5=87=BA=E5=85=A5=E5=BA=93=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/warehouseManagement.js      |   16 +
 src/assets/js/http.js                         |    4 +-
 src/router/index.js                           |   18 +
 .../basicInformation/InbOutboundType.vue      |  287 ++++
 .../basicInformation/productManagement.vue    |  540 ++++---
 .../basicInformation/warehouseList.vue        |  493 +++----
 .../inOutManagement/outboundManagement.vue    | 1274 +++++++++++++++++
 .../inOutManagement/warehousingManagement.vue | 1249 ++++++++++++++++
 8 files changed, 3298 insertions(+), 583 deletions(-)
 create mode 100644 src/assets/js/api/warehouseManagement.js
 create mode 100644 src/views/projectFront/warehouseManagement/basicInformation/InbOutboundType.vue
 create mode 100644 src/views/projectFront/warehouseManagement/inOutManagement/outboundManagement.vue
 create mode 100644 src/views/projectFront/warehouseManagement/inOutManagement/warehousingManagement.vue

diff --git a/src/assets/js/api/warehouseManagement.js b/src/assets/js/api/warehouseManagement.js
new file mode 100644
index 00000000..1e8a9ccf
--- /dev/null
+++ b/src/assets/js/api/warehouseManagement.js
@@ -0,0 +1,16 @@
+/**
+ * api接口统一管理  、、质量管理
+ */
+import {post, get} from '../http'
+
+//基本信息管理-仓库管理
+export  const addStuffWarehouseApi = data => post('/xmgl/stuff/stuffWarehouse/add', data);
+export  const deleteStuffWarehouseApi = data => post('/xmgl/stuff/stuffWarehouse/delete', data);
+export  const editStuffWarehouseApi = data => post('/xmgl/stuff/stuffWarehouse/edit', data);
+export  const getStuffWarehousePageApi = data => get('/xmgl/stuff/stuffWarehouse/page', data);
+
+//基本信息管理-供应商管理
+export  const addStuffVendorApi = data => post('/xmgl/stuff/stuffVendor/add', data);
+export  const deleteStuffVendorApi = data => post('/xmgl/stuff/stuffVendor/delete', data);
+export  const editStuffVendorApi = data => post('/xmgl/stuff/stuffVendor/edit', data);
+export  const getStuffVendorPageApi = data => get('/xmgl/stuff/stuffVendor/page', data);
\ No newline at end of file
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 4152301e..95c68102 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -80,10 +80,10 @@ 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/'//金林湾线上新
+  // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
diff --git a/src/router/index.js b/src/router/index.js
index fe731918..739e6c87 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1110,6 +1110,24 @@ const routes2 = [
         component: () =>
           import("@/views/projectFront/warehouseManagement/basicInformation/employeeManagement.vue")
       },
+      {
+        path: "/warehouseManagement/basicInformation/InbOutboundType",
+        name: "物料管理_基础信息管理_出入库类型",
+        component: () =>
+          import("@/views/projectFront/warehouseManagement/basicInformation/InbOutboundType.vue")
+      },
+      {
+        path: "/warehouseManagement/inOutManagement/warehousingManagement",
+        name: "物料管理_出入库管理_入库管理",
+        component: () =>
+          import("@/views/projectFront/warehouseManagement/inOutManagement/warehousingManagement.vue")
+      },
+      {
+        path: "/warehouseManagement/inOutManagement/outboundManagement",
+        name: "物料管理_出入库管理_出库管理",
+        component: () =>
+          import("@/views/projectFront/warehouseManagement/inOutManagement/outboundManagement.vue")
+      },
 
 
 
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/InbOutboundType.vue b/src/views/projectFront/warehouseManagement/basicInformation/InbOutboundType.vue
new file mode 100644
index 00000000..28ef2417
--- /dev/null
+++ b/src/views/projectFront/warehouseManagement/basicInformation/InbOutboundType.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="fullHeight">
+    <div class="searchBox whiteBlock">
+      <el-radio v-model="radio" label="1">入库类型</el-radio>
+        <el-radio v-model="radio" label="2">出库类型</el-radio>
+        <el-button type="primary" size="medium" class="btnClass">新增</el-button>
+      </div>
+      <div class="searchBox whiteBlock" style="height:40px;margin-bottom: 1px;color: #5c81ee;">类别</div>
+      <div class="table_wrap whiteBlock">
+     
+        <div class="lay-let">
+         <vue-scroll style="height: calc(100%)">
+        <el-tree
+          :highlight-current="true"
+          :props="props"
+          :data="listBrary"
+          node-key="id"
+          ref="treeRef"
+          :default-expanded-keys="[defIndexky]"
+          :current-node-key="currentKey"
+          @node-click="handleCheckChange"
+        >
+          <span class="custom-tree-node" slot-scope="{ node, data }">
+            <span>{{ node.label }}</span>
+            <span>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(data,node)">修改</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAdd(data)" v-if="data.isShow != false">新增</el-button>
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(data)">删除</el-button>
+            </span>
+          </span>
+        </el-tree>
+        </vue-scroll>
+     
+    </div>
+      </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      radio: '1',
+      listBrary: [],
+      props: {
+        label: 'label',
+        children: 'childLibrary',
+        id: 'id'
+      },
+      // 表单参数
+      form: {
+        state: '',
+        dictValue:''
+      },
+      title: null,
+      open: false,
+      listBraryChildrenLsit: [],
+      defIndexky: '',
+      currentKey: ''
+    }
+
+  },
+  methods: {
+    //获取选择状态
+    handleCheckChange(data, checked) {
+      if (!data.isMax) {
+        this.listBraryChildrenLsit = data.children
+      }
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          console.log('isshow--', this.form)
+          if (this.form.isShow == undefined) {
+            this.form.dictName = this.form.dictValue
+             this.form.label = this.form.dictValue
+            this.form.state = 0
+            this.form.remarks = this.form.dictValue
+           
+            if (this.form.id != undefined) {
+              sysDataDictEdit(this.form).then(() => {
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.reset()
+                this.getListData()
+              })
+            } else {
+                          this.form.sysDataDictionaryId = this.form.parentId
+              if (this.form.level == 2) {
+                addSmalldailyInspectionInfo(this.form).then(() => {
+                  this.$modal.msgSuccess('新增成功')
+                  this.open = false
+                  this.reset()
+                  this.getListData()
+                })
+                
+              } else {
+                addBigdailyInspectionInfo(this.form).then(() => {
+                  this.$modal.msgSuccess('新增成功')
+                  this.open = false
+                  this.reset()
+                  this.getListData()
+                })
+              }
+            }
+          } else {
+            this.form.label = this.form.dictValue
+            this.form.state = 0
+    
+            this.form.remarks = this.form.dictValue
+            if (this.form.id != undefined) {
+              updateSmalldailyInspectionInfo(this.form).then(() => {
+                this.$modal.msgSuccess('修改成功')
+                this.open = false
+                this.reset()
+
+                this.getListData()
+              })
+            } else {
+              this.form.sysDataDictionaryId = this.form.parentId
+              addSmalldailyInspectionInfo(this.form).then(() => {
+                this.$modal.msgSuccess('新增成功')
+                this.open = false
+                this.reset()
+                this.getListData()
+              })
+            }
+          }
+        }
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        parentId: undefined,
+        dictValue: undefined,
+        isShow: undefined,
+        menu: undefined
+      }
+      this.resetForm('form')
+    },
+    handleAddMain() {
+      this.open = true
+      this.form.parentId = 0
+      this.form.createdBy = 1
+    },
+    handleUpdate(data,node) {
+      let data2={...data};
+    console.log('node-----',node);
+    console.log('data-----',data2);
+      this.open = true
+      this.form.dictValue = data2.dictName
+      this.form.id = data2.id
+      this.form.parentId = data2.parentId
+      this.form.state = data2.state
+      this.form.isShow = data2.isShow
+      this.form.sysDataDictionaryId = data2.sysDataDictionaryId
+      console.log('--1--',data2.sysDataDictionaryId);
+      console.log('--2--',this.form.sysDataDictionaryId );
+
+      this.title = '修改标准库'
+    },
+    handleAdd(data) {
+      console.log('add --', data)
+      this.reset()
+      this.form.menu = data.dictName
+      this.form.parentId = data.id
+      this.form.level = data.level
+
+      this.open = true
+      this.title = '添加标准库'
+    },
+    handleDelete(val) {
+      this.$confirm('此操作将永久删除 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          let data = {
+            id: val.id
+          }
+          if (val.parentId == 0 || val.level == 2) {
+            console.log('进入大类 ：', val)
+            sysDataDictDelete(data).then(res => {
+              if (res.success) {
+                this.getListData()
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+              } else {
+                this.$message({
+                  type: 'error',
+                  message: res.message
+                })
+              }
+            })
+          } else {
+            console.log('进入小类 ：', val)
+            delSmalldailyInspectionInfo(data).then(res => {
+              if (res.success) {
+                this.getListData()
+                this.$message({
+                  type: 'success',
+                  message: '删除成功!'
+                })
+              } else {
+                this.$message({
+                  type: 'error',
+                  message: res.message
+                })
+              }
+            })
+          }
+        })
+        .catch(error => {
+          console.log('error  --- ', error)
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
+    },
+    //查询数据
+    getListData() {
+      allLibraryApi({ parentId: -1 }).then(res => {
+        let list = res.result
+        list = list.map(item => {
+          return {
+            childLibrary: item.childerDataVal,
+            isMax: true,
+            ...item
+          }
+        })
+
+        this.listBrary = list
+        this.listBrary.forEach(element => {
+          element.childLibrary.forEach(element => {
+            this.$set(element, 'level', 2)
+            if(element.childerDataVal&&element.childerDataVal.length>0){
+               element.childerDataVal.forEach(element1 => {
+              this.$set(element1, 'dictName', element1.label)
+              this.$set(element1, 'isShow', false)
+              element.childLibrary.push(element1)
+
+              //  element.childLibrary.dictName = element1.label
+            })
+            }
+            
+          })
+        })
+        console.log('查询数据 ：', this.listBrary)
+        // this.listBraryChildrenLsit = list[0].childList[0].children
+        //设计默认选中
+        this.defIndexky = this.listBrary[0].id
+        this.$nextTick(() => {
+          if(this.listBrary.length>0){
+              this.currentKey = this.listBrary[0].children[0].id
+              this.$refs['treeRef'].setCurrentKey(this.currentKey)
+          }
+         
+          
+        })
+      })
+    },
+    //返回上一步
+    handleBack() {
+      this.$router.push('/qualityStandard')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.btnClass {
+  position: absolute !important;
+  top: 5.3%;
+  left: 14%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue b/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue
index 9b3b7982..3d46caf8 100644
--- a/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue
+++ b/src/views/projectFront/warehouseManagement/basicInformation/productManagement.vue
@@ -10,46 +10,41 @@
       >
         <el-form-item
           label="助查码"
-          prop="materialName"
         >
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.lookupCode"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item
           label="供应商名称"
-          prop="materialName"
         >
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.vendorName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item
-          label="纳税人识别码"
-          prop="materialName"
+          label="纳税人识别号"
         >
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.taxpayerIdentificationNumber"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item
           label="联系电话"
-          prop="materialName"
         >
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.contactNumber"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
         <el-form-item
           label="联系人"
-          prop="materialName"
         >
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.contact"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
@@ -67,54 +62,47 @@
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
-       
         <el-table-column
-          prop="wayBillNumber"
+          prop="lookupCode"
           label="助查码"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="materialName"
+          prop="vendorName"
           align="center"
           label="供应商名称"
         ></el-table-column>
         <el-table-column
-          prop="materialSpecifications"
+          prop="taxpayerIdentificationNumber"
           align="center"
           label="纳税人识别号"
         ></el-table-column>
         <!-- 单位 -->
         <el-table-column
-          prop="computeUnit"
+          prop="address"
           align="center"
           label="地址"
         ></el-table-column>
         <el-table-column
-          prop="wayBillNum"
+          prop="contact"
           label="联系人"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="enterpriseName"
+          prop="contactNumber"
           label="电话"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="enterpriseName"
+          prop="mail"
           label="邮件"
           align="center"
         >
         </el-table-column>
         <el-table-column
-          prop="enterpriseName"
-          label="备注"
-          align="center"
-        >
-        </el-table-column>
-        <el-table-column
-          :label="$t('message.deviceManage.operation')"
+          label="操作"
           align="center"
         >
           <template slot-scope="scope">
@@ -151,15 +139,12 @@
         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"
+      :title="title"
+      :visible.sync="dialogShow"
       width="667px"
     >
       <div class="dialog_content">
@@ -175,73 +160,98 @@
          
           <el-form-item
             label="助查码"
-            prop="wayBillNumber"
+            prop="lookupCode"
           >
             <el-input
-              v-model="addEditForm.wayBillNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.lookupCode"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item
             label="供应商名称"
-            prop="wayBillNum"
+            prop="vendorName"
           >
             <el-input
-              v-model="addEditForm.wayBillNum"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.vendorName"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item
             label="纳税人识别号"
-            prop="carNumber"
+            prop="taxpayerIdentificationNumber"
           >
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.taxpayerIdentificationNumber"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item
             label="地址"
-            prop="carNumber"
+            prop="address"
           >
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.address"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item
             label="联系人"
-            prop="carNumber"
+            prop="contact"
           >
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.contact"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item
             label="联系电话"
-            prop="carNumber"
+            prop="contactNumber"
           >
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.contactNumber"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
           <el-form-item
-            label="备注"
-            prop="carNumber"
+            label="邮件"
+            prop="mail"
           >
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.mail"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="法人代表"
+            prop="legalRepresentative"
+          >
+            <el-input
+              v-model="addEditForm.legalRepresentative"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="开户银行"
+            prop="accountOpenedBank"
+          >
+            <el-input
+              v-model="addEditForm.accountOpenedBank"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="银行账号"
+            prop="bankAccount"
+          >
+            <el-input
+              v-model="addEditForm.bankAccount"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-        
-       
           <div class="dialog-footer">
             <el-button
               class="cancleBtn"
-              @click="Popup.show = false"
+              @click="dialogShow = false"
               icon="el-icon-circle-close"
               size="medium"
               >{{ $t('message.deviceManage.cancel') }}
@@ -261,253 +271,225 @@
 </template>
 <script>
 import {
-  addmaterialPurchaseWayBillApi,
-  editmaterialPurchaseWayBillApi,
-  deletematerialPurchaseWayBillApi,
-  materialPurchaseWayBillPageApi,
-  selectProcurementContractMaterialListApi,
-  selectProjectCooperationUnitListApi,
-  getMaterialPurchaseInfoApi,
-  materialPurchaseOrderPageApi
-} from '@/assets/js/api/materialManage'
+  addStuffVendorApi,
+  deleteStuffVendorApi,
+  editStuffVendorApi,
+  getStuffVendorPageApi
+} from '@/assets/js/api/warehouseManagement.js'
 export default {
   mounted() {
-    this.getFeedUnitList()
-    this.getPurchaseOrderList()
+    // 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: ''
-      },
+      title: "",
+      dialogShow: false,
       pagInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
         total: 0 //总条数
       },
       List: [],
-      Popup: {
-        type: 'add',
-        show: false
+      addEditForm: {
+        lookupCode:'',//助查码
+        vendorName:'',//供应商名称
+        taxpayerIdentificationNumber:'',//纳税人识别号
+        address:'',//地址
+        contact:'',//联系人
+        contactNumber:'',//联系电话
+        mail:'',//邮件
+        legalRepresentative:'',//法人代表
+        accountOpenedBank:'',//开户银行
+        bankAccount:'',//银行账号
       },
-      allCompanyList: [],
-      contractList: [],
-      feedUnitList: [],
+       addEditRules: {},
+      // addEditRules: {
+      //   lookupCode: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+      //   vendorName: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+      //   taxpayerIdentificationNumber: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+      //   address: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+      //   contact: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+      //   mail: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+      //   contactNumber: [
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'blur'
+      //     },
+      //     {
+      //       required: true,
+      //       message: this.$t('message.carManage.required'),
+      //       trigger: 'change'
+      //     }
+      //   ],
+
+      // },
       searchForm: {
-        materialName: '',
-        enterpriseId: ''
+        lookupCode:'',
+        vendorName:'',
+        taxpayerIdentificationNumber:'',
+        contactNumber:'',
+        contact:'',
       },
-      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({
+      getStuffVendorPageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        enterpriseId: this.searchForm.enterpriseId,
-        materialName: this.searchForm.materialName
+        lookupCode:this.searchForm.lookupCode,
+        vendorName:this.searchForm.vendorName,
+        taxpayerIdentificationNumber:this.searchForm.taxpayerIdentificationNumber,
+        contactNumber:this.searchForm.contactNumber,
+        contact:this.searchForm.contact,
       }).then((result) => {
+        console.log('result====', result);
         if (result.success) {
           this.List = result.result.records
           this.pagInfo.total = result.result.total
         }
       })
     },
+
+    add() {
+      this.title = '新增仓库'
+      this.dialogShow = true
+      this.close()
+    },
+
+    edit(obj) {
+      this.title = '编辑仓库'
+      this.dialogShow = true
+      this.addEditForm = JSON.parse(JSON.stringify(obj))
+    },
+    submit() {
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.title == '新增仓库') {
+            addStuffVendorApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          } else if (this.title === '编辑仓库') {
+            console.log('编辑信息', this.addEditForm)
+            editStuffVendorApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          }
+          this.dialogShow = false
+        } else {
+          return false
+        }
+      })
+    },
+    deleteDev(obj) {
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteStuffVendorApi({ id: obj.id }).then((res) => {
+            if (res.success) {
+              this.getList()
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.message,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+
     close() {
       this.addEditForm = {}
       this.$nextTick(() => {
@@ -521,7 +503,13 @@ export default {
     CurrentChange(val) {
       this.pagInfo.pageNo = val
       this.getList()
-    }
+    },
+    refresh() {
+      this.searchForm = {}
+      this.pagInfo.pageNo = 1 //页数
+      this.pagInfo.pageSize = 10 //条数
+      this.getList()
+    },
   }
 }
 </script>
diff --git a/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue b/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue
index 73c3ecfd..dc17851a 100644
--- a/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue
+++ b/src/views/projectFront/warehouseManagement/basicInformation/warehouseList.vue
@@ -8,34 +8,25 @@
         :model="searchForm"
         size="medium"
       >
-        <el-form-item
-          label="仓库名称"
-          prop="materialName"
-        >
+        <el-form-item label="仓库名称">
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.warehouseName"
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item
-          label="仓库编号"
-          prop="materialName"
-        >
+        <!-- <el-form-item label="仓库编号">
           <el-input
-            v-model="searchForm.materialName"
+            v-model="searchForm.warehouseNumber"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item> -->
+        <el-form-item label="仓库位置">
+          <el-input
+            v-model="searchForm.warehousePos"
             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')
@@ -50,50 +41,39 @@
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
         <el-table-column
-          prop="wayBillNumber"
+          prop="warehouseName"
           label="仓库名称"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="materialName"
+          prop="warehousePos"
           align="center"
           label="仓库位置"
         ></el-table-column>
         <el-table-column
-          prop="materialSpecifications"
+          prop="header"
           align="center"
           label="负责人"
         ></el-table-column>
         <el-table-column
-          prop="computeUnit"
+          prop="headerPhone"
           align="center"
           label="电话"
         ></el-table-column>
-        <el-table-column
-          prop="wayBillNum"
-          label="备注"
-          align="center"
-        >
+        <el-table-column prop="remark" label="备注" align="center">
         </el-table-column>
-        <el-table-column
-          prop="enterpriseName"
-          label="创建时间"
-          align="center"
-        >
+        <el-table-column prop="createTime" label="创建时间" align="center">
         </el-table-column>
-        <el-table-column
-          :label="$t('message.deviceManage.operation')"
-          align="center"
-        >
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <div class="tableBtns">
+            <div class="tableBtns" style="margin-left: 60px !important;">
               <div @click="edit(scope.row)" class="operationText">
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
                   height="15px"
                 />
-                <span>{{ $t('message.deviceManage.edit') }}</span>
+                <span>编辑</span>
               </div>
               <div @click="deleteDev(scope.row)" class="operationText">
                 <img
@@ -101,7 +81,7 @@
                   width="15px"
                   height="15px"
                 />
-                <span>{{ $t('message.deviceManage.delete') }}</span>
+                <span>删除</span>
               </div>
             </div>
           </template>
@@ -119,15 +99,12 @@
         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"
+      :title="title"
+      :visible.sync="dialogShow"
       width="667px"
     >
       <div class="dialog_content">
@@ -139,59 +116,41 @@
           label-width="120px"
           class="dialogFormBox"
         >
-          
-         
-          <el-form-item
-            label="仓库名称"
-            prop="wayBillNumber"
-          >
+          <el-form-item label="仓库名称" prop="warehouseName">
             <el-input
-              v-model="addEditForm.wayBillNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.warehouseName"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="仓库位置"
-            prop="wayBillNum"
-          >
+          <el-form-item label="仓库位置" prop="warehousePos">
             <el-input
-              v-model="addEditForm.wayBillNum"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.warehousePos"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="负责人"
-            prop="carNumber"
-          >
+          <el-form-item label="负责人" prop="header">
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.header"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="负责人电话"
-            prop="carNumber"
-          >
+          <el-form-item label="负责人电话" prop="headerPhone">
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.headerPhone"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item
-            label="备注"
-            prop="carNumber"
-          >
+          <el-form-item label="备注" prop="remark">
             <el-input
-              v-model="addEditForm.carNumber"
-              :placeholder="$t('message.deviceManage.placeholder')"
+              v-model="addEditForm.remark"
+              placeholder="请输入"
             ></el-input>
           </el-form-item>
-        
-       
+
           <div class="dialog-footer">
             <el-button
               class="cancleBtn"
-              @click="Popup.show = false"
+              @click="dialogShow = false"
               icon="el-icon-circle-close"
               size="medium"
               >{{ $t('message.deviceManage.cancel') }}
@@ -211,246 +170,99 @@
 </template>
 <script>
 import {
-  addmaterialPurchaseWayBillApi,
-  editmaterialPurchaseWayBillApi,
-  deletematerialPurchaseWayBillApi,
-  materialPurchaseWayBillPageApi,
-  selectProcurementContractMaterialListApi,
-  selectProjectCooperationUnitListApi,
-  getMaterialPurchaseInfoApi,
-  materialPurchaseOrderPageApi
-} from '@/assets/js/api/materialManage'
+  addStuffWarehouseApi,
+  deleteStuffWarehouseApi,
+  editStuffWarehouseApi,
+  getStuffWarehousePageApi
+} from '@/assets/js/api/warehouseManagement.js'
 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: ''
-      },
+      title: "",
+      dialogShow: false,
       pagInfo: {
         pageNo: 1, //页数
         pageSize: 10, //条数
         total: 0 //总条数
       },
       List: [],
-      Popup: {
-        type: 'add',
-        show: false
+      addEditForm: {
+        warehouseName: '',//仓库名称
+        warehousePos: '',//warehousePos
+        header: '',//负责人
+        headerPhone: '',//负责人电话
+        remark: '',//备注
+      },
+      addEditRules: {
+        warehouseName: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        warehousePos: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        header: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+        headerPhone: [
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'blur'
+          },
+          {
+            required: true,
+            message: this.$t('message.carManage.required'),
+            trigger: 'change'
+          }
+        ],
+
       },
-      allCompanyList: [],
-      contractList: [],
-      feedUnitList: [],
       searchForm: {
-        materialName: '',
-        enterpriseId: ''
+        warehouseName: '',
+        warehouseNumber: '',
+        warehousePos: '',
       },
-      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({
+      getStuffWarehousePageApi({
         pageNo: this.pagInfo.pageNo,
         pageSize: this.pagInfo.pageSize,
         projectSn: this.$store.state.projectSn,
-        enterpriseId: this.searchForm.enterpriseId,
-        materialName: this.searchForm.materialName
+        warehouseName: this.searchForm.warehouseName,
+        warehousePos: this.searchForm.warehousePos,
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records
@@ -458,6 +270,75 @@ export default {
         }
       })
     },
+
+    add() {
+      this.title = '新增仓库'
+      this.dialogShow = true
+      this.close()
+    },
+
+    edit(obj) {
+      this.title = '编辑仓库'
+      this.dialogShow = true
+      this.addEditForm = JSON.parse(JSON.stringify(obj))
+    },
+    submit() {
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.title == '新增仓库') {
+            addStuffWarehouseApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          } else if (this.title === '编辑仓库') {
+            console.log('编辑信息', this.addEditForm)
+            editStuffWarehouseApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          }
+          this.dialogShow = false
+        } else {
+          return false
+        }
+      })
+    },
+    deleteDev(obj) {
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deleteStuffWarehouseApi({ id: obj.id }).then((res) => {
+            if (res.success) {
+              this.getList()
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.message,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+
     close() {
       this.addEditForm = {}
       this.$nextTick(() => {
@@ -471,7 +352,13 @@ export default {
     CurrentChange(val) {
       this.pagInfo.pageNo = val
       this.getList()
-    }
+    },
+    refresh() {
+      this.searchForm = {}
+      this.pagInfo.pageNo = 1 //页数
+      this.pagInfo.pageSize = 10 //条数
+      this.getList()
+    },
   }
 }
 </script>
@@ -479,8 +366,4 @@ export default {
 .tables2 {
   min-height: auto;
 }
-// .tableBtns {
-//     display: flex;
-//     justify-content: center;
-// }
 </style>
\ No newline at end of file
diff --git a/src/views/projectFront/warehouseManagement/inOutManagement/outboundManagement.vue b/src/views/projectFront/warehouseManagement/inOutManagement/outboundManagement.vue
new file mode 100644
index 00000000..f9e4ecc3
--- /dev/null
+++ b/src/views/projectFront/warehouseManagement/inOutManagement/outboundManagement.vue
@@ -0,0 +1,1274 @@
+<template>
+  <div class="fullHeight project">
+    <div class="fullHeight">
+      <div class="rightPanel whiteBlock">
+        <p class="pageTitle">出库管理</p>
+        <!-- 列表搜索栏 -->
+        <el-form
+          :inline="true"
+          ref="searchForm"
+          :model="searchForm"
+          size="medium"
+        >
+          <el-form-item label="单号">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="客户">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="仓库">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="部门">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="经手人">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="日期">
+            <el-date-picker
+              v-model="value1"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="批号">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="类型" prop="state">
+            <el-select
+              v-model="searchForm.state"
+              filterable
+              placeholder="请选择"
+              :clearable="true"
+            >
+              <el-option
+                v-for="(item, index) in orderStatusArr"
+                :key="index"
+                :label="item"
+                :value="index + 1"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="货号">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+         
+          <el-form-item label="品名" prop="state">
+            <el-select
+              v-model="searchForm.state"
+              filterable
+              placeholder="请选择"
+              :clearable="true"
+            >
+              <el-option
+                v-for="(item, index) in orderStatusArr"
+                :key="index"
+                :label="item"
+                :value="index + 1"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+           <el-form-item label="助查码">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+         
+          <!-- 供料单位
+            <el-form-item :label="$t('message.energyManage.waybill.feedCompany')" prop="enterpriseId">
+              <el-select v-model="searchForm.enterpriseId" filterable :placeholder="$t('message.energyManage.material.pleaseChoose')" :clearable="true">
+                <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId">
+                </el-option>
+                </el-select>
+            </el-form-item> -->
+          <el-form-item>
+            <el-button type="primary" plain @click="getContractList"
+              >查询</el-button
+            >
+            <el-button type="warning" plain @click="refreshFn">刷新</el-button>
+            <el-button
+              type="primary"
+              size="medium"
+              @click="showAddOrEditDialog"
+            >
+              新增
+            </el-button>
+            <el-button type="primary" @click="exportFn"> 导出 </el-button>
+          </el-form-item>
+        </el-form>
+        <!-- 列表 -->
+        <div class="table_wrap whiteBlock">
+          <el-table class="tables" :data="contractList">
+            <el-table-column prop="orderNumber" label="编号" align="center">
+            </el-table-column>
+            <el-table-column prop="state" label="单号" align="center">
+            </el-table-column>
+            <el-table-column prop="materialName" label="日期" align="center">
+            </el-table-column>
+            <el-table-column prop="computeUnit" label="仓库" align="center">
+            </el-table-column>
+            <el-table-column prop="materialNum" label="方向" align="center">
+            </el-table-column>
+            <el-table-column
+              prop="enterpriseName"
+              label="类别"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="receivingAddr"
+              label="供应商"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="createUserAme"
+              label="经手人"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="addTime"
+              label="批号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="arrivalTime"
+              label="制单人"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="createTime"
+              width="180"
+              label="制单时间"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <div
+                  class="tableBtns"
+                  style="margin-left: 40px; color: #90affa"
+                >
+                  <i class="el-icon-tickets"></i>
+                  <span style="color: black">详情</span>
+                </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>
+      </div>
+    </div>
+    <!--新增入库单信息弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      :title="dialogTitle"
+      :visible.sync="addOrEditDialog"
+      width="1167px"
+    >
+      <p>出库单信息</p>
+      <div class="dialog_content">
+        <el-form
+          style="margin: 0 28px"
+          size="medium"
+          :model="contractForm"
+          ref="contractForm"
+          :rules="contractFormRules"
+          :inline="true"
+        >
+          <el-form-item label="日期" prop="arrivalTime">
+            <el-date-picker
+              v-model="value1"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd HH:mm"
+            >
+            </el-date-picker>
+            <!-- <el-date-picker
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.arrivalTime"
+              type="datetime"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd HH:mm"
+            >
+            </el-date-picker> -->
+          </el-form-item>
+          <el-form-item label="仓库" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="类型" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="客户" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          
+         
+          <el-form-item label="方向" prop="enterpriseId" style="margin-left: 15px"
+>
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="编号" prop="orderNumber">
+            <el-input
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.orderNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="单号" prop="orderNumber">
+            <el-input
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.orderNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+        
+          <el-form-item label="批号" prop="orderNumber">
+            <el-input
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.orderNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+     
+          <el-form-item
+            label="部门"
+            prop="enterpriseId"
+          >
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="经手人" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="备注" prop="remarks">
+            <el-input
+              style="width: 1030px"
+              type="textarea"
+              :rows="1"
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.remarks"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div class="importMaterialBox">
+          <el-button
+            style="margin-bottom: 15px; margin-left: 1005px"
+            type="primary"
+            size="medium"
+            @click="importMaterial(1)"
+          >
+            增加明细
+          </el-button>
+          <el-table
+            class="tables"
+            :data="orderMaterialList"
+            height="360"
+            style="min-height: auto"
+          >
+            <el-table-column
+              prop="materialName"
+              label="品名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="materialSpecifications"
+              label="规格"
+              align="center"
+            ></el-table-column>
+            <el-table-column prop="computeUnit" label="单位" align="center">
+            </el-table-column>
+            <el-table-column prop="materialNum" label="数量" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  size="mini"
+                  :disabled="contractForm.state != 1"
+                  v-model="scope.row.computeUnit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="materialNum" label="单价" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  size="mini"
+                  :disabled="contractForm.state != 1"
+                  v-model="scope.row.computeUnit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="computeUnit" label="金额" align="center">
+            </el-table-column>
+            <el-table-column prop="computeUnit" label="备注" align="center">
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <div class="tableBtns" style="margin-left: 60px !important">
+                  <!-- <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>编辑</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>删除</span>
+              </div> -->
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="addOrEditDialog = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >取消
+          </el-button>
+          <!-- <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveContractInfoFn(1)"
+            size="medium"
+          >
+          暂存
+          </el-button> -->
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveContractInfoFn(2)"
+            size="medium"
+          >
+            保存
+          </el-button>
+        </div>
+        <div class="dialog-footerTwo">
+          <div>制单人:18772114025</div>
+          <div style="width: 200px">制单时间:2022-03-04 14:40:05</div>
+          <div>入库单编号:000008</div>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 新增入库单材料明细弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="选择材料"
+      :visible.sync="selectMaterialDialog"
+      width="1167px"
+    >
+      <p>材料类别</p>
+      <div class="dialog_content">
+        <div class="block fullHeight" style="overflow: hidden">
+          <div class="system-left" style="padding: 0; height: 520px">
+            <div class="titleSearch">
+              <el-input
+                style="width: 250px"
+                placeholder="请搜索名称、编码"
+                prefix-icon="el-icon-search"
+                v-model="input2"
+              >
+              </el-input>
+            </div>
+            <vue-scroll class="treeList" style="height: 100% !important">
+              <div style="padding-top: 10px">
+                <ul v-for="(name, index) in companyCateList" :key="index">
+                  <li
+                    @click="changeCompanyCate(index, name, 1)"
+                    :class="{
+                      active:
+                        index == dialogCateIndex && dialogCateIndex2 == -1,
+                    }"
+                  >
+                    <div class="clickName" style="width: 100%">
+                      <div class="imgbox">
+                        <i
+                          v-if="dialogCateIndex != index"
+                          class="el-icon-caret-right"
+                        ></i>
+                        <i v-else class="el-icon-caret-bottom"></i>
+                      </div>
+                      <el-popover
+                        placement="top-start"
+                        v-model="name.visible"
+                        :content="name.categoryName"
+                      >
+                        <span
+                          slot="reference"
+                          @mouseenter="
+                            name.visible =
+                              name.categoryName.length > 9 ? true : false
+                          "
+                          @mouseleave="name.visible = false"
+                          >{{
+                            name.categoryName.length > 9
+                              ? name.categoryName.substring(0, 8) + '...'
+                              : name.categoryName
+                          }}</span
+                        >
+                      </el-popover>
+                    </div>
+                  </li>
+                  <ul
+                    v-for="(item, i) in name.children"
+                    id="child"
+                    v-if="dialogCateIndex == index"
+                    :key="i"
+                  >
+                    <li
+                      :class="{
+                        active: i == dialogCateIndex2 && dialogCateIndex != -1,
+                      }"
+                      @click="changeCompanyCate(i, item, 2)"
+                    >
+                      <el-popover
+                        placement="top-start"
+                        v-model="item.visible"
+                        :content="item.categoryName"
+                      >
+                        <div
+                          slot="reference"
+                          @mouseenter="
+                            item.visible =
+                              item.categoryName.length > 9 ? true : false
+                          "
+                          @mouseleave="item.visible = false"
+                          style="display: inline-block; width: 60%"
+                        >
+                          {{
+                            item.categoryName.length > 10
+                              ? item.categoryName.substring(0, 9) + '...'
+                              : item.categoryName
+                          }}
+                        </div>
+                      </el-popover>
+                    </li>
+                  </ul>
+                </ul>
+                <li
+                  class="title"
+                  style="text-align: center; line-height: 140px"
+                  v-show="companyCateList.length == 0"
+                >
+                  <!-- 暂无数据 -->
+                  {{ $t('message.energyManage.cate.noData') }}
+                </li>
+              </div>
+            </vue-scroll>
+          </div>
+
+          <div class="system-right">
+            <div class="rightForm">
+              <el-form
+                :inline="true"
+                ref="searchForm"
+                :model="searchForm"
+                size="medium"
+              >
+                <el-form-item label="助查码" prop="materialName">
+                  <el-input
+                    v-model="value5"
+                    placeholder="请输入助查码"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="货号" prop="materialName">
+                  <el-input
+                    v-model="value6"
+                    placeholder="请输入货号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="品名" prop="materialName">
+                  <el-input
+                    v-model="value7"
+                    placeholder="请输入品名"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="规格" prop="materialName">
+                  <el-input
+                    v-model="value8"
+                    placeholder="请输入规格"
+                  ></el-input>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              ref="multipleTable"
+              style="min-height: auto"
+              height="520px"
+              :data="companyMaterialList"
+              class="tables"
+              @select="handleSelectionChange"
+              @select-all="handleSelectionChange"
+            >
+              <el-table-column
+                type="selection"
+                label=""
+                width="55"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="materialName"
+                :label="$t('message.energyManage.material.materialName')"
+                align="center"
+              >
+              </el-table-column>
+              <!-- 材料编码 -->
+              <el-table-column
+                prop="materialCode"
+                :label="$t('message.energyManage.material.materialNo')"
+                align="center"
+              ></el-table-column>
+              <!-- 计算单位 -->
+              <el-table-column
+                prop="computeUnit"
+                :label="$t('message.energyManage.material.unitOfAccount')"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="materialSpecifications"
+                :label="$t('message.energyManage.waybill.specification')"
+                align="center"
+              ></el-table-column>
+              <!-- 正负差 -->
+              <el-table-column
+                prop="materialSpecifications"
+                :label="$t('message.energyManage.material.plusOrMinus')"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.deviationType">
+                    {{ scope.row.adjustStartValue
+                    }}{{
+                      scope.row.deviationType == 1
+                        ? '%'
+                        : $t(message.energyManage.material.weight3)
+                    }}
+                    ~ {{ scope.row.adjustEndValue
+                    }}{{
+                      scope.row.deviationType == 1
+                        ? '%'
+                        : $t(message.energyManage.material.weight3)
+                    }}
+                  </span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+
+        <div class="dialog-footer">
+          <el-button
+            @click="selectMaterialDialog = false"
+            size="medium"
+            icon="el-icon-circle-close"
+          >
+            取消
+          </el-button>
+          <el-button
+            type="primary"
+            @click="saveImportMaterial()"
+            size="medium"
+            icon="el-icon-circle-check"
+          >
+            确定
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addmaterialPurchaseOrderApi,
+  editmaterialPurchaseOrderApi, deletematerialPurchaseOrderApi,
+  materialPurchaseOrderPageApi, selectProjectCooperationUnitListApi,
+  abandonPurchaseOrderApi, getMaterialPurchaseInfoApi,
+  updatePurchaseOrderApi,
+
+  materialCategoryListApi, materialRecordListApi
+} from "@/assets/js/api/materialManage"
+export default {
+  data() {
+    return {
+      value5: '',
+      value6: '',
+      value7: '',
+      input2: '',
+      value8: '',
+      value1: '',
+      searchSn: "",
+      isAdd: true,
+      dialogTitle: '新增',
+      addOrEditDialog: false,
+      dialogSteps: 0,
+      contractForm: {
+        "arrivalTime": "",
+        "buyerName": "",
+        "createUser": 0,
+        "enterpriseId": '',
+        "list": [],
+        "projectSn": "",
+        "receivingAddr": "",
+        "remarks": "",
+        "state": 1,
+        orderNumber: ''
+      },
+      contractFormRules: {
+        // orderNumber: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], enterpriseId: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], buyerName: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], receivingAddr: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], arrivalTime: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ]
+      },
+      //选择材料所用变量 --- start
+      dialogCateIndex: 0,
+      dialogCateIndex2: -1,
+      dialogTabActiveName: 'first',
+      selectMaterialDialog: false,
+      companyCateList: [],
+      companyMaterialList: [],
+      multipleSelection: [],
+      //选择材料所用变量 --- end
+      contractList: [],
+      orderMaterialList: [],
+      orderFileList: [],
+      pagInfo: {
+        pageNo: 1,//页数
+        pageSize: 10,//条数
+        total: 0,//总条数
+      },
+      searchForm: {
+        state: '',
+        enterpriseId: ''
+      },
+      feedUnitList: [],
+      orderStatusArr: this.$t('message.energyManage.order.orderStatusArr'),
+      wayBillList: []
+    };
+  },
+  mounted() {
+    this.searchSn = this.$store.state.userInfo.sn;
+    this.getContractList()
+    this.getFeedUnitList()
+  },
+  methods: {
+    //导出
+    exportFn() {
+      // window.location.href =
+      //   this.$http.defaults.baseURL +
+      //   'xmgl/download/exporZipWorkerInfo?idCard=' +
+      //   this.tableParameter.idCard +
+      //   '&projectSn=' +
+      //   this.tableParameter.projectSn +
+      //   '&teamId=' +
+      //   this.tableParameter.teamId +
+      //   '&workerName=' +
+      //   this.tableParameter.workerName +
+      //   '&personType=' +
+      //   this.tableParameter.personType +
+      //   '&enterDate=' +
+      //   this.tableParameter.enterDate +
+      //   '&codeState=' +
+      //   this.tableParameter.codeState +
+      //   '&enterpriseId=' +
+      //   this.checkedId
+    },
+    //   解析材料数据
+    parseMaterailData(name) {
+      let arr = [], str = ''
+      if (name.indexOf('_') != -1) {
+        arr = name.split('_')
+      }
+      arr.forEach(element => {
+        str += '<p>' + element + '</p>'
+      });
+      return str
+    },
+    //显示选择材料弹框
+    importMaterial(type) {
+      this.multipleSelection = [];
+      this.dialogCateIndex = 0
+      this.dialogCateIndex2 = -1,
+        this.dialogTabActiveName = 'first'
+      this.loadCompanyCateList(type);
+      this.selectMaterialDialog = true;
+      this.$nextTick(() => {
+        this.$refs.multipleTable.clearSelection();
+      })
+
+    },
+    //企业类别切换
+    changeCompanyCate(index, data, type) {
+      if (type == 1) {
+        this.dialogCateIndex2 = -1;
+        this.dialogCateIndex = index;
+      } else {
+        this.dialogCateIndex2 = index;
+      }
+
+      this.loadCompanyMaterialList(data.id);
+    },
+    //获取企业的材料分类
+    loadCompanyCateList(type) {
+      let param = {
+        sn: this.pageType == 'companyAdmin' ? this.$store.state.userInfo.headquartersSn : this.searchSn,
+      };
+      materialCategoryListApi(param).then((res) => {
+        this.companyCateList = res.result;
+        if (this.companyCateList.length > 0) {
+          this.loadCompanyMaterialList(this.companyCateList[0].id);
+        }
+      });
+    },
+    //按企业分类获取材料列表
+    loadCompanyMaterialList(id) {
+      let param = {
+        categoryId: id,
+      };
+      materialRecordListApi(param).then((res) => {
+        this.companyMaterialList = res.result;
+        this.showSelectCheck()
+      });
+    },
+    handleSelectionChange(val) {
+      //   console.log('此次选中',val)
+      this.duplicateRemoval(val, this.multipleSelection)
+    },
+    //表格选中去重
+    duplicateRemoval(arr, arr2) {
+      let selectId = 0;
+      if (this.dialogCateIndex2 == -1) {
+        selectId = this.companyCateList[this.dialogCateIndex].id
+      } else {
+        selectId = this.companyCateList[this.dialogCateIndex].children[this.dialogCateIndex2].id
+      }
+      this.multipleSelection = []
+      for (let index2 = 0; index2 < arr2.length; index2++) {
+        const element2 = arr2[index2];
+        if (selectId == element2.categoryId) {
+
+        } else {
+          this.multipleSelection.push(element2)
+        }
+      }
+      this.multipleSelection = this.multipleSelection.concat(arr)
+
+    },
+    //表格checkbox选中
+    showSelectCheck() {
+      this.$nextTick(() => {
+        // 
+        if (this.multipleSelection.length > 0) {
+          this.multipleSelection.forEach(row => {
+            this.companyMaterialList.forEach(element => {
+              if (element.id == row.id) {
+                this.$refs.multipleTable.toggleRowSelection(element);
+              }
+            });
+          });
+        } else {
+          this.$refs.multipleTable.clearSelection();
+        }
+      })
+    },
+    //移除已选的材料
+    removeSelect(index) {
+      this.multipleSelection.splice(index, 1)
+    },
+    //删除选中的订单材料
+    deleteSelectMaterialFn(index) {
+      this.orderMaterialList.splice(index, 1)
+    },
+    //保存已选的材料到订单去
+    saveImportMaterial() {
+      let arr = []
+      if (this.multipleSelection.length == 0) {
+        this.$message.error(this.$t('message.energyManage.material.pleaseChoose') + this.$t('message.energyManage.material.material'))
+        return
+      } else {
+        this.multipleSelection.forEach(element => {
+          let onoff = true
+          //用于判断是不是已经在订单材料列表里面，不在则加入到列表
+          this.orderMaterialList.forEach(item => {
+            if (item.materialId == element.id) {
+              onoff = false
+            }
+          });
+          if (onoff) {
+            // arr.push({
+            //   materialId: element.id,
+            //   computeUnit: element.computeUnit,
+            //   materialName: element.materialName,
+            //   materialNum: 0,
+            //   materialSpecifications: element.materialSpecifications
+            // })
+            arr.push({
+              materialId: element.id,
+              computeUnit: element.computeUnit,
+              materialName: element.materialName,
+              materialNum: 0,
+              materialSpecifications: element.materialSpecifications
+            })
+          }
+
+        });
+      }
+      this.orderMaterialList = this.orderMaterialList.concat(arr)
+
+      this.selectMaterialDialog = false
+
+    },
+    //显示添加订单弹框
+    showAddOrEditDialog() {
+      this.addOrEditDialog = true;
+      this.dialogTitle = '新增'
+      this.dialogSteps = '0'
+      this.isAdd = true;
+      this.orderMaterialList = []
+      this.orderFileList = []
+      this.contractForm = {
+        "arrivalTime": "",
+        "buyerName": "",
+        "createUser": 0,
+        "enterpriseId": '',
+        "list": [],
+        "projectSn": "",
+        "receivingAddr": "",
+        "remarks": "",
+        "state": 1,
+        orderNumber: ''
+      }
+      this.contractForm.buyerName = this.$store.state.currentProDetail.name
+      //   this.contractForm.state=1
+
+      //   this.$nextTick(()=>{
+      //     this.$refs['contractForm'].resetFields();
+      //   })
+    },
+    //保存订单信息
+    saveContractInfoFn(state) {
+      this.$refs['contractForm'].validate((valid) => {
+        if (valid) {
+          this.contractForm.state = state
+          if (this.orderMaterialList.length == 0) {
+            this.$message.error(this.$t('message.energyManage.material.pleaseChoose') + this.$t('message.energyManage.material.material'))
+            return
+          }
+          this.contractForm.list = this.orderMaterialList
+
+          this.contractForm.fileUrl = JSON.stringify(this.orderFileList)
+
+          if (this.isAdd) {
+            this.contractForm.projectSn = this.searchSn
+            this.contractForm.createUser = this.$store.state.userInfo.userId
+            addmaterialPurchaseOrderApi(this.contractForm).then(res => {
+              this.$message.success(res.message);
+              this.addOrEditDialog = false;
+              this.getContractList()
+            })
+          } else {
+            editmaterialPurchaseOrderApi(this.contractForm).then(res => {
+              this.$message.success(res.message);
+              this.addOrEditDialog = false;
+              this.getContractList()
+            })
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val;
+      this.getContractList();
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val;
+      this.getContractList();
+    },
+    //重置合同列表的搜索参数
+    refreshFn() {
+      this.$refs['searchForm'].resetFields();
+      this.pagInfo.pageNo = 1
+      this.getContractList()
+    },
+    //获取订单列表
+    getContractList() {
+      let json = this.searchForm
+      json.pageNo = this.pagInfo.pageNo;
+      json.pageSize = this.pagInfo.pageSize;
+      json.projectSn = this.searchSn;
+      materialPurchaseOrderPageApi(json).then(result => {
+        // this.contractList = result.result.records;
+        this.pagInfo.total = result.result.total
+      })
+    },
+
+    //显示编辑订单信息弹框
+    editContractFn(item) {
+      getMaterialPurchaseInfoApi({ purchaseOrderId: item.id }).then(res => {
+        this.orderMaterialList = res.result.itemList;
+        this.wayBillList = res.result.wayBillList;
+        this.contractForm = res.result.purchaseOrder
+        this.isAdd = false
+        this.addOrEditDialog = true
+        if (this.contractForm.state == 1) {
+          this.dialogTitle =/* '编辑订单' */this.$t('message.energyManage.order.editOrder')
+        } else {
+          this.dialogTitle =/* '订单详细' */ this.$t('message.energyManage.order.orderDetail')
+        }
+        this.dialogSteps = '0'
+        if (this.contractForm.fileUrl) {
+          this.orderFileList = JSON.parse(this.contractForm.fileUrl)
+        } else {
+          this.orderFileList = []
+        }
+
+      })
+    },
+    //删除订单信息
+    deleteContractFn(obj) {
+      this.$confirm(this.$t('message.personnelPosition.beaconManage.table.confirmText') + "【" + obj.contractName + "】?", this.$t('message.personnelPosition.beaconManage.table.Tips'), {
+        confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
+        cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
+        type: "warning",
+      }).then(() => {
+        deletematerialPurchaseOrderApi({ id: obj.id }).then(result => {
+          this.$message.success(result.message);
+          this.getContractList();
+
+        })
+      })
+    },
+    //获取供料单位列表
+    getFeedUnitList() {
+      let data = {
+        projectSn: this.searchSn,
+        cooperationType: 1
+      };
+      selectProjectCooperationUnitListApi(data).then((res) => {
+        this.feedUnitList = res.result
+      });
+    },
+
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      this.orderFileList = [];
+      fileList.forEach(element => {
+        let data = element.response.data[0]
+        this.orderFileList.push({
+          name: data.filename,
+          url: data.imageUrl
+        })
+      });
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('上传成功', fileList);
+      console.log(response)
+      let data = response.data[0]
+      this.orderFileList.push({
+        name: data.filename,
+        url: data.imageUrl
+      })
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(this.$t('message.energyManage.order.confirmRemove') + file.name + '?');
+    },
+    //订单作废
+    invalidOrderFn(obj) {
+      this.$confirm(this.$t('message.energyManage.order.tipText') + '?', {
+        confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
+        cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
+        type: "warning",
+      }).then(() => {
+        abandonPurchaseOrderApi({ id: obj.id }).then(result => {
+          this.$message.success(result.message);
+          this.getContractList();
+        })
+      })
+    },
+    //下单
+    placeOrderFn(item) {
+      updatePurchaseOrderApi({ id: item.id, state: 2 }).then(res => {
+        this.$message.success(res.message);
+
+        this.getContractList()
+      })
+    },
+    downLoadFileFn(url) {
+      window.open(this.$store.state.FILEURL + url)
+    }
+  },
+};
+</script>
+<style lang="less" scoped>
+.rightPanel {
+  float: left;
+  width: calc(100% - 330px - 20px - 30px);
+  margin-left: 20px;
+  padding: 20px 15px;
+  height: calc(100% - 40px);
+}
+
+.dialogSteps {
+  justify-content: center;
+  margin-bottom: 30px;
+}
+
+.system-left {
+  float: left;
+  width: 250px;
+  padding: 20px 15px;
+  height: calc(100% - 40px);
+  background-color: white;
+
+  .treeList {
+    // background-color: rgba(216, 216, 216, 0.2);
+    height: calc(110% - 42px) !important;
+    margin-top: 10px;
+  }
+
+  li {
+    cursor: pointer;
+    font-size: 16px;
+    line-height: 32px;
+    letter-spacing: 1px;
+    font-weight: bold;
+
+    .clickName {
+      width: calc(100% - 176px);
+
+      .imgbox {
+        display: inline-block;
+        margin: 0 6px 0 13px;
+        font-size: 16px;
+      }
+    }
+  }
+
+  li:hover,
+  .active {
+    // background: linear-gradient(270deg, white, #b7d8ff 100%);
+    background-color: rgba(81, 129, 246, 0.14);
+    color: @--color-primary;
+  }
+
+  #child {
+    li {
+      font-size: 15px;
+      padding-left: 39px;
+      font-weight: normal;
+    }
+  }
+}
+
+.system-right {
+  float: right;
+  // margin-right: 1.5%;
+  // margin-left: 20px;
+  width: calc(100% - 260px - 20px - 30px);
+  // min-height: 620px;
+  height: calc(100% - 40px);
+  // border: 1px solid #e9e9e9;
+  background-color: white;
+  padding: 0px 15px;
+}
+
+.titleSearch {
+  // margin: 30px 10px;
+}
+
+.project {
+  .rightPanel {
+    width: 100%;
+    margin-left: 0;
+  }
+}
+
+.orderFileList {
+  li {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+}
+
+.rightForm {
+  width: 76%;
+  top: 75px;
+  right: -2%;
+  position: absolute;
+}
+
+.dialog_content {
+  padding: 25px 0 !important;
+}
+
+::v-deep .el-select {
+  width: 160px;
+}
+
+::v-deep .el-date-editor {
+  width: 260px;
+}
+
+::v-deep .el-input {
+  width: 160px;
+}
+
+::v-deep .el-dialog__body {
+  padding: 30px 15px !important;
+}
+
+.dialog-footerTwo {
+  display: flex;
+  position: absolute;
+  top: 96%;
+  left: 22%;
+
+  div {
+    margin: 0 20px;
+    width: 150px;
+  }
+}
+
+// .el-form-item{
+//   margin-right: 25px;
+// }
+</style>
\ No newline at end of file
diff --git a/src/views/projectFront/warehouseManagement/inOutManagement/warehousingManagement.vue b/src/views/projectFront/warehouseManagement/inOutManagement/warehousingManagement.vue
new file mode 100644
index 00000000..eacde777
--- /dev/null
+++ b/src/views/projectFront/warehouseManagement/inOutManagement/warehousingManagement.vue
@@ -0,0 +1,1249 @@
+<template>
+  <div class="fullHeight project">
+    <div class="fullHeight">
+      <div class="rightPanel whiteBlock">
+        <p class="pageTitle">入库管理</p>
+        <!-- 列表搜索栏 -->
+        <el-form
+          :inline="true"
+          ref="searchForm"
+          :model="searchForm"
+          size="medium"
+        >
+          <el-form-item label="单号">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="供货单位">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="仓库">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="部门">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="经手人">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="日期">
+            <el-date-picker
+              v-model="value1"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="货号">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="助查码">
+            <el-input
+              v-model="searchForm.warehouseName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="类型" prop="state">
+            <el-select
+              v-model="searchForm.state"
+              filterable
+              placeholder="请选择"
+              :clearable="true"
+            >
+              <el-option
+                v-for="(item, index) in orderStatusArr"
+                :key="index"
+                :label="item"
+                :value="index + 1"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <!-- 供料单位
+            <el-form-item :label="$t('message.energyManage.waybill.feedCompany')" prop="enterpriseId">
+              <el-select v-model="searchForm.enterpriseId" filterable :placeholder="$t('message.energyManage.material.pleaseChoose')" :clearable="true">
+                <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId">
+                </el-option>
+                </el-select>
+            </el-form-item> -->
+          <el-form-item>
+            <el-button type="primary" plain @click="getContractList"
+              >查询</el-button
+            >
+            <el-button type="warning" plain @click="refreshFn">刷新</el-button>
+            <el-button
+              type="primary"
+              size="medium"
+              @click="showAddOrEditDialog"
+            >
+              新增
+            </el-button>
+            <el-button type="primary" @click="exportFn"> 导出 </el-button>
+          </el-form-item>
+        </el-form>
+        <!-- 列表 -->
+        <div class="table_wrap whiteBlock">
+          <el-table class="tables" :data="contractList">
+            <el-table-column prop="orderNumber" label="编号" align="center">
+            </el-table-column>
+            <el-table-column prop="state" label="单号" align="center">
+            </el-table-column>
+            <el-table-column prop="materialName" label="日期" align="center">
+            </el-table-column>
+            <el-table-column prop="computeUnit" label="仓库" align="center">
+            </el-table-column>
+            <el-table-column prop="materialNum" label="方向" align="center">
+            </el-table-column>
+            <el-table-column
+              prop="enterpriseName"
+              label="类别"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="receivingAddr"
+              label="供应商"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="createUserAme"
+              label="经手人"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="addTime"
+              label="批号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="arrivalTime"
+              label="制单人"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="createTime"
+              width="180"
+              label="制单时间"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <div
+                  class="tableBtns"
+                  style="margin-left: 40px; color: #90affa"
+                >
+                  <i class="el-icon-tickets"></i>
+                  <span style="color: black">详情</span>
+                </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>
+      </div>
+    </div>
+    <!--新增入库单信息弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      :title="dialogTitle"
+      :visible.sync="addOrEditDialog"
+      width="1167px"
+    >
+      <p>入库单信息</p>
+      <div class="dialog_content">
+        <el-form
+          style="margin: 0 28px"
+          size="medium"
+          :model="contractForm"
+          ref="contractForm"
+          :rules="contractFormRules"
+          :inline="true"
+        >
+          <el-form-item label="日期" prop="arrivalTime">
+            <el-date-picker
+              v-model="value1"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd HH:mm"
+            >
+            </el-date-picker>
+            <!-- <el-date-picker
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.arrivalTime"
+              type="datetime"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd HH:mm"
+            >
+            </el-date-picker> -->
+          </el-form-item>
+          <el-form-item label="仓库" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="类型" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="方向" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="供货单位" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="编号" prop="orderNumber">
+            <el-input
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.orderNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="单号" prop="orderNumber">
+            <el-input
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.orderNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="批号" prop="orderNumber">
+            <el-input
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.orderNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="部门" prop="enterpriseId">
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            label="经手人"
+            prop="enterpriseId"
+            style="margin-left: 15px"
+          >
+            <el-select
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.enterpriseId"
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in feedUnitList"
+                :key="item.id"
+                :label="item.enterpriseName"
+                :value="item.enterpriseId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="备注" prop="remarks">
+            <el-input
+              style="width: 1030px"
+              type="textarea"
+              :rows="1"
+              :disabled="contractForm.state != 1"
+              v-model="contractForm.remarks"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+        <div class="importMaterialBox">
+          <el-button
+            style="margin-bottom: 15px; margin-left: 1005px"
+            type="primary"
+            size="medium"
+            @click="importMaterial(1)"
+          >
+            增加明细
+          </el-button>
+          <el-table
+            class="tables"
+            :data="orderMaterialList"
+            height="360"
+            style="min-height: auto"
+          >
+            <el-table-column
+              prop="materialName"
+              label="品名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="materialSpecifications"
+              label="规格"
+              align="center"
+            ></el-table-column>
+            <el-table-column prop="computeUnit" label="单位" align="center">
+            </el-table-column>
+            <el-table-column prop="materialNum" label="数量" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  size="mini"
+                  :disabled="contractForm.state != 1"
+                  v-model="scope.row.computeUnit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="materialNum" label="单价" align="center">
+              <template slot-scope="scope">
+                <el-input
+                  size="mini"
+                  :disabled="contractForm.state != 1"
+                  v-model="scope.row.computeUnit"
+                ></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column prop="computeUnit" label="金额" align="center">
+            </el-table-column>
+            <el-table-column prop="computeUnit" label="备注" align="center">
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <div class="tableBtns" style="margin-left: 60px !important">
+                  <!-- <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>编辑</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>删除</span>
+              </div> -->
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="addOrEditDialog = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >取消
+          </el-button>
+          <!-- <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveContractInfoFn(1)"
+            size="medium"
+          >
+          暂存
+          </el-button> -->
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="saveContractInfoFn(2)"
+            size="medium"
+          >
+            保存
+          </el-button>
+        </div>
+        <div class="dialog-footerTwo">
+          <div>制单人:18772114025</div>
+          <div style="width: 200px">制单时间:2022-03-04 14:40:05</div>
+          <div>入库单编号:000008</div>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 新增入库单材料明细弹框-->
+    <el-dialog
+      :modal-append-to-body="false"
+      title="选择材料"
+      :visible.sync="selectMaterialDialog"
+      width="1167px"
+    >
+      <p>材料类别</p>
+      <div class="dialog_content">
+        <div class="block fullHeight" style="overflow: hidden">
+          <div class="system-left" style="padding: 0; height: 520px">
+            <div class="titleSearch">
+              <el-input
+                style="width: 250px"
+                placeholder="请搜索名称、编码"
+                prefix-icon="el-icon-search"
+                v-model="input2"
+              >
+              </el-input>
+            </div>
+            <vue-scroll class="treeList" style="height: 100% !important">
+              <div style="padding-top: 10px">
+                <ul v-for="(name, index) in companyCateList" :key="index">
+                  <li
+                    @click="changeCompanyCate(index, name, 1)"
+                    :class="{
+                      active:
+                        index == dialogCateIndex && dialogCateIndex2 == -1,
+                    }"
+                  >
+                    <div class="clickName" style="width: 100%">
+                      <div class="imgbox">
+                        <i
+                          v-if="dialogCateIndex != index"
+                          class="el-icon-caret-right"
+                        ></i>
+                        <i v-else class="el-icon-caret-bottom"></i>
+                      </div>
+                      <el-popover
+                        placement="top-start"
+                        v-model="name.visible"
+                        :content="name.categoryName"
+                      >
+                        <span
+                          slot="reference"
+                          @mouseenter="
+                            name.visible =
+                              name.categoryName.length > 9 ? true : false
+                          "
+                          @mouseleave="name.visible = false"
+                          >{{
+                            name.categoryName.length > 9
+                              ? name.categoryName.substring(0, 8) + '...'
+                              : name.categoryName
+                          }}</span
+                        >
+                      </el-popover>
+                    </div>
+                  </li>
+                  <ul
+                    v-for="(item, i) in name.children"
+                    id="child"
+                    v-if="dialogCateIndex == index"
+                    :key="i"
+                  >
+                    <li
+                      :class="{
+                        active: i == dialogCateIndex2 && dialogCateIndex != -1,
+                      }"
+                      @click="changeCompanyCate(i, item, 2)"
+                    >
+                      <el-popover
+                        placement="top-start"
+                        v-model="item.visible"
+                        :content="item.categoryName"
+                      >
+                        <div
+                          slot="reference"
+                          @mouseenter="
+                            item.visible =
+                              item.categoryName.length > 9 ? true : false
+                          "
+                          @mouseleave="item.visible = false"
+                          style="display: inline-block; width: 60%"
+                        >
+                          {{
+                            item.categoryName.length > 10
+                              ? item.categoryName.substring(0, 9) + '...'
+                              : item.categoryName
+                          }}
+                        </div>
+                      </el-popover>
+                    </li>
+                  </ul>
+                </ul>
+                <li
+                  class="title"
+                  style="text-align: center; line-height: 140px"
+                  v-show="companyCateList.length == 0"
+                >
+                  <!-- 暂无数据 -->
+                  {{ $t('message.energyManage.cate.noData') }}
+                </li>
+              </div>
+            </vue-scroll>
+          </div>
+
+          <div class="system-right">
+            <div class="rightForm">
+              <el-form
+                :inline="true"
+                ref="searchForm"
+                :model="searchForm"
+                size="medium"
+              >
+                <el-form-item label="助查码" prop="materialName">
+                  <el-input
+                    v-model="value5"
+                    placeholder="请输入助查码"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="货号" prop="materialName">
+                  <el-input
+                    v-model="value6"
+                    placeholder="请输入货号"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="品名" prop="materialName">
+                  <el-input
+                    v-model="value7"
+                    placeholder="请输入品名"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item label="规格" prop="materialName">
+                  <el-input
+                    v-model="value8"
+                    placeholder="请输入规格"
+                  ></el-input>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              ref="multipleTable"
+              style="min-height: auto"
+              height="520px"
+              :data="companyMaterialList"
+              class="tables"
+              @select="handleSelectionChange"
+              @select-all="handleSelectionChange"
+            >
+              <el-table-column
+                type="selection"
+                label=""
+                width="55"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="materialName"
+                :label="$t('message.energyManage.material.materialName')"
+                align="center"
+              >
+              </el-table-column>
+              <!-- 材料编码 -->
+              <el-table-column
+                prop="materialCode"
+                :label="$t('message.energyManage.material.materialNo')"
+                align="center"
+              ></el-table-column>
+              <!-- 计算单位 -->
+              <el-table-column
+                prop="computeUnit"
+                :label="$t('message.energyManage.material.unitOfAccount')"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="materialSpecifications"
+                :label="$t('message.energyManage.waybill.specification')"
+                align="center"
+              ></el-table-column>
+              <!-- 正负差 -->
+              <el-table-column
+                prop="materialSpecifications"
+                :label="$t('message.energyManage.material.plusOrMinus')"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <span v-if="scope.row.deviationType">
+                    {{ scope.row.adjustStartValue
+                    }}{{
+                      scope.row.deviationType == 1
+                        ? '%'
+                        : $t(message.energyManage.material.weight3)
+                    }}
+                    ~ {{ scope.row.adjustEndValue
+                    }}{{
+                      scope.row.deviationType == 1
+                        ? '%'
+                        : $t(message.energyManage.material.weight3)
+                    }}
+                  </span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+
+        <div class="dialog-footer">
+          <el-button
+            @click="selectMaterialDialog = false"
+            size="medium"
+            icon="el-icon-circle-close"
+          >
+            取消
+          </el-button>
+          <el-button
+            type="primary"
+            @click="saveImportMaterial()"
+            size="medium"
+            icon="el-icon-circle-check"
+          >
+            确定
+          </el-button>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addmaterialPurchaseOrderApi,
+  editmaterialPurchaseOrderApi,
+  deletematerialPurchaseOrderApi,
+  materialPurchaseOrderPageApi,
+  selectProjectCooperationUnitListApi,
+  abandonPurchaseOrderApi,
+  getMaterialPurchaseInfoApi,
+  updatePurchaseOrderApi,
+  materialCategoryListApi,
+  materialRecordListApi
+} from "@/assets/js/api/materialManage"
+export default {
+  data() {
+    return {
+      value5: '',
+      value6: '',
+      value7: '',
+      input2: '',
+      value8: '',
+      value1: '',
+      searchSn: "",
+      isAdd: true,
+      dialogTitle: '新增',
+      addOrEditDialog: false,
+      dialogSteps: 0,
+      contractForm: {
+        "arrivalTime": "",
+        "buyerName": "",
+        "createUser": 0,
+        "enterpriseId": '',
+        "list": [],
+        "projectSn": "",
+        "receivingAddr": "",
+        "remarks": "",
+        "state": 1,
+        orderNumber: ''
+      },
+      contractFormRules: {
+        // orderNumber: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], enterpriseId: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], buyerName: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], receivingAddr: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ], arrivalTime: [
+        //   { required: true, message: this.$t('message.energyManage.material.require'), trigger: 'blur' }
+        // ]
+      },
+      //选择材料所用变量 --- start
+      dialogCateIndex: 0,
+      dialogCateIndex2: -1,
+      dialogTabActiveName: 'first',
+      selectMaterialDialog: false,
+      companyCateList: [],
+      companyMaterialList: [],
+      multipleSelection: [],
+      //选择材料所用变量 --- end
+      contractList: [],
+      orderMaterialList: [],
+      orderFileList: [],
+      pagInfo: {
+        pageNo: 1,//页数
+        pageSize: 10,//条数
+        total: 0,//总条数
+      },
+      searchForm: {
+        state: '',
+        enterpriseId: ''
+      },
+      feedUnitList: [],
+      orderStatusArr: this.$t('message.energyManage.order.orderStatusArr'),
+      wayBillList: []
+    };
+  },
+  mounted() {
+    this.searchSn = this.$store.state.userInfo.sn;
+    this.getContractList()
+    this.getFeedUnitList()
+  },
+  methods: {
+    //导出
+    exportFn() {
+      // window.location.href =
+      //   this.$http.defaults.baseURL +
+      //   'xmgl/download/exporZipWorkerInfo?idCard=' +
+      //   this.tableParameter.idCard +
+      //   '&projectSn=' +
+      //   this.tableParameter.projectSn +
+      //   '&teamId=' +
+      //   this.tableParameter.teamId +
+      //   '&workerName=' +
+      //   this.tableParameter.workerName +
+      //   '&personType=' +
+      //   this.tableParameter.personType +
+      //   '&enterDate=' +
+      //   this.tableParameter.enterDate +
+      //   '&codeState=' +
+      //   this.tableParameter.codeState +
+      //   '&enterpriseId=' +
+      //   this.checkedId
+    },
+    //   解析材料数据
+    parseMaterailData(name) {
+      let arr = [], str = ''
+      if (name.indexOf('_') != -1) {
+        arr = name.split('_')
+      }
+      arr.forEach(element => {
+        str += '<p>' + element + '</p>'
+      });
+      return str
+    },
+    //显示选择材料弹框
+    importMaterial(type) {
+      this.multipleSelection = [];
+      this.dialogCateIndex = 0
+      this.dialogCateIndex2 = -1,
+        this.dialogTabActiveName = 'first'
+      this.loadCompanyCateList(type);
+      this.selectMaterialDialog = true;
+      this.$nextTick(() => {
+        this.$refs.multipleTable.clearSelection();
+      })
+
+    },
+    //企业类别切换
+    changeCompanyCate(index, data, type) {
+      if (type == 1) {
+        this.dialogCateIndex2 = -1;
+        this.dialogCateIndex = index;
+      } else {
+        this.dialogCateIndex2 = index;
+      }
+
+      this.loadCompanyMaterialList(data.id);
+    },
+    //获取企业的材料分类
+    loadCompanyCateList(type) {
+      let param = {
+        sn: this.pageType == 'companyAdmin' ? this.$store.state.userInfo.headquartersSn : this.searchSn,
+      };
+      materialCategoryListApi(param).then((res) => {
+        this.companyCateList = res.result;
+        if (this.companyCateList.length > 0) {
+          this.loadCompanyMaterialList(this.companyCateList[0].id);
+        }
+      });
+    },
+    //按企业分类获取材料列表
+    loadCompanyMaterialList(id) {
+      let param = {
+        categoryId: id,
+      };
+      materialRecordListApi(param).then((res) => {
+        this.companyMaterialList = res.result;
+        this.showSelectCheck()
+      });
+    },
+    handleSelectionChange(val) {
+      //   console.log('此次选中',val)
+      this.duplicateRemoval(val, this.multipleSelection)
+    },
+    //表格选中去重
+    duplicateRemoval(arr, arr2) {
+      let selectId = 0;
+      if (this.dialogCateIndex2 == -1) {
+        selectId = this.companyCateList[this.dialogCateIndex].id
+      } else {
+        selectId = this.companyCateList[this.dialogCateIndex].children[this.dialogCateIndex2].id
+      }
+      this.multipleSelection = []
+      for (let index2 = 0; index2 < arr2.length; index2++) {
+        const element2 = arr2[index2];
+        if (selectId == element2.categoryId) {
+
+        } else {
+          this.multipleSelection.push(element2)
+        }
+      }
+      this.multipleSelection = this.multipleSelection.concat(arr)
+
+    },
+    //表格checkbox选中
+    showSelectCheck() {
+      this.$nextTick(() => {
+        // 
+        if (this.multipleSelection.length > 0) {
+          this.multipleSelection.forEach(row => {
+            this.companyMaterialList.forEach(element => {
+              if (element.id == row.id) {
+                this.$refs.multipleTable.toggleRowSelection(element);
+              }
+            });
+          });
+        } else {
+          this.$refs.multipleTable.clearSelection();
+        }
+      })
+    },
+    //移除已选的材料
+    removeSelect(index) {
+      this.multipleSelection.splice(index, 1)
+    },
+    //删除选中的订单材料
+    deleteSelectMaterialFn(index) {
+      this.orderMaterialList.splice(index, 1)
+    },
+    //保存已选的材料到订单去
+    saveImportMaterial() {
+      let arr = []
+      if (this.multipleSelection.length == 0) {
+        this.$message.error(this.$t('message.energyManage.material.pleaseChoose') + this.$t('message.energyManage.material.material'))
+        return
+      } else {
+        this.multipleSelection.forEach(element => {
+          let onoff = true
+          //用于判断是不是已经在订单材料列表里面，不在则加入到列表
+          this.orderMaterialList.forEach(item => {
+            if (item.materialId == element.id) {
+              onoff = false
+            }
+          });
+          if (onoff) {
+            // arr.push({
+            //   materialId: element.id,
+            //   computeUnit: element.computeUnit,
+            //   materialName: element.materialName,
+            //   materialNum: 0,
+            //   materialSpecifications: element.materialSpecifications
+            // })
+            arr.push({
+              materialId: element.id,
+              computeUnit: element.computeUnit,
+              materialName: element.materialName,
+              materialNum: 0,
+              materialSpecifications: element.materialSpecifications
+            })
+          }
+
+        });
+      }
+      this.orderMaterialList = this.orderMaterialList.concat(arr)
+
+      this.selectMaterialDialog = false
+
+    },
+    //显示添加订单弹框
+    showAddOrEditDialog() {
+      this.addOrEditDialog = true;
+      this.dialogTitle = '新增'
+      this.dialogSteps = '0'
+      this.isAdd = true;
+      this.orderMaterialList = []
+      this.orderFileList = []
+      this.contractForm = {
+        "arrivalTime": "",
+        "buyerName": "",
+        "createUser": 0,
+        "enterpriseId": '',
+        "list": [],
+        "projectSn": "",
+        "receivingAddr": "",
+        "remarks": "",
+        "state": 1,
+        orderNumber: ''
+      }
+      this.contractForm.buyerName = this.$store.state.currentProDetail.name
+      //   this.contractForm.state=1
+
+      //   this.$nextTick(()=>{
+      //     this.$refs['contractForm'].resetFields();
+      //   })
+    },
+    //保存订单信息
+    saveContractInfoFn(state) {
+      this.$refs['contractForm'].validate((valid) => {
+        if (valid) {
+          this.contractForm.state = state
+          if (this.orderMaterialList.length == 0) {
+            this.$message.error(this.$t('message.energyManage.material.pleaseChoose') + this.$t('message.energyManage.material.material'))
+            return
+          }
+          this.contractForm.list = this.orderMaterialList
+
+          this.contractForm.fileUrl = JSON.stringify(this.orderFileList)
+
+          if (this.isAdd) {
+            this.contractForm.projectSn = this.searchSn
+            this.contractForm.createUser = this.$store.state.userInfo.userId
+            addmaterialPurchaseOrderApi(this.contractForm).then(res => {
+              this.$message.success(res.message);
+              this.addOrEditDialog = false;
+              this.getContractList()
+            })
+          } else {
+            editmaterialPurchaseOrderApi(this.contractForm).then(res => {
+              this.$message.success(res.message);
+              this.addOrEditDialog = false;
+              this.getContractList()
+            })
+          }
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val;
+      this.getContractList();
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val;
+      this.getContractList();
+    },
+    //重置合同列表的搜索参数
+    refreshFn() {
+      this.$refs['searchForm'].resetFields();
+      this.pagInfo.pageNo = 1
+      this.getContractList()
+    },
+    //获取订单列表
+    getContractList() {
+      let json = this.searchForm
+      json.pageNo = this.pagInfo.pageNo;
+      json.pageSize = this.pagInfo.pageSize;
+      json.projectSn = this.searchSn;
+      materialPurchaseOrderPageApi(json).then(result => {
+        // this.contractList = result.result.records;
+        this.pagInfo.total = result.result.total
+      })
+    },
+
+    //显示编辑订单信息弹框
+    editContractFn(item) {
+      getMaterialPurchaseInfoApi({ purchaseOrderId: item.id }).then(res => {
+        this.orderMaterialList = res.result.itemList;
+        this.wayBillList = res.result.wayBillList;
+        this.contractForm = res.result.purchaseOrder
+        this.isAdd = false
+        this.addOrEditDialog = true
+        if (this.contractForm.state == 1) {
+          this.dialogTitle =/* '编辑订单' */this.$t('message.energyManage.order.editOrder')
+        } else {
+          this.dialogTitle =/* '订单详细' */ this.$t('message.energyManage.order.orderDetail')
+        }
+        this.dialogSteps = '0'
+        if (this.contractForm.fileUrl) {
+          this.orderFileList = JSON.parse(this.contractForm.fileUrl)
+        } else {
+          this.orderFileList = []
+        }
+
+      })
+    },
+    //删除订单信息
+    deleteContractFn(obj) {
+      this.$confirm(this.$t('message.personnelPosition.beaconManage.table.confirmText') + "【" + obj.contractName + "】?", this.$t('message.personnelPosition.beaconManage.table.Tips'), {
+        confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
+        cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
+        type: "warning",
+      }).then(() => {
+        deletematerialPurchaseOrderApi({ id: obj.id }).then(result => {
+          this.$message.success(result.message);
+          this.getContractList();
+
+        })
+      })
+    },
+    //获取供料单位列表
+    getFeedUnitList() {
+      let data = {
+        projectSn: this.searchSn,
+        cooperationType: 1
+      };
+      selectProjectCooperationUnitListApi(data).then((res) => {
+        this.feedUnitList = res.result
+      });
+    },
+
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      this.orderFileList = [];
+      fileList.forEach(element => {
+        let data = element.response.data[0]
+        this.orderFileList.push({
+          name: data.filename,
+          url: data.imageUrl
+        })
+      });
+    },
+    handleSuccess(response, file, fileList) {
+      console.log('上传成功', fileList);
+      console.log(response)
+      let data = response.data[0]
+      this.orderFileList.push({
+        name: data.filename,
+        url: data.imageUrl
+      })
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(this.$t('message.energyManage.order.confirmRemove') + file.name + '?');
+    },
+    //订单作废
+    invalidOrderFn(obj) {
+      this.$confirm(this.$t('message.energyManage.order.tipText') + '?', {
+        confirmButtonText: this.$t('message.personnelPosition.confirmButtonText'),
+        cancelButtonText: this.$t('message.personnelPosition.cancelButtonText'),
+        type: "warning",
+      }).then(() => {
+        abandonPurchaseOrderApi({ id: obj.id }).then(result => {
+          this.$message.success(result.message);
+          this.getContractList();
+        })
+      })
+    },
+    //下单
+    placeOrderFn(item) {
+      updatePurchaseOrderApi({ id: item.id, state: 2 }).then(res => {
+        this.$message.success(res.message);
+
+        this.getContractList()
+      })
+    },
+    downLoadFileFn(url) {
+      window.open(this.$store.state.FILEURL + url)
+    }
+  },
+};
+</script>
+<style lang="less" scoped>
+.rightPanel {
+  float: left;
+  width: calc(100% - 330px - 20px - 30px);
+  margin-left: 20px;
+  padding: 20px 15px;
+  height: calc(100% - 40px);
+}
+
+.dialogSteps {
+  justify-content: center;
+  margin-bottom: 30px;
+}
+
+.system-left {
+  float: left;
+  width: 250px;
+  padding: 20px 15px;
+  height: calc(100% - 40px);
+  background-color: white;
+
+  .treeList {
+    // background-color: rgba(216, 216, 216, 0.2);
+    height: calc(110% - 42px) !important;
+    margin-top: 10px;
+  }
+
+  li {
+    cursor: pointer;
+    font-size: 16px;
+    line-height: 32px;
+    letter-spacing: 1px;
+    font-weight: bold;
+
+    .clickName {
+      width: calc(100% - 176px);
+
+      .imgbox {
+        display: inline-block;
+        margin: 0 6px 0 13px;
+        font-size: 16px;
+      }
+    }
+  }
+
+  li:hover,
+  .active {
+    // background: linear-gradient(270deg, white, #b7d8ff 100%);
+    background-color: rgba(81, 129, 246, 0.14);
+    color: @--color-primary;
+  }
+
+  #child {
+    li {
+      font-size: 15px;
+      padding-left: 39px;
+      font-weight: normal;
+    }
+  }
+}
+
+.system-right {
+  float: right;
+  // margin-right: 1.5%;
+  // margin-left: 20px;
+  width: calc(100% - 260px - 20px - 30px);
+  // min-height: 620px;
+  height: calc(100% - 40px);
+  // border: 1px solid #e9e9e9;
+  background-color: white;
+  padding: 0px 15px;
+}
+
+.titleSearch {
+  // margin: 30px 10px;
+}
+
+.project {
+  .rightPanel {
+    width: 100%;
+    margin-left: 0;
+  }
+}
+
+.orderFileList {
+  li {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10px;
+  }
+}
+
+.rightForm {
+  width: 76%;
+  top: 75px;
+  right: -2%;
+  position: absolute;
+}
+
+.dialog_content {
+  padding: 25px 0 !important;
+}
+
+::v-deep .el-select {
+  width: 160px;
+}
+
+::v-deep .el-date-editor {
+  width: 260px;
+}
+
+::v-deep .el-input {
+  width: 160px;
+}
+
+::v-deep .el-dialog__body {
+  padding: 30px 15px !important;
+}
+
+.dialog-footerTwo {
+  display: flex;
+  position: absolute;
+  top: 96%;
+  left: 22%;
+
+  div {
+    margin: 0 20px;
+    width: 150px;
+  }
+}
+
+// .el-form-item{
+//   margin-right: 25px;
+// }
+</style>
\ No newline at end of file