From 95c5b63a14239e3780cdc365ed490fd6731020bc Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Thu, 13 Apr 2023 16:41:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86-=E9=A2=86?=
 =?UTF-8?q?=E6=96=99=E5=8D=95=E4=BD=8D=E9=A1=B5=E9=9D=A2=E3=80=81=E5=A4=96?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=20?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/menu/xmgk_ckgl.png          | Bin 0 -> 4566 bytes
 src/assets/js/http.js                         |   4 +-
 src/router/index.js                           |  26 +-
 .../basicInformation/InventorySituation.vue   |   2 +-
 .../basicInformation/employeeManagement.vue   | 486 +++++++++++++++++
 .../basicInformation/materialReceiving.vue    | 493 ++++++++++++++++++
 .../outsourcingManagement.vue                 | 480 +++++++++++++++++
 .../productClassification.vue                 |  14 +-
 .../basicInformation/productManagement.vue    |   2 +-
 .../basicInformation/warehouseList.vue        |  12 +-
 10 files changed, 1497 insertions(+), 22 deletions(-)
 create mode 100644 src/assets/images/menu/xmgk_ckgl.png
 create mode 100644 src/views/projectFront/warehouseManagement/basicInformation/employeeManagement.vue
 create mode 100644 src/views/projectFront/warehouseManagement/basicInformation/materialReceiving.vue
 create mode 100644 src/views/projectFront/warehouseManagement/basicInformation/outsourcingManagement.vue

diff --git a/src/assets/images/menu/xmgk_ckgl.png b/src/assets/images/menu/xmgk_ckgl.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0336c999e2e44a1ba122bfa6c3f9122c42ee98e
GIT binary patch
literal 4566
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
AIsgCw

literal 0
HcmV?d00001

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