Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/RMS/components/addCapacity.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -37,14 +37,32 @@ export default {
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
          carrierId:this.form1.carrierId,
-       } 
+       };
+       if(
+         RmsCapacity.capacityNumber==null ||
+         RmsCapacity.capacityCorlor==null ||
+         RmsCapacity.capacityOwneris==null ||
+         RmsCapacity.capacityVip==null ||
+         RmsCapacity.capacityBlacklist==null ||
+         RmsCapacity.carrierId==null
+       )this.$message.error("存在空值！");
+       else
       this.axios
         .post(
           "/api/v1/rms/insertCapacity", RmsCapacity
         )
         .then((res) => {
-        
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addCarDriver.vue

@@ -3,22 +3,25 @@
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
     <el-divider content-position="left">司机信息</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
+    </div>
+   <!-- <el-upload
+      class="upload-demo"
+      action="https://jsonplaceholder.typicode.com/posts/"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :before-remove="beforeRemove"
+      multiple
+      :limit="1"
+      :on-exceed="handleExceed"
+      :file-list="fileList"
+    >
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件，且不超过500kb
       </div>
- <el-upload
-  class="upload-demo"
-  action="https://jsonplaceholder.typicode.com/posts/"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :before-remove="beforeRemove"
-  multiple
-  :limit="1"
-  :on-exceed="handleExceed"
-  :file-list="fileList">
-  <el-button size="small" type="primary">点击上传</el-button>
-  <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
-</el-upload>     
+    </el-upload> -->
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -28,58 +31,79 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
       value: undefined,
-      fileList: []
+      fileList: [],
     };
   },
   mounted() {},
   methods: {
     handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      },
-      handleExceed(files, fileList) {
-        this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-      },
-      beforeRemove(file, fileList) {
-        return this.$confirm(`确定移除 ${ file.name }？`);
-      },
-     makeSure() {
-       console.log(this.form1);
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(
+        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
+          files.length + fileList.length
+        } 个文件`
+      );
+    },
+    beforeRemove(file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    makeSure() {
+      console.log(this.form1);
       let RmsCarDriver = {
-       driverName:this.form1.driverName,
-       driverSex:this.form1.driverSex,
-       driverAge:this.form1.driverAge,
-       driverIdentityCard:this.form1.driverIdentityCard,
-       driverPhone:this.form1.driverPhone,
-       transportTypeId:this.form1.transportTypeId,
-       carrierId:this.form1.carrierId,
-       driverPermitNo:this.form1.driverPermitNo,
-       driverLicence:this.form1.driverLicence,
-       driverLicence:this.form1.driverLicence,
-       driverLicence:this.form1.driverLicence,
-      }
-      
+        driverName: this.form1.driverName,
+        driverSex: this.form1.driverSex,
+        driverAge: this.form1.driverAge,
+        driverIdentityCard: this.form1.driverIdentityCard,
+        driverPhone: this.form1.driverPhone,
+        transportTypeId: this.form1.transportTypeId,
+        carrierId: this.form1.carrierId,
+        driverPermitNo: this.form1.driverPermitNo,
+        driverLicence: this.form1.driverLicence,
+        driverLicence: this.form1.driverLicence,
+        driverLicence: this.form1.driverLicence,
+      };
+    if(
+        RmsCarDriver.driverName==null ||
+        RmsCarDriver.driverSex==null ||
+        RmsCarDriver.driverAge==null ||
+        RmsCarDriver.driverIdentityCard==null ||
+        RmsCarDriver.driverPhone==null ||
+        RmsCarDriver.transportTypeId==null ||
+        RmsCarDriver.carrierId==null 
+    )this.$message.error("存在空值！");
+     else
       this.axios
-        .post(
-          "/api/v1/rms/insertCarDriver" , RmsCarDriver
-        )
-        .then((res) => { 
-          this.$router.go(-1);
+        .post("/api/v1/rms/insertCarDriver", RmsCarDriver)
+       .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消
     cancel() {
       this.$router.go(-1);
-    },  
+    },
   },
 };
 </script>

src/views/RMS/components/addCarrier.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -53,14 +53,49 @@ export default {
         carrierContactNumber:this.form1.carrierContactNumber,
         carrierType:this.form1.carrierType,
         carrierTransportType:this.form1.carrierTransportType
-      }
+      };
+      if(
+        RmsCarrier.carrierName ==null ||
+       // RmsCarrier.carrierTransportCertificate ==null ||
+       // RmsCarrier.carrierBusinessLicense ==null ||
+       // RmsCarrier.carrierBusinessAblelicense ==null ||
+        RmsCarrier.carrierAbbreviation ==null ||
+        RmsCarrier.carrierAddress ==null ||
+        RmsCarrier.registerNo ==null ||
+        RmsCarrier.carrierBidAreaId ==null || 
+        RmsCarrier.carrierLegalRepresentative ==null ||
+        RmsCarrier.registerCapital ==null ||
+        RmsCarrier.businessScope ==null ||
+        RmsCarrier.annualDate ==null ||
+        RmsCarrier.companyStatusDesc ==null ||
+        RmsCarrier.companyTypeDesc ==null ||
+        RmsCarrier.operationPeriod ==null ||
+        RmsCarrier.registerDate ==null ||
+        RmsCarrier.registerOrganization ==null ||
+        RmsCarrier.registerAptitudes ==null ||
+        RmsCarrier.contactsName ==null ||
+        RmsCarrier.carrierContactNumber ==null ||
+        RmsCarrier.carrierType ==null ||
+        RmsCarrier.carrierTransportType ==null 
+      )this.$message.error("存在空值！");
+      else
       this.axios
         .post(
           "/api/v1/rms/insertCarrier",
            RmsCarrier
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // // 取消

src/views/RMS/components/addGatepost.vue

@@ -17,7 +17,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -43,15 +43,31 @@ export default {
           gatepostLongitude:this.form1.gatepostLongitude,
           gatepostLatitude:this.form1.gatepostLatitude,
           gatepostPriority:this.form1.gatepostPriority
-      }
-      console.log(mapValue);
+      };
+      if(
+         RmsGatepost.gatepostName==null ||
+          RmsGatepost.gatepostLongitude==null ||
+          RmsGatepost.gatepostLatitude==null ||
+         RmsGatepost.gatepostPriority==null
+      )this.$message.error("存在空值！");
+      else
       this.axios
         .post(
           "/api/v1/rms/insertGatepost",
            RmsGatepost
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addMaterial.vue

@@ -40,7 +40,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -60,6 +60,7 @@ export default {
   methods: {
       currentRadioChange(selection){
       this.mapList=selection,
+      console.log(this.mapList)
       this.materialTypeName=this.mapList.materialTypeName
     },
     onclick(){
@@ -74,15 +75,34 @@ export default {
         materialTypeId:this.mapList.materialTypeId,
         unitOfMeasureId:this.form1.unitOfMeasureId,
         materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
-      }
-      console.log(RmsMaterial)
+      };
+      if(
+        RmsMaterial.materialCode==null ||
+        RmsMaterial.materialName==null ||
+        RmsMaterial.materialSpecification==null ||
+        RmsMaterial.materialModel==null ||
+        RmsMaterial.materialTypeId==null ||
+        RmsMaterial.unitOfMeasureId==null ||
+        RmsMaterial.materialTheoreticalWeight==null 
+      )this.$message.error("存在空值！");
+      else
       this.axios
         .post(
           "/api/v1/rms/insertMaterial",
            RmsMaterial
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addNotice.vue

@@ -0,0 +1,72 @@
+
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">公告信息</el-divider>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="302" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+      };
+      if(
+        DilNotice.noticeTitle ==null ||
+        DilNotice.insertUsername ==null ||
+        DilNotice.noticeContent ==null
+      )this.$message.error("存在空值！");
+      else
+      this.axios
+        .post(
+          "/api/v1/rms/insertNotice",DilNotice
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+
+</style>

src/views/RMS/components/addOilPrice.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -33,13 +33,29 @@ export default {
         priceId:this.form1.priceId,
         priceDate:this.form1.priceDate,
         priceValue:this.form1.priceValue,
-      }
+      };
+      if(
+        RmsOilPrice.priceOilName ==null ||
+        RmsOilPrice.priceDate ==null ||
+         RmsOilPrice.priceValue ==null
+      )this.$message.error("存在空值！");
+      else
       this.axios
         .post(
           "/api/v1/rms/insertOilPrice" , RmsOilPrice
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addPersonnel.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -37,14 +37,33 @@ export default {
         personnelShifts: this.form1.personnelShifts,
         departmentId: this.form1.shipperId
       };
-      console.log(RmsPersonnel)
+      if(
+        RmsPersonnel.personnelJobNumber ==null ||
+        RmsPersonnel.personnelName ==null ||
+        RmsPersonnel.personnelPost ==null ||
+        RmsPersonnel.personnelWorkshopid==null ||
+        RmsPersonnel.personnelShifts==null ||
+        RmsPersonnel.departmentId==null 
+      )this.$message.error("存在空值！");
+      else
+      
       this.axios
         .post(
           "/api/v1/rms/insertPersonnel",
            RmsPersonnel
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addPier.vue

@@ -44,8 +44,17 @@ export default {
            RmsCapacity
         )
         .then((res) => {
-        
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addPort.vue

@@ -45,8 +45,17 @@ export default {
            RmsCapacity
         )
         .then((res) => {
-        
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addRawWarehouse.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -38,8 +38,17 @@ export default {
           "/api/v1/rms/insertWarehouse", RmsWarehouse
         )
         .then((res) => {
-        
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addRmsShipper.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -33,10 +33,11 @@ export default {
         shipperAbbreviation: this.form1.shipperAbbreviation,
         shipperId:this.form1.shipperId
       };
-      // let RmsShipper = {
-      //   shipperName: this.from1.shipperName,
-      //   shipperAbbreviation: this.from1.shipperAbbreviation,
-      // };
+      if(
+        RmsShipper.shipperName==null ||
+        RmsShipper.shipperAbbreviation ==null 
+      )this.$message.error("存在空值！");
+      else
       this.axios
         .post(
           "/api/v1/rms/insertShipper",
@@ -44,7 +45,17 @@ export default {
 
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addSupplier.vue

@@ -15,7 +15,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -35,13 +35,31 @@ export default {
         supplierContactsName: this.form1.supplierContactsName,
         supplierContactNumber: this.form1.supplierContactNumber
       };
+      if(
+        RmsSupplier.supplierName==null ||
+        RmsSupplier.supplierAddress==null ||
+        RmsSupplier.supplierRegisterDate==null ||
+        RmsSupplier.supplierContactsName==null ||
+        RmsSupplier.supplierContactNumber==null 
+      )this.$message.error("存在空值！");
+      else
       this.axios
         .post(
           "/api/v1/rms/insertSupplier",
            RmsSupplier
         )
         .then((res) => {
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
     // 取消

src/views/RMS/components/addTruckCalculate.vue

@@ -31,7 +31,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -71,20 +71,35 @@ export default {
          truckCalculateLongitude:this.form1.truckCalculateLongitude,
          truckCalculateLatitude:this.form1.truckCalculateLatitude,
          calculateType:this.form1.calculateType,
-         }
-      let map = {
+         };  
+         let map = {
         mapList:this.mapList,
         rmsTruckCalculate:rmsTruckCalculate
-      }
-      console.log(map)
-      // console.log(RmsTruckCalculate)
+      };
+         if(
+        rmsTruckCalculate.truckCalculateNumber == null ||
+        rmsTruckCalculate.truckCalculateLongitude == null ||
+        rmsTruckCalculate.truckCalculateLatitude == null ||
+        rmsTruckCalculate.calculateType ==null
+         )this.$message.error("存在空值！");
+         
+       else
       this.axios
         .post(
           "/api/v1/rms/insertTruckCalculate",map
         )
         .then((res) => {
-        
-          this.$router.go(-1);
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
         });
     },
    

src/views/RMS/components/capacity.vue

@@ -47,13 +47,13 @@ export default {
      restaurants: [],
      options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getCapacityList?apiId=336",
+        requestUrl: "/api/v1/rms/getCapacityList?apiId=397",
       },
     }
   },
   methods:{
     onclick(){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=336&con=" +this.textInput;
+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&con=" +this.textInput;
     },
      toInsert() {
       this.$router.push("/addCapacity");

src/views/RMS/components/editCapacity.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -48,6 +48,7 @@ console.log(this.$route.params)
         .then((res) => {
             console.log(res.data.data)
           res.data.data.forEach((e) => {
+           
             this.form1 = e;
             console.log(e);
             console.log(this.form1);

src/views/RMS/components/editCarDriver.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/editCarrier.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -58,9 +58,9 @@ export default {
       this.$router.go(-1);
     },
     // 确认
-    onClickConfirm() {
-      console.log(this.form1)
+    onClickConfirm() {  
        let RmsCarrier={
+        carrierId:this.from1.carrierId,
         carrierName:this.form1.carrierName,
         carrierTransportCertificate:this.form1.carrierTransportCertificate,
         carrierBusinessLicense:this.form1.carrierBusinessLicense,

src/views/RMS/components/editGatepost.vue

@@ -1,19 +1,24 @@
 <template>
-  <!-- 修改门岗信息 -->
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">门岗信息</span>
+  <!-- 门岗规则信息页面 -->
+  <div class="homeworkPath">
+    <page-title>门岗规则信息</page-title>
+    <div class="form box">
+      <el-form>
+    <el-form-item>
+    <label class="el-form-item__label" style="width: auto;">门岗名称</label>
+         <el-input
+        placeholder=""
+        v-model="gatepostName"
+        :disabled="true">
+      </el-input>
+      </el-form-item>
+      </el-form>
+    </div>
+    <div class="form">
+      <dil-form :formId="358" v-model="form"></dil-form>
     </div>
-    <div class="contractTitle">  -->
-      <div class="form-box">
-         <div class="form-one">
-          <dil-form :formId="358" v-model="form1"></dil-form>
-        </div> 
-      </div>
-     </div>
-     <!-- 时间点 -->
-    <div class="form-box f2" >
+    <!-- 时间点 -->
+    <div class="form-box f1" >
         门岗开门时间
         <el-time-select
           v-model="rulesGatepostStartTime"
@@ -26,7 +31,7 @@
           >
         </el-time-select>
     </div>
-    <div class="form-box f3">
+    <div class="form-box f1">
       门岗关门时间
       <el-time-select
       v-model="rulesGatepostEndTime"
@@ -40,25 +45,17 @@
     </div>
     <!-- 原料模态窗口显示 -->
     <div class="form-box f1">
-      <el-form :inline="true" :model="formInline" class="demo-form-inline">
-        <el-form-item label="物资名称">
-          <el-input v-model="materialTypeName" disabled>  
-          </el-input>
-        </el-form-item>
+      <el-form :inline="true"  class="demo-form-inline">
+        
         <el-form-item>
-          <el-button type="primary" @click="drawer = true">增加物资种类</el-button>
+          <el-button type="primary" @click="drawer = true">增加物资</el-button>
         </el-form-item>
       </el-form>
     </div>
-    <div>
-      <div class="form-box" style="margin-left: 5rem">
-        <el-button type="primary" @click="makeSure">新增规则</el-button>
-      </div>
-    </div>
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
-      :before-close="handleClose">
+      >
       <el-input
         placeholder="请输入内容"
         v-model="inputText"
@@ -67,19 +64,20 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <div><dilTable v-bind.sync="options2" @radio-change="currentRadioChange" ></dilTable></div>
-      <div class="button-box">
-        <el-button type="primary" @click="makeSure">确定</el-button>
-      </div>
+      <div><dilTable v-bind.sync="options2" @selection-change="currentRadioChange" ></dilTable></div>
     </el-drawer>
-    <!-- 规则展示窗口 -->
-    <dilTable v-bind.sync="options1">
-      <el-table-column fixed="right" label="操作" align="center" width="200">
+    <div class="btn2">
+      <el-button type="primary" @click="makeSure">新增规则</el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+      <el-table-column fixed="right" label="操作" align="center" width="150">
         <template slot-scope="scope">
           <el-button
             type="text"
             size="mini"
-            @click="deleteclick(scope)">删除</el-button>
+            @click="deleteclick(scope)"
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </dilTable>
@@ -88,234 +86,171 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
-      value: undefined,
-      drawer: false,
-      direction: 'rtl',
-      materialName:"",
-      gatepostRules:"", 
+      drawer:false,
+      form: {},
       rulesGatepostStartTime:"",
       rulesGatepostEndTime:"",
+      rulesGatepostEntityOutTypeList:{},
+      materialNameList:{},
+      direction: 'rtl',
       inputText:"",
-      options1:{
-        // first请求数据的地址
-        requestUrl: "/api/v1/rms/getGatepostRulesById/"+this.$route.params.gatepostId+"?apiId=349",
-        selectionType: "radiio",
-        materialList:[]
+      gatepostName:"",
+      option: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/rms/getGatepostRulesById/"+this.$route.params.gatepostId+"?apiId=349",
       },
       options2:{
+        // 获取原料
         requestUrl: "/api/v1/rms/getMaterialList?apiId=351",
         selectionType:"select",
-        mapList:[]
-      },
-      form1: {},
+        materialList:[]
+      }
     };
   },
- 
   mounted() {
-      console.log(this.$route)
+    console.log(this.$route)
     this.information();
   },
   methods: {
-    deleteclick(scope){
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.axios
-            .post("/api/v1/rms/deleteGatepostRules/" + scope.row.rulesId)
-            .then((res) => {
-              if (res.data.code == 200) {
-                this.$message({
-                  type: "success",
-                  message: "删除成功!",
-                });     
-                this.$router.go(0);
-              } else {
-                this.$message({
-                  message: "删除失败",
-                  type: "warning",
-                });
-              }
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "删除操作已取消!",
-          });
-        });
-    },
-    addRules(){
-      
-    },
     currentRadioChange(selection){
-      this.mapList=selection,
-      console.log(this.mapList)
-      this.materialName=this.mapList.materialName
-    },
-    makeSure() {
-      console.log(this.form1)
-      let gatepost={
-          rulesId:this.form1.rulesId,
-          gatepostName:this.form1.gatepostName,
-          gatepostLongitude:this.form1.gatepostLongitude,
-          gatepostLatitude:this.form1.gatepostLatitude,
-          gatepostPriority:this.form1.gatepostPriority,
-          rulesGatepostStartTime:this.rulesGatepostStartTime,
-          rulesGatepostEndTime:this.rulesGatepostEndTime,
-          vehicleTypeId:this.form1.vehicleTypeId
-        }
-      let entityOutTypeLists={
-          rulesGatepostEntityOutType:this.form1.rulesGatepostEntityOutTypeStr
-        }
-      let material={
-          materialId:this.materialList.materialId,
-          materialName:this.materialList.materialName
-        }
-      let mapValue={
-        gatepost:gatepost,
-        entityOutTypeLists:entityOutTypeLists,
-        material:this.materialList
-      }
-    },
-    onclick(){
-        this.options2.requestUrl =
-        "/api/v1/rms/getMaterialList?apiId=349&con=" +this.inputText;
+      this.materialNameList=selection
+      console.log("materialNameList",this.materialNameList);
+      // materialName=this.materialNameList.materialName
     },
-    information() {
+    // 触发事件，渲染页面
+    information(){
       //编辑
       this.axios
         .post(
-          "/api/v1/rms/getGatepostById/" +
-            this.$route.params.rulesId
+          "/api/v1/rms/getGatepostName/" +
+          this.$route.params.gatepostId
         )
         .then((res) => {
-            console.log("res111111111111",res)
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-          });
+          this.gatepostName=res.data.data.gatepostName
         });
     },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
+    onclick(){
+      this.option2.requestUrl="/api/v1/rms/getMaterialList?apiId=351&con=" +this.inputText;
     },
-    // 确认
-    onClickConfirm() {
-      console.log(this.form1)
-       let gatepost={
-          gatepostName:this.form1.gatepostName,
-          gatepostLongitude:this.form1.gatepostLongitude,
-          gatepostLatitude:this.form1.gatepostLatitude,
-          gatepostPriority:this.form1.gatepostPriority,
-          rulesGatepostStartTime:this.rulesGatepostStartTime,
-          rulesGatepostEndTime:this.rulesGatepostEndTime,
-          vehicleTypeId:this.form1.vehicleTypeId,
-          rulesId:this.form1.rulesId
-        }
-      let entityOutTypeLists={
-          rulesGatepostEntityOutType:this.form1.rulesGatepostEntityOutType
-        }
-      let material={
-          materialId:this.materialList.materialId
-        }
+    // 新增
+    makeSure() {
+      let rmsGatepostRules = {
+        gatepostId:this.$route.params.gatepostId,
+        rulesGatepostStartTime:this.rulesGatepostStartTime,
+        rulesGatepostEndTime:this.rulesGatepostEndTime,
+        vehicleTypeId:this.form.vehicleTypeId,
+      };
+      var materialIds=[];
+      this.materialNameList.forEach((item,index) => {
+                  var materialId=item.materialId;
+			            materialIds.push(materialId);
+      });
+			let  rulesGatepostEntityOutTypeList={
+          rulesGatepostEntityOutTypeStr:this.form.rulesGatepostEntityOutTypeStr
+      }  
+      // = this.materialNameList;
+      // console.log("materialIds",materialIds);
       let mapValue={
-        gatepost:gatepost,
-        entityOutTypeLists:entityOutTypeLists,
-        material:this.materialList
-      }
-      this.axios
+        rmsGatepostRules:rmsGatepostRules,
+        materialIds:materialIds,
+        rulesGatepostEntityOutTypeList:rulesGatepostEntityOutTypeList
+      }  
+      if (
+        rmsGatepostRules.rulesGatepostStartTime == null ||
+        rmsGatepostRules.rulesGatepostEndTime == null ||
+        rmsGatepostRules.vehicleTypeId == null ||
+        rulesGatepostEntityOutTypeList.rulesGatepostEntityOutTypeStr == null ||
+        materialIds[0] == null 
+      )
+        this.$message.error("存在空值！"); 
+      
+      else
+        this.axios
           .post(
-            "/api/v1/rms/updateGatepost",
+            "/api/v1/rms/insertGatepostRule",
             mapValue
           )
           .then((res) => {
-            if (res.data.code == "200") {
-              this.$router.go(-1);
-          }
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              // this.$refs.table.refreshData();
+              this.$router.go(0);
+            } else {
+              this.$message.error("新增失败！");
+            }
+            this.$refs["table"].resetField();
+          });
+    },
+    deleteclick(scope) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+      .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteGatepostRules/"+scope.row.rulesId)
+            .then(() => {
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
         });
-      },
-      // 取消
-    cancel() {
-      this.$router.go(-1);
     },
-    handleClose(done) {
-      done();
-    }
-  }
+  },
 };
 </script>
-<style lang="scss" scoped>
-
-</style>
-<style lang='scss' scoped>
+<style lang='scss'>
+.homeworkPath {
+  .shipName{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 1.25rem;
+    .text{
+      width: 6.25rem;
+      text-align: right;
+      padding-right: 0.9375rem;
+      font-size: 0.9375rem;
+      font-weight: 600;
+      color: #606266;
+    }
+  }
+  .form {
+    margin-top: 1.25rem;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
 .form-box {
   padding: 20px 30px;
   margin-left: 330px;
 }
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
-}
-.btn-left {
-  margin-left: 470px;
-}
-.input {
-  margin-left: 90px;
-}
-.label{
-  margin-left: 445px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  padding-left: -30px;
-  font-family:Arial, Helvetica, sans-serif;
-  margin-bottom:20px;
-} 
-.label2{
-  margin-left: 425px;
-  margin-bottom: -30px;
-  font: bold;
-  font-size: 1rem;
-  font-family:Arial, Helvetica, sans-serif
-}
-.label1{
-  margin-left: 345px;
-  margin-bottom: -30px;
-  font: bold;
-}
-.common{
-  font-weight: 700;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
-    Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
-  font-size: 1rem;
-  cursor: default;
-  color: #2c3e50;
-}
 .f1{
   margin-top: -2.5rem;
-  margin-left: 17.5rem;
+  margin-left: 40rem;
 }
-.f11{
-  margin-top: -3rem;
-  
-  // margin-left: 29rem;
-}
-.f2{
-  margin-top: -2.5rem;
-  margin-left: 20.0rem;
-}
-.f3{
-  margin-top: -2.5rem;
-  margin-left: 20.0rem;
+.btn2{
+  margin-top: 2.5rem;
+  margin-left: 40rem;
 }
-</style>
+</style>

src/views/RMS/components/editMaterial.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/editNotice.vue

@@ -0,0 +1,107 @@
+<template>
+  <!-- 修改通知信息 -->
+  <div id="contractDetails">
+    <page-title>编辑</page-title>
+    <div class="main">
+      <span class="text">通知信息</span>
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+        <div class="form-one">
+          <dil-form :formId="302" v-model="form1"></dil-form>
+        </div>
+      </div>
+    </div>
+
+    <div class="button-box">
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button @click="onClickCancel">返回</el-button>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+
+
+
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+      let DilNotice = {
+        noticeId:this.form1.noticeId,
+        insertTime:this.form1.insertTime,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+
+      };
+      this.axios
+        .post(
+          "/api/v1/rms/updateNotice",
+          DilNotice
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+
+
+</style>
+
+<style>
+
+.el-textarea__inner{
+/*  width: 300px !important;*/
+  min-height:250px !important;
+}
+
+
+</style>
+
+
+
+

src/views/RMS/components/editOilPrice.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/editPersonnel.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
@@ -36,7 +36,7 @@ export default {
   methods: {
     information() {
       //编辑 
-   console.log(this.$route.params)
+   console.log("personnelId",this.$route.params)
       this.axios
         .post(
             "/api/v1/rms/getPersonnelById/" +
@@ -65,6 +65,7 @@ export default {
          personnelWorkshopid: this.form1.personnelWorkshopid,
          personnelShifts: this.form1.personnelShifts,
          shipperId: this.form1.shipperId,
+         personnelTeam: this.form1.personnelTeam,
        }  
         this.axios
           .post(

src/views/RMS/components/editRawWarehouse.vue

@@ -22,12 +22,14 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {
     return {
-      form1: {},
+      form1: {
+        warehouseName: '',
+      },
     };
   },
   mounted() {
@@ -37,19 +39,14 @@ export default {
   methods: {
     information() {
       //编辑
+      console.log("warehouseId",this.$route.params.warehouseId);
       this.axios
         .post(
           "/api/v1/rms/getWarehouseById/" +
             this.$route.params.warehouseId
         )
         .then((res) => {
-            console.log(res.data.data)
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.warehouseId);
-          });
+            this.form1.warehouseName = res.data.data.warehouseName;
         });
     },
     // 返回
@@ -59,7 +56,11 @@ export default {
     // 确认
     onClickConfirm() {
       console.log(this.form1)
-       let RmsWarehouse=this.form1;
+       let RmsWarehouse={
+      warehouseId:this.$route.params.warehouseId,
+      warehouseName:this.form1.warehouseName
+    }
+   console.log(RmsWarehouse)
         this.axios
           .post(
             "/api/v1/rms/updateWarehouse",

src/views/RMS/components/editRmsShipper.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/editSupplier.vue

@@ -22,7 +22,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/editTruckCalculate.vue

@@ -13,12 +13,10 @@
       </div>
         <div class="form-box f1">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
-  <el-form-item label="物资名称">
-    <el-input v-model="materialTypeName" disabled>  
     </el-input>
   </el-form-item>
   <el-form-item>
-    <el-button type="primary" @click="drawer = true">增加物资种类</el-button>
+    <el-button type="primary" @click="drawer = true">增加物资</el-button>
   </el-form-item>
     </el-form>
     </div>
@@ -61,7 +59,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-//import { sjTime } from "@/js/sharedJsFile";
+
 export default {
   components: { PageTitle },
   data() {

src/views/RMS/components/getNoticeById.vue

@@ -0,0 +1,86 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+      <el-divider content-position="left">公告信息</el-divider>
+    </div>
+<!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="300" v-model="form1" ref="from1" autosize></dil-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  name:"homeworkPath",
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+
+    };
+  },
+
+  mounted() {
+    console.log(this.$route)
+    this.information();
+  },
+
+
+
+
+  methods: {
+    information() {
+
+      //编辑
+      this.axios
+        .post(
+          "/api/v1/rms/getNoticeById/" +
+          this.$route.params.noticeId
+        )
+        .then((res) => {
+          console.log(res)
+          res.data.data.forEach((e) => {
+            this.form1 = e;
+            console.log(e);
+            console.log(this.form1);
+            console.log(this.$route.params.noticeId);
+          }
+          );
+        });
+
+
+      },
+
+  },
+
+}
+
+</script>
+
+<style>
+
+.el-textarea .el-input--medium .is-disabled  {
+:rows="10"
+}
+
+
+.el-textarea__inner{
+  font-size: 15px !important;
+  height:200px !important;
+
+}
+</style>
+
+
+<!--<el-input id="FormGroup_1639361270400"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+
+>
+</el-input>-->
+

src/views/RMS/components/notice.vue

@@ -0,0 +1,138 @@
+//公告管理
+<template>
+  <div class="notice">
+    <div class="sache">
+      <el-input
+        placeholder="请输入内容"
+        v-model="textInput"
+        clearable>
+      </el-input>
+      <el-button type="primary" class="btn"  @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="120" header-align="center">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="noticeDetail(scope)"
+            >
+              详情
+            </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="updateNotice(scope)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteNotice(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+
+
+
+
+<script>
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getNoticeList?apiId=359",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/rms/getNoticeList?apiId=359&con="+this.textInput;
+    },
+
+    toInsert() {
+      this.$router.push("/addNotice");
+
+    },
+
+    /*通知详情*/
+
+    noticeDetail(scope) {
+      console.log(scope.row.noticeId)
+      this.$router.push("/getNoticeById/"+scope.row.noticeId)
+
+    },
+
+    /*这里要改一改*/
+    updateNotice(scope){
+      console.log(scope.row.noticeId)
+      this.$router.push("/editNotice/"+scope.row.noticeId)
+    },
+    deleteNotice(scope){
+      console.log(scope)
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          console.log("enter")
+          this.axios
+            .post("/api/v1/rms/deleteNotice/" + scope.row.noticeId)
+            .then((res) => {
+              console.log("res.data.code",res.data.code);
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+  },
+
+}
+
+</script>
+
+<style lang="scss" scode>
+.notice{
+  .sache{
+    height: 80px;
+    display: flex;
+    align-items: center;
+    padding-left: 30px;
+  }
+}
+</style>

src/views/RMS/components/rawWarehouse.vue

@@ -21,7 +21,7 @@
             <el-button
               type="text"
               size="small"
-              @click="updateWarehouse(scope.row.warehouseId)"
+              @click="updateWarehouse(scope)"
             >
               修改
             </el-button>
@@ -58,9 +58,9 @@ export default {
       this.$router.push("/addRawWarehouse");
 
     },
-    updateWarehouse(warehouseId){
-      // console.log(scope.row.warehouseId)
-      this.$router.push("/editRawWarehouse/" +warehouseId)
+    updateWarehouse(scope){
+       console.log(scope.row.warehouseId)
+      this.$router.push("/editRawWarehouse/" +scope.row.warehouseId)
     },
     deleteWarehouse(scope){
       this.$confirm("是否删除", "提示", {