合并冲突

build/utils.js

@@ -12,14 +12,12 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 // 指定开发模式下需要加载的模块（可以做到只加载当前模块，提高开发效率）
 // index模块（登录）为必须，all 为所有
-//   index    销售    采购     规范          质量          生产      车间
-// ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
-//    物流         进程     成本   报表          基础配置        系统配置
-//  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
-// let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
-// let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
+//   登录     销售      采购     合同        首页      内转       排队
+// ['index', 'sales', 'TMS', 'appoint', 'homepage', 'inward', 'queue',
+//       统计报表         仓储          其他物资    资源管理
+//  'statisticalReport', 'WMS', 'SporadicManage','RMS']
 let devModules = ['all'];
-// let devModules = ['index','inward','appoint','sale']
+// let devModules = ['index','TMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

@@ -62,13 +62,6 @@ let proxyTable = {
       "^/api/v1": "/api/v1"
     }
   },
-  // "/views/api/v1": {
-  //   target: "http://192.168.1.115:8080",
-  //   ws: true,
-  //   pathRewrite: {
-  //     "^/api/v1": "/api/v1"
-  //   }
-  // },
   "/views/api/v1": {
     target: "http://172.16.33.166:8080",
     ws: true,

src/views/RMS/components/addCarDriver.vue

@@ -19,23 +19,61 @@
       </div>
     <div class="photoBox">
    <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"
-    >
-      <div>驾驶证
-      <el-button size="small" type="primary">点击上传</el-button>
-      <div slot="tip" class="el-upload__tip">
-      </div>
-      </div>
-    </el-upload> 
+  class="upload-demo"
+  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  list-type="picture">
+  <div>行驶证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
+     <div class="photoBox">
+   <el-upload
+  class="upload-demo"
+  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  list-type="picture">
+  <div>驾驶证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
     </div>
+
+      <div class="photoBox">
+   <el-upload
+  class="upload-demo"
+  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  list-type="picture">
+  <div>运输证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
+
+ <div class="photoBox">
+   <el-upload
+  class="upload-demo"
+  action="http://192.168.1.120:8080/api/v1/rms/rmscardriver/upload"
+  :on-preview="handlePreview"
+  :on-remove="handleRemove"
+  :file-list="fileList"
+  list-type="picture">
+  <div>从业资格证照片
+  <el-button size="small" type="primary">点击上传</el-button>
+  </div>
+</el-upload> 
+    </div>
+
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -58,12 +96,10 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      sex: "男",
+     
     };
   },
-  mounted() {
-     this.form1.driverSex = this.sex;	
-},
+  mounted() {},
   methods: {
     onInput() {
       this.axios.post(
@@ -97,23 +133,13 @@ export default {
       console.log(item)
     },
    
-
     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}？`);
-    },
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      },
+  
     makeSure() {
       console.log(this.form1);
       let reg = new RegExp(/^[0-9]*$/);
@@ -124,11 +150,7 @@ export default {
         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,
         state:this.state,
         carrierName:this.state,
         carrierIds: this.carrierIds,
@@ -147,7 +169,7 @@ export default {
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
         RmsCarDriver.carrierIds==null 
-     //   RmsCarDriver.carrierId==null 
+    
     )this.$message.error("存在空值！");
      else
       this.axios
@@ -196,7 +218,7 @@ export default {
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 0.1000rem;
+  margin-top: 1rem;
   margin-bottom: 0.25rem;
   margin-left: -18rem;
 }

src/views/RMS/components/addCarrier.vue

@@ -6,54 +6,17 @@
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="330" v-model="form1"></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>
     <el-upload
       class="upload-demo"
-      action="https://jsonplaceholder.typicode.com/posts/"
+      action="http://localhost:8060/api/v1/rms/rmscarrier/uploadCarrier"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :before-remove="beforeRemove"
-      multiple
-      :limit="1"
-      :on-exceed="handleExceed"
+      :on-success="handleAvatarSuccess"
       :file-list="fileList"
-    >
-      <el-button size="small" type="primary">点击上传</el-button>
-      <div slot="tip" class="el-upload__tip">
-        只能上传jpg/png文件，且不超过500kb
-      </div>
+      list-type="picture">
+      <el-button size="small" type="primary">点击上传照片</el-button>
+      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
     </el-upload>
-    <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> -->
 
     <div class="form-box f1">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -116,9 +79,20 @@ export default {
          registerDate:"",
          mapValue:""
       },
+      imageUrl:""
     };
   },
   methods: {
+    handleAvatarSuccess(res,file){
+      this.imageUrl=URL.createObjectURL(file.raw);
+    },
+    handleRemove(file,fileList){
+      console.log(file,fileList)
+    },
+    handlePreview(file) {
+      console.log("*********"+file);
+    },
+    
     onclick(){
       this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
     },
@@ -228,7 +202,9 @@ export default {
   justify-content: center;
   .el-form-item{
     display: flex;
+    width: 350px;
     justify-content: center;
+    
     .el-form-item__label{
       display: flex;
       align-items: center;
@@ -242,4 +218,19 @@ export default {
     }
   }
 }
+.upload-demo{
+  display: flex;
+  justify-content: center;
+  padding-bottom: 1.0rem;
+  .el-upload__tip{
+  display: flex;
+  justify-content: center;
+  }
+  .el-button el-button--primary el-button--small{
+  display: flex;
+  justify-content: center;
+  word-wrap:break-word;
+  }
+}
+
 </style>

src/views/RMS/components/addConsignee.vue

@@ -0,0 +1,105 @@
+<template>
+  <!-- 添加收货客户信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <el-divider content-position="left">收货客户信息</el-divider>
+     <div class="form-box" style="margin-right: 10rem">
+        <dil-form :formId="367" 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: {},
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+       console.log("enter11111111111111111111111")
+       console.log(this.form1)
+       let RmsConsignee={
+         companyName:this.form1.companyName,
+         consigneeAbbreviation:this.form1.consigneeAbbreviation,
+         consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
+         consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
+         consigneeContactName:this.form1.consigneeContactName,
+         consigneeContactTel:this.form1.consigneeContactTel,
+       };
+              console.log("RmsConsignee",RmsConsignee)
+       if(
+        RmsConsignee.companyName == null ||
+        RmsConsignee.consigneeAbbreviation==null ||
+        RmsConsignee. consigneeRegisteredAddress ==null ||
+        RmsConsignee.consigneeReceiveAddress == null ||
+        RmsConsignee.consigneeRegistrationTime == null ||
+        RmsConsignee.consigneeContactName == null ||
+        RmsConsignee.consigneeContactTel == null
+       )this.$message.error("存在空值！");
+       else
+         this.axios
+          .post(
+            "/api/v1/rms/insertConsignee",
+            RmsConsignee
+          )
+          .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' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/RMS/components/addPersonnel.vue

@@ -36,7 +36,8 @@ export default {
         personnelWorkshopid: this.form1.personnelWorkshopid,
         personnelShifts: this.form1.personnelShifts,
         personnelTeam:this.form1.personnelTeam,
-        departmentId: this.form1.shipperId
+        departmentId: this.form1.shipperId,
+        username:this.form1.username
       };
       if(
         RmsPersonnel.personnelJobNumber ==null ||
@@ -45,7 +46,8 @@ export default {
         RmsPersonnel.personnelWorkshopid==null ||
         RmsPersonnel.personnelShifts==null ||
         RmsPersonnel.departmentId==null ||
-        RmsPersonnel.personnelTeam==null
+        RmsPersonnel.personnelTeam==null||
+        RmsPersonnel.username==null
       )this.$message.error("存在空值！");
       else
       

src/views/RMS/components/addRawWarehouse.vue

@@ -31,7 +31,7 @@ export default {
        console.log(this.from1)
        let RmsWarehouse = {
          warehouseName:this.form1.warehouseName,
-         shipperId:this.form1.shipperId 
+         shipperId:this.form1.shipperId,
        };
        if(
          RmsWarehouse.warehouseName==null ||

src/views/RMS/components/addRmsShipper.vue

@@ -4,6 +4,7 @@
     <PageTitle>返回</PageTitle>
     <el-divider content-position="left">托运人信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
+       <!-- 323 -->
         <dil-form :formId="323" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
@@ -22,20 +23,29 @@ export default {
     return {
       form1: {},
       value: undefined,
+      shipperName:"四川达钢",
+      shipperAbbreviation:"四川达钢"
     };
   },
-  mounted() {},
+  mounted() {
+    this.form1.shipperName = this.shipperName;
+    this.form1.shipperAbbreviation = this.shipperAbbreviation;
+  },
   methods: {
      makeSure() {
        console.log(this.form1)
        let RmsShipper={
         shipperName: this.form1.shipperName,
         shipperAbbreviation: this.form1.shipperAbbreviation,
-        shipperId:this.form1.shipperId
+        shipperId:this.form1.shipperId,
+        shipperCompanyBranch:this.form1.shipperCompanyBranch,
+        shipperBranchFactory:this.form1.shipperBranchFactory
       };
       if(
         RmsShipper.shipperName==null ||
-        RmsShipper.shipperAbbreviation ==null 
+        RmsShipper.shipperAbbreviation ==null ||
+        RmsShipper.shipperCompanyBranch ==null ||
+        RmsShipper.shipperBranchFactory ==null
       )this.$message.error("存在空值！");
       else
       this.axios

src/views/RMS/components/addSupplier.vue

@@ -94,6 +94,7 @@ export default {
           width: 250px;
         }
       }
+
     }
   }
 }

src/views/RMS/components/consignee.vue

@@ -1,14 +1,41 @@
 <template>
   <!-- 客户收货信息页面 -->
-  <div class="steel_inbound">
+   <div class="steel_inbound">
     <div class="sache">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        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="option">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="updateConsignee(scope.row.consigneeId)"
+            >
+              修改
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="deleteConsignee(scope)"
+            >
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
     </div>
-    <dilTable v-bind.sync="option">
-    </dilTable>
   </div>
 </template>
 
@@ -31,6 +58,45 @@ export default {
     onclick() {
       this.option.requestUrl = "/api/v1/rms/getConsigneeList?apiId=407&con=" + this.input;
     },
+    toInsert() {
+      this.$router.push("/addConsignee");
+
+    },
+    updateConsignee(consigneeId){
+      this.$router.push("/editConsignee/" + consigneeId)
+    },
+    deleteConsignee(scope){
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteConsignee/" + scope.row.consigneeId)
+            .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: "删除操作已取消!",
+          });
+        });
+    },
   },
 };
 </script>

src/views/RMS/components/editConsignee.vue

@@ -0,0 +1,112 @@
+<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="368" 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() {
+      //编辑 
+console.log(this.$route.params)            
+
+      this.axios
+        .post(
+          "/api/v1/rms/getConsigneeById/" +
+            this.$route.params.consigneeId
+        )
+
+        .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.consigneeId);
+          });
+        });
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+      console.log(this.form1)
+       let RmsConsignee={
+         consigneeId:this.form1.consigneeId,
+         companyName:this.form1.companyName,
+         consigneeAbbreviation:this.form1.consigneeAbbreviation,
+         consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
+         consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
+         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeContactName:this.form1.consigneeContactName,
+         consigneeContactTel:this.form1.consigneeContactTel,
+       };
+       if(
+        RmsConsignee.consigneeId == null ||
+        RmsConsignee.companyName == null ||
+        RmsConsignee.consigneeAbbreviation==null ||
+        RmsConsignee. consigneeRegisteredAddress ==null ||
+        RmsConsignee.consigneeReceiveAddress == null ||
+        RmsConsignee.consigneeRegistrationTime == null ||
+        RmsConsignee.consigneeContactName == null ||
+        RmsConsignee.consigneeContactTel == null
+       )this.$message.error("存在空值！");
+        console.log( this.$route.params.consigneeId);
+        this.axios
+          .post(
+            "/api/v1/rms/updateConsignee",
+           RmsConsignee
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/RMS/components/editGatepost.vue

@@ -242,7 +242,7 @@ export default {
     text-align: center;
     align-items: center;
     justify-content: center;
-    margin-left: 34rem;
+    margin-left: 28.4rem;
     width: 300px;
   }
   .form {
@@ -273,6 +273,9 @@ export default {
           width: 250px;
         }
       }
+      .el-checkbox-group{
+        margin-right: 5rem;
+      }
     }
   }
 }
@@ -285,11 +288,12 @@ export default {
   margin-left: -4rem;
 }
 .drawerBox{
-  margin-top: 2.5rem;
-  margin-left: 40rem;
+  margin-top: 1.0rem;
+  margin-left: 35rem;
 }
 .btn2{
-  margin-top: 2.5rem;
-  margin-left: 40rem;
+  margin-left: 35rem;
+  margin-bottom: 0.25rem;
 }
+
 </style>

src/views/RMS/components/editRawWarehouse.vue

@@ -58,7 +58,8 @@ export default {
       console.log(this.form1)
        let RmsWarehouse={
       warehouseId:this.$route.params.warehouseId,
-      warehouseName:this.form1.warehouseName
+      warehouseName:this.form1.warehouseName,
+      shipperId:this.form1.shipperId,
     };
     if(
          warehouseName==null

src/views/RMS/components/editRmsShipper.vue

@@ -14,8 +14,8 @@
     </div>
 
     <div class="button-box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
 </template>
@@ -28,11 +28,14 @@ export default {
   data() {
     return {
       form1: {},
+      shipperName:"四川达钢",
+      shipperAbbreviation:"四川达钢"
     };
   },
  
   mounted() {
-      console.log(this.$route)
+    this.form1.shipperName = this.shipperName;
+    this.form1.shipperAbbreviation = this.shipperAbbreviation;
     this.information();
   },
   methods: {
@@ -63,11 +66,15 @@ export default {
        let RmsShipper={
         shipperId:this.form1.shipperId,
         shipperName: this.form1.shipperName,
-        shipperAbbreviation: this.form1.shipperAbbreviation
+        shipperAbbreviation: this.form1.shipperAbbreviation,
+        shipperCompanyBranch:this.form1.shipperCompanyBranch,
+        shipperBranchFactory:this.form1.shipperBranchFactory
       };
       if(
         RmsShipper.shipperName==null ||
-        RmsShipper.shipperAbbreviation ==null 
+        RmsShipper.shipperAbbreviation ==null ||
+        RmsShipper.shipperCompanyBranch ==null ||
+        RmsShipper.shipperBranchFactory ==null
       )this.$message.error("存在空值！");
         this.axios
           .post(
@@ -93,4 +100,9 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.button-box{
+  display: flex;
+  justify-items: center;
+  margin-left: 0rem;
+}
 </style>

src/views/RMS/router/index.js

@@ -8,6 +8,7 @@ import main from '@/components/main.vue'
 import addCapacity from '../components/addCapacity.vue'
 import addCarDriver from '../components/addCarDriver.vue'
 import addCarrier from '../components/addCarrier.vue'
+import addConsignee from '../components/addConsignee.vue'
 import addGatepost from '../components/addGatepost.vue'
 import addMaterial from '../components/addMaterial.vue'
 import addOilPrice from '../components/addOilPrice.vue'
@@ -27,6 +28,7 @@ import carrier from '../components/carrier.vue'
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
 import editCarrier from '../components/editCarrier.vue'
+import editConsignee from '../components/editConsignee.vue'
 import editGatepost from '../components/editGatepost.vue'
 import editMaterial from '../components/editMaterial.vue'
 import editOilPrice from '../components/editOilPrice.vue'
@@ -65,6 +67,7 @@ const constantRouterMap = [
 		{path: 'addCapacity', name: 'addCapacity', meta: {code: 'xtpzgl-jggl'}, component: addCapacity},
 		{path: 'addCarDriver', name: 'addCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: addCarDriver},
 		{path: 'addCarrier', name: 'addCarrier', meta: {code: 'xtpzgl-yhgl'}, component: addCarrier},
+		{path: 'addConsignee',name: 'addConsignee',meta: {code:'xtpzgl-yhgl'},component: addConsignee},
 		{path: 'addGatepost', name: 'addGatepost', meta: {code: 'xtpzgl-yhgl'}, component: addGatepost},
 		{path: 'addMaterial', name: 'addMaterial', meta: {code: 'xtpzgl-yhgl'}, component: addMaterial},
 		{path: 'addOilPrice', name: 'addOilPrice', meta: {code: 'xtpzgl-yhgl'}, component: addOilPrice},
@@ -83,6 +86,7 @@ const constantRouterMap = [
 		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
+		{path: 'editConsignee/:consigneeId',name: 'editConsignee',meta:{code: 'xtpzgl-yhgl'},component: editConsignee},
 		{path: 'editGatepost/:gatepostId', name: 'editGatepost', meta: {code: 'xtpzgl-yhgl'}, component: editGatepost},
 		{path: 'editMaterial/:materialId', name: 'editMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editMaterial},
 		{path: 'editOilPrice/:priceId', name: 'editOilPrice', meta: {code: 'xtpzgl-yhgl'}, component: editOilPrice},

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue

@@ -1,137 +1,43 @@
 //进厂
-// 零星物资进厂
 <template>
-  <div class="enFactory">
-    <div class="enFactory_top">
+  <!-- 零星物资进厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="enFactory_bottom">
-      <dilTable v-bind.sync="option" ref="table">
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button @click="detailclick(scope.row)" type="text">
-              物资详情
-            </el-button>
-          </template>
-        </el-table-column>
-        <!-- 物资详情 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData">
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-      </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=13",
       },
-      //物资信息的数据
-      tableData: [],
-      //物资信息的表头
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 200,
-        },
-        {
-          prop: "materialModel",
-          label: "规格型号",
-          width: 200,
-        },
-        {
-          prop: "weightNum",
-          label: "物资数量",
-          width: 200,
-        },
-      ],
-      //记录旧的row对象
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
-      oldRowCount: 1,
     };
   },
   methods: {
-    // 查看物资详情
-    detailclick(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.materialDetails(row.orderId);
-    },
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" + this.input;
-    },
-    //查看当前订单的物资信息
-    materialDetails(orderId) {
-      this.$axios
-        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.tableData = res.data.data;
-          }
-        });
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.enFactory {
-  .enFactory_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/grossWeight.vue

@@ -1,52 +1,43 @@
-//毛重
-//毛重
+//计毛
 <template>
-  <div class="grossWeight">
-    <div class="grossWeight_top">
+  <!-- 零星物资计毛作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="grossWeight_bottom">
-      <dilTable v-bind.sync="option">
-      </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl:
-          "",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12",
       },
     };
   },
   methods: {
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.grossWeight {
-  .grossWeight_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue

@@ -1,52 +1,43 @@
-//装货
-//装货
+//卸货
 <template>
-  <div class="load">
-    <div class="load_top">
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <div class="homeworkPath">
+   <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
-    <div class="load_bottom">
-      <dilTable v-bind.sync="option">
-      </dilTable>
-    </div>
+    <dilTable v-bind.sync="option"></dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
+      restaurants: [],
       input: "",
       option: {
-        requestUrl:
-          "",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
       },
     };
   },
   methods: {
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
     },
-  },
+   }
 };
 </script>
-
-<style lang="scss">
-.load {
-  .load_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue

@@ -1,137 +1,43 @@
 //出厂
-// 零星物资出厂
 <template>
-  <div class="outFactory">
-    <div class="outFactory_top">
+  <!-- 零星物资出厂作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="outFactory_bottom">
-      <dilTable v-bind.sync="option" ref="table">
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button @click="detailclick(scope.row)" type="text">
-              物资详情
-            </el-button>
-          </template>
-        </el-table-column>
-        <!-- 物资详情 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData">
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-      </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12",
       },
-      //物资信息的数据
-      tableData: [],
-      //物资信息的表头
-      tableHead: [
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: 200,
-        },
-        {
-          prop: "materialModel",
-          label: "规格型号",
-          width: 200,
-        },
-        {
-          prop: "weightNum",
-          label: "物资数量",
-          width: 200,
-        },
-      ],
-      //记录旧的row对象
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
-      oldRowCount: 1,
     };
   },
   methods: {
-    // 查看物资详情
-    detailclick(row) {
-      // 记录重复点击次数
-      if (this.oldRow === row) {
-        this.oldRowCount += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow != "") {
-        if (this.oldRow != row) {
-          if (this.oldRowCount % 2 === 1) {
-            this.$refs.table.toggleRowExpansion(this.oldRow);
-          } else {
-            this.oldRowCount = 1;
-          }
-        } else {
-          this.oldRow = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow = row;
-      this.materialDetails(row.orderId);
-    },
-    //框计算
     onclick() {
-      this.option.requestUrl =
-        "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" + this.input;
-    },
-    //查看当前订单的物资信息
-    materialDetails(orderId) {
-      this.$axios
-        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
-        .then((res) => {
-          if (res.data.code == "200") {
-            this.tableData = res.data.data;
-          }
-        });
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.outFactory {
-  .outFactory_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/tareWeight.vue

@@ -1,49 +1,43 @@
 //计皮
-//计皮
 <template>
-  <div class="tareWeight">
-    <div class="tareWeight_top">
+  <!-- 零星物资计皮作业页面 -->
+  <div class="homeworkPath">
+    <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
-    <div class="tareWeight_bottom">
-      <dilTable v-bind.sync="option"> </dilTable>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
     </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
   </div>
 </template>
 
 <script>
 export default {
+  name: "homeworkPath",
   data() {
     return {
-      //输入框的值
       input: "",
       option: {
-        requestUrl: "",
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
       },
     };
   },
   methods: {
-    //框计算
     onclick() {
-      this.option.requestUrl = "&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
     },
   },
 };
 </script>
-
-<style lang="scss">
-.tareWeight {
-  .tareWeight_top {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
     .el-input{
-        width: 20%;
+      width: 20%;
     }
   }
 }

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -13,11 +13,6 @@
       <el-input v-model="receiveName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
-    <div class="forwardingUnit from">
-      <span class="text">卸货点：</span>
-      <el-input v-model="unloadPointName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
-    </div>
     <div class="orderType from">
       <span class="text">流向：</span>
       <el-select v-model="orderType" placeholder="请选择">
@@ -103,6 +98,13 @@
           <!-- 插入输入框 -->
           <template slot-scope="scope">
             <template v-if="item.slot">
+                <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                ></el-input>
+              </template
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderMaterialNumber'">
                 <el-input
@@ -116,13 +118,7 @@
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
-              <!-- 装卸货优先级 -->
-               <template v-if="item.prop == 'materialPriority'">
-                <el-input
-                  class="textinput"
-                  v-model.number="scope.row.materialPriority"
-                ></el-input>
-              </template>
+            
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -470,7 +466,8 @@ export default {
       this.unloadPointName = selection.warehouseName;
     },
     currentRadioChange5(selection) {
-      this.lineName = selection.lineName;
+      console.log(selection)
+      this.lineName = selection.lineName+selection.lineDesk 
       this.lineId = selection.lineId;
     },
     currentRadioChange3(selection) {

src/views/TMS/router/index.js

@@ -67,7 +67,7 @@ import wagonLoadEmergency from '../components/importedEmergency/wagonLoadEmergen
 //wagonUnLoad存在重复
 import wagonUnLoadEmergency from '../components/importedEmergency/wagonUnLoadEmergency.vue'
 
-import transportReserveFuAdd from '../components/importedFuel/transportReserveFuAdd.vue'
+import transportReserveFuAdd from '../components/importedIngredients/transportReserveFuAdd.vue'
 import transportReserveRan from '../components/importedFuel/transportReserveRan.vue'
 import transportReserveRanAdd from '../components/importedFuel/transportReserveRanAdd.vue'
 import transportReserveRanEdit from '../components/importedFuel/transportReserveRanEdit.vue'

src/views/inward/components/truckAppoint/addRequirement.vue

@@ -23,6 +23,26 @@
           </el-form-item>
         </el-form>
       </div>
+      <div class="form-box f2">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="发货单位">
+            <el-input v-model="supplierName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" disabled>发货单位</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="form-box f2">
+        <el-form :inline="true" class="demo-form-inline">
+          <el-form-item label="收货单位">
+            <el-input v-model="shipperName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" disabled>收货单位</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="form-box f4">
         <el-form :inline="true" class="demo-form-inline">
           <el-form-item label="物资名称">
@@ -35,7 +55,7 @@
       </div>
       <div class="form-box f5">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="用车地点">
+          <el-form-item label="装车点">
             <el-input v-model="truckPoint" disabled> </el-input>
           </el-form-item>
           <el-form-item>
@@ -45,7 +65,7 @@
       </div>
       <div class="form-box f5">
         <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="卸货地点">
+          <el-form-item label="卸车点">
             <el-input v-model="truckPoint1" disabled> </el-input>
           </el-form-item>
           <el-form-item>
@@ -53,16 +73,6 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box f5">
-        <el-form :inline="true" class="demo-form-inline">
-          <el-form-item label="装货月台">
-            <el-input v-model="requirementPlatformName" disabled> </el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
       <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
@@ -127,15 +137,16 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      purchaseOrder: "",
-      foreignShipName: "",
-      materialName: "",
+      purchaseOrder: null,
+      foreignShipName: null,
+      materialName:null,
+      shipperName:null,
+      supplierName:null,
       a: 1,
       direction: "rtl",
       input: "",
-      truckPoint: "",
-      truckPoint1:'',
-      requirementPlatformName: "",
+      truckPoint: null,
+      truckPoint1:null,
       drawer: false,
       form: {},
       second: {
@@ -183,22 +194,37 @@ export default {
       this.mapList1 = selection
       this.purchaseOrder = this.mapList1.purchaseOrderNo
       this.foreignShipName = this.mapList1.resultForeignShipName
+      this.supplierName = this.mapList1.supplierName
+      this.shipperName = this.mapList1.shipperName
       this.materialName = this.mapList1.materialName;
     },
     currentRadioChange2(selection) {
       this.mapList2 = selection
-      this.truckPoint = this.mapList2.wareHouseName;
+      console.log(this.mapList2)
+      var s1 = "";
+      this.truckPoint= s1.concat(this.mapList2.companyBranchName,this.mapList2.companyBranchName,this.mapList2.wareHouseName)
+       this.mapList2.companyBranchName+' '+this.mapList2.companyBranchName+this.mapList2.wareHouseName
     },
     currentRadioChange3(selection) {
       this.mapList3 = selection
-      this.truckPoint1 = this.mapList3.wareHouseName;
+      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.companyBranchName+this.mapList3.wareHouseName
     },
-    currentRadioChange4(selection) {
-      this.mapList4 = selection
-      this.requirementPlatformName = this.mapList4.wareHouseName;
     },
     // 新增
     makeSure() {
+      console.log(this.form.materialNumber)
+      console.log(this.form.materialWeight);
+      console.log(typeof(this.form.materialNumber));
+      if(this.purchaseOrder == null){
+          this.$alert('没有选择采购订单，请点击浏览选择采购订单')         
+      }else if(this.truckPoint == null){
+          this.$alert('没有选择用车地点，请点击浏览选择用车地点')
+      }else if(this.truckPoint1 == null){
+          this.$alert('没有选择卸货点，请点击浏览选择卸货点')
+      }
+      // }else if(typeof(this.form.materialNumber) =="undefined"&typeof(this.form.materialWeight) =="undefined"){
+      //     this.$alert('请输入物资数量或者物资重量')
+      // }
       let requiremnet = {
         purchaseOrderId: this.mapList1.purchaseOrderId,
         requiremntUnitId: this.mapList2.wareHouseId,
@@ -213,8 +239,7 @@ export default {
         requirementWorkContent: this.form.requirementWorkContent,
         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
         requirementWorkType: this.form.requirementWorkType,
-        requirementUnloadUnitId:this.mapList3.wareHouseId,
-        requirementPlatformId: this.mapList4.wareHouseId
+        requirementUnloadUnitId:this.mapList3.wareHouseId
       };
       console.log(requiremnet);
       this.axios
@@ -235,7 +260,7 @@ export default {
     cancel() {
       this.$router.go(-1);
     },
-  },
+  
 };
 </script>