修改合并冲突

src/components/DilCommonUI/packages/form/src/form-item.vue

@@ -168,4 +168,5 @@ export default {
 };
 </script>
 
-<style></style>
+<style>
+</style>

src/views/RMS/components/addCapacity.vue

@@ -2,22 +2,23 @@
   <!-- 添加运力信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">运力信息</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
+
+     <div class="form_box" style="margin-right: 10rem">
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
       <div class="inputBox">
     <span class="text">所属单位类型</span>
       <el-autocomplete
+        class="input"
         v-model="state"
         @input="onInput"
         :fetch-suggestions="querySearch"
-        placeholder="请输入内容"
+        placeholder="边输入边查询"
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
-      </div>
-    <div class="button-box">
+    </div>
+    <div class="button_box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -33,7 +34,7 @@ export default {
     return {
       form1: {},
       // value: undefined,
-     carrierIds:"",
+      carrierIds: "",
       state: "",
       restaurants: [],
     };
@@ -73,10 +74,11 @@ export default {
     },
    
      makeSure() {
-       console.log(this.from1)
+      //  console.log(this.form1)
        let RmsCapacity={
          capacityTypeId:this.form1.capacityTypeId,
          capacityNumber:this.form1.capacityNumber.toUpperCase(),
+         number:this.capacityNumber,
          capacityCorlor:this.form1.capacityCorlor,
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
@@ -86,6 +88,7 @@ export default {
         carrierName:this.state,
         carrierIds: this.carrierIds,
        };
+      //  console.log("RmsCapacity",RmsCapacity)
        if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||
@@ -95,25 +98,81 @@ export default {
          RmsCapacity.carrierIds==null
        )this.$message.error("存在空值！");
        else
-      this.axios
-        .post(
-          "/api/v1/rms/insertCapacity", RmsCapacity
-        )
+        this.axios
+        .post("/api/v1/rms/getCarrierName?state=" + this.state)
         .then((res) => {
-          console.log("res.data.code",res.data.code);
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
+          if (res.data.code == "200") {
+            res.data.data.forEach((element) => {
+              this.restaurants.push({
+                value: element.carrierName,
+                carrierIds: element.carrierId,
+              });
             });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
           }
-          // this.$refs['table'].resetField();
         });
     },
+    querySearch(queryString, cb) {
+      var restaurants = this.restaurants;
+      var results = queryString
+        ? restaurants.filter(this.createFilter(queryString))
+        : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (
+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
+          0
+        );
+      };
+    },
+    handleSelect(item) {
+      this.carrierIds = item.carrierIds;
+      console.log(item);
+    },
+
+    makeSure() {
+      console.log(this.from1);
+      let RmsCapacity = {
+        capacityTypeId: this.form1.capacityTypeId,
+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
+        capacityCorlor: this.form1.capacityCorlor,
+        capacityOwneris: this.form1.capacityOwneris,
+        capacityVip: this.form1.capacityVip,
+        capacityBlacklist: this.form1.capacityBlacklist,
+        // carrierId:this.form1.carrierId,
+        state: this.state,
+        carrierName: this.state,
+        carrierIds: this.carrierIds,
+      };
+      if (
+        RmsCapacity.capacityNumber == null ||
+        RmsCapacity.capacityCorlor == null ||
+        RmsCapacity.capacityOwneris == null ||
+        RmsCapacity.capacityVip == null ||
+        RmsCapacity.capacityBlacklist == null ||
+        RmsCapacity.carrierIds == null
+      )
+        this.$message.error("存在空值！");
+      else
+        this.axios
+          .post("/api/v1/rms/insertCapacity", RmsCapacity)
+          .then((res) => {
+            console.log("res.data.code", res.data.code);
+            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);
@@ -122,39 +181,49 @@ export default {
 };
 </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;
-}
-.inputBox{
-     display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.1000rem;
-  margin-bottom: 0.25rem;
-  margin-left: -12rem;
-}
-.form-box{
-  display: flex;
-  justify-content: center;
-  .el-form-item{
+.addWagonLoad {
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
     display: flex;
     justify-content: center;
-    .el-form-item__label{
+    .el-form-item{
+      display: flex;
+      justify-content: center;
+      .el-form-item__label{
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content{
+         .el-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+    }
+  }
+  .inputBox{
+    display: flex;
+    justify-content: center;
+    margin-bottom: 30px;
+    .text{
+      text-align: right;
       display: flex;
       align-items: center;
+      margin-right: 5px;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
-        }
-      }
+    .input{
+      width: 250px;
+    }
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
     }
   }
 }

src/views/RMS/components/addCarDriver.vue

@@ -3,7 +3,7 @@
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
     <el-divider content-position="left">司机信息</el-divider>
-    <div class="form-box" style="margin-right: 10rem">
+    <div class="form_box" style="margin-right: 10rem">
       <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
     </div>
     <div class="inputBox">
@@ -12,20 +12,20 @@
         v-model="state"
         @input="onInput"
         :fetch-suggestions="querySearch"
-        placeholder="请输入内容"
+        placeholder="边输入边查询"
         :trigger-on-focus="false"
         @select="handleSelect"
       ></el-autocomplete>
       </div>
     <div class="photoBox">
    <el-upload
-  class="upload-demo"
-  action="http://localhost:8080/api/v1/rms/upload"
-  :on-preview="handlePreview"
-  :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess"
-  :file-list="fileList"
-  list-type="picture">
+    class="upload-demo"
+    action="http://localhost:8080/api/v1/rms/upload"
+    :on-preview="handlePreview"
+    :on-remove="handleRemove"
+    :on-success="handleAvatarSuccess1"
+    :file-list="fileList"
+    list-type="picture">
   <div>行驶证照片
   <el-button size="small" type="primary">点击上传</el-button>
   </div>
@@ -38,7 +38,7 @@
   action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess"
+  :on-success="handleAvatarSuccess2"
   :file-list="fileList"
   list-type="picture">
   <div>驾驶证照片
@@ -53,7 +53,7 @@
   action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess"
+  :on-success="handleAvatarSuccess3"
   :file-list="fileList"
   list-type="picture">
   <div>运输证照片
@@ -69,7 +69,7 @@
   action="http://localhost:8080/api/v1/rms/upload"
   :on-preview="handlePreview"
   :on-remove="handleRemove"
-  :on-success="handleAvatarSuccess"
+  :on-success="handleAvatarSuccess4"
   :file-list="fileList"
   list-type="picture">
   <div>从业资格证照片
@@ -78,7 +78,8 @@
 </el-upload> 
     </div>
 
-    <div class="button-box">
+    <div class="button_box">
+>>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
@@ -100,10 +101,16 @@ export default {
       fileList: [],
       carrierIds:"",
       state: "",
-      imageUrl:"",
+      imageUrl1:"",
+      imageUrl2:"",
+      imageUrl3:"",
+      imageUrl4:"",
+      imageUrls:[],
     };
   },
-  mounted() {},
+  mounted() {
+     this.form1.driverSex = this.sex;	
+},
   methods: {
     onInput() {
       this.axios.post(
@@ -136,16 +143,53 @@ export default {
       this.carrierIds=item.carrierIds;
       console.log(item)
     },
-    handleAvatarSuccess(res,file){
-      this.imageUrl=URL.createObjectURL(file.raw);
+      beforeUpload2 (file) {
+        const isLt2M = file.size < 1024 * 1024 * 0.5
+        console.log('大小' + isLt2M)
+        if (!isLt2M) {
+          this.$message.error('上传文件大小不能超过500kb!')
+        }
+        let size = file.size / 1024
+        console.log('大小' + size)
+        let _URL = window.URL || window.webkitURL
+        let img = new Image()
+        img.onload = function () {
+          let width = img.width
+          let height = img.height
+          console.log('width--->' + width)
+          console.log('height--->' + height)
+        }
+        img.src = _URL.createObjectURL(file)
+        return isLt2M
+    },
+    handleAvatarSuccess1(res,file){
+      this.imageUrl1=URL.createObjectURL(file.raw);
+    },
+    handleAvatarSuccess2(res,file){
+      this.imageUrl2=URL.createObjectURL(file.raw);
+    },
+    handleAvatarSuccess3(res,file){
+      this.imageUrl3=URL.createObjectURL(file.raw);
+    },
+    handleAvatarSuccess4(res,file){
+       this.imageUrl4=URL.createObjectURL(file.raw);
     },
     handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-      handlePreview(file) {
-        console.log(file);
-      },
-  
+      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 reg = new RegExp(/^[0-9]*$/);
@@ -156,7 +200,11 @@ 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,
@@ -175,7 +223,7 @@ export default {
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
         RmsCarDriver.carrierIds==null 
-    
+     //   RmsCarDriver.carrierId==null 
     )this.$message.error("存在空值！");
      else
       this.axios
@@ -191,7 +239,7 @@ export default {
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-          //this.$refs['table'].resetField();
+          this.$refs['table'].resetField();
         });
     },
     // 取消
@@ -202,50 +250,59 @@ export default {
 };
 </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;
-}
-.inputBox{
-     display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.1000rem;
-  margin-bottom: 0.25rem;
-  margin-left: -12.5rem;
-}
-.photoBox{
+.addWagonLoad {
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+    }
+  }
+  .photoBox{
    display: flex;
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 1rem;
+  margin-top: 0.1000rem;
   margin-bottom: 0.25rem;
-  margin-left: -18rem;
+ // margin-left: -18rem;
 }
-.form-box{
-  display:flex;
-  justify-content: center;
-  .el-form-item{
-    display:flex;
+  .inputBox{
+    display: flex;
     justify-content: center;
-    .el-form-item__label{
-      display:flex;
+    margin-bottom: 30px;
+    .text{
+      text-align: right;
+      display: flex;
       align-items: center;
+      margin-right: 5px;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width:250px;
-        }
-      }
+    .input{
+      width: 250px;
+    }
+  }
+  .button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
     }
   }
-  
 }
 </style>

src/views/RMS/components/addCarrier.vue

@@ -11,10 +11,10 @@
     </div>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess1"
       :file-list="fileList"
       :before-upload="beforeUpload2"
       list-type="picture"
@@ -26,14 +26,19 @@
     </el-upload>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess2"
       :file-list="fileList"
       :before-upload="beforeUpload2"
+<<<<<<< HEAD
       list-type="picture"
     >
+=======
+      :auto-upload="false"
+      list-type="picture">
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
       <el-button size="small" type="primary">点击上传经营许可证</el-button>
       <div slot="tip" class="el-upload__tip">
         只能上传jpg/png文件，且不超过500kb
@@ -41,14 +46,19 @@
     </el-upload>
     <el-upload
       class="upload-demo"
+      ref="upload"
       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess3"
       :file-list="fileList"
       :before-upload="beforeUpload2"
+<<<<<<< HEAD
       list-type="picture"
     >
+=======
+      :auto-upload="false"
+      list-type="picture">
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
       <el-button size="small" type="primary">点击上传营业执照</el-button>
       <div slot="tip" class="el-upload__tip">
         只能上传jpg/png文件，且不超过500kb
@@ -111,6 +121,7 @@ export default {
         // first请求数据的地址
         requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
         selectionType: "radio",
+<<<<<<< HEAD
         mapList: [],
         registerDate: "",
         mapValue: "",
@@ -164,6 +175,44 @@ export default {
     },
     handleRemove(file, fileList) {
       console.log(file, fileList);
+=======
+         mapList:[],
+         mapValue:""
+      },
+      // 图片上传地址
+      fileList:[]
+    };
+  },
+  methods: {
+    // onProgress(event, file, fileList){
+
+    //   console.log("event"+event)
+    //   console.log("file"+file)
+    //   console.log("fileList"+fileList)
+    // },
+    beforeUpload2 (file) {
+        console.log("file",file)
+        const isLt2M = file.size < 1024 * 1024 * 0.5
+        console.log('大小' + isLt2M)
+        if (!isLt2M) {
+          this.$message.error('上传文件大小不能超过 500kb!')
+        }
+        let size = file.size / 1024
+        console.log('大小' + size)
+        let _URL = window.URL || window.webkitURL
+        let img = new Image()
+        img.onload = function () {
+          let width = img.width
+          let height = img.height
+          console.log('width--->' + width)
+          console.log('height--->' + height)
+        }
+        img.src = _URL.createObjectURL(file)
+        return isLt2M
+    },
+    handleRemove(file,fileList){
+      console.log(file,fileList)
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
     },
     handlePreview(file) {
       console.log("*********" + file);
@@ -176,6 +225,7 @@ export default {
     currentRadioChange(selection) {
       (this.mapList = selection), (this.bidArea = this.mapList.bidArea);
     },
+<<<<<<< HEAD
     makeSure() {
       let reg = new RegExp(/^[0-9]*$/);
       let RmsCarrier = {
@@ -200,10 +250,38 @@ export default {
         carrierContactNumber: this.form1.carrierContactNumber,
         carrierType: this.form1.carrierType,
         carrierTransportType: this.form1.carrierTransportType,
+=======
+     makeSure() {
+      // console.log(this.$refs.upload.submit())
+      let reg=new RegExp(/^[0-9]*$/);
+      let RmsCarrier={
+        carrierName:this.form1.carrierName,
+        carrierTransportCertificate:this.form1.carrierTransportCertificate,
+        carrierBusinessLicense:this.form1.carrierBusinessLicense,
+        carrierBusinessAblelicense:this.form1.carrierBusinessAblelicense,
+        carrierAbbreviation:this.form1.carrierAbbreviation,
+        carrierAddress:this.form1.carrierAddress,
+        registerNo:this.form1.registerNo,
+        carrierBidAreaId:this.mapList.bidAreaId,
+        carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
+        registerCapital:this.form1.registerCapital,
+        businessScope:this.form1.businessScope,
+        annualDate:this.form1.annualDate,
+        companyStatusDesc:this.form1.companyStatusDesc,
+        companyTypeDesc:this.form1.companyTypeDesc,
+        operationPeriod:this.form1.operationPeriod,
+        registerOrganization:this.form1.registerOrganization,
+        registerAptitudes:this.form1.registerAptitudes,
+        contactsName:this.form1.contactsName,
+        carrierContactNumber:this.form1.carrierContactNumber,
+        carrierType:this.form1.carrierType,
+        carrierTransportType:this.form1.carrierTransportType
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
       };
       let registerDate = {
         registerDate: this.form1.registerDate,
       };
+<<<<<<< HEAD
       let imageUrls = {
         imageUrl1: this.imageUrl1,
         imageUrl1: this.imageUrl2,
@@ -214,6 +292,12 @@ export default {
         RmsCarrier: RmsCarrier,
         registerDate: registerDate,
         imageUrls: imageUrls,
+=======
+      console.log("fileList"+this.fileList)
+      let mapValue={
+        RmsCarrier:RmsCarrier,
+        registerDate:registerDate
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
       };
       if (reg.test(RmsCarrier.carrierContactNumber) == false)
         this.$message.error("输入的格式不正确");
@@ -223,6 +307,7 @@ export default {
         // imageUrls.imageUrl2 ==null ||
         // imageUrls.imageUrl3 ==null ||
 
+<<<<<<< HEAD
         RmsCarrier.carrierAbbreviation == null ||
         RmsCarrier.carrierAddress == null ||
         RmsCarrier.registerNo == null ||
@@ -257,6 +342,54 @@ export default {
           }
           this.$refs["table"].resetField();
         });
+=======
+          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 ||
+          registerDate.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",
+            mapValue
+            
+          )
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              this.$refs.upload.submit();
+              // this.$refs.table.refreshData();
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败,可能存在重复！");
+            }
+            this.$refs['table'].resetField();
+          });
+          
+      },
+      // // 取消
+      cancel() {
+        this.$router.go(-1);
+      },
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
     },
     // // 取消
     cancel() {
@@ -266,6 +399,7 @@ export default {
 };
 </script>
 <style lang='scss' >
+<<<<<<< HEAD
 .button-box {
   display: flex;
   text-align: center;
@@ -278,9 +412,12 @@ export default {
   display: flex;
   justify-content: center;
   .el-form-item {
+=======
+ .button-box{
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
     display: flex;
-    width: 350px;
     justify-content: center;
+<<<<<<< HEAD
 
     .el-form-item__label {
       display: flex;
@@ -296,6 +433,43 @@ export default {
   }
 }
 .upload-demo {
+=======
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+  .form-box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+      .el-radio{
+        width: 25px;
+      }
+    }
+  }
+.upload-demo{
+  display: flex;
+  justify-content: center;
+  padding-bottom: 1.0rem;
+  .el-upload__tip{
+>>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
   display: flex;
   justify-content: center;
   padding-bottom: 1rem;

src/views/RMS/components/addConsignee.vue

@@ -2,7 +2,6 @@
   <!-- 添加收货客户信息 -->
   <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>
@@ -76,31 +75,34 @@ export default {
 };
 </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{
+  .button-box{
     display: flex;
     justify-content: center;
-    .el-form-item__label{
-      display: flex;
-      align-items: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
-          width: 250px;
-        }
+  }
+.form-box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
       }
     }
   }
-}
 </style>

src/views/RMS/components/addGatepost.vue

@@ -2,7 +2,6 @@
   <!-- 添加门岗信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">门岗信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
        <!-- 287 -->
         <dil-form :formId="328" v-model="form1" ref="from1">
@@ -85,14 +84,14 @@ export default {
 
 </style>
 <style lang='scss' >
-.button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .btn-left {
   margin-left: 470px;
 }

src/views/RMS/components/addMaterial.vue

@@ -2,7 +2,6 @@
   <!-- 添加物资信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">物资信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
 
@@ -123,22 +122,21 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .disableBox{
   display: flex;
   text-align: center;
   align-items: center;
   justify-content: center;
-  margin-top: 3rem;
+  margin-top: 1.5rem;
   margin-bottom: 1.25rem;
-  margin-left: -23rem;
 }
 .btn-left {
   margin-left: 470px;
@@ -146,27 +144,6 @@ export default {
 .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,

src/views/RMS/components/addNotice.vue

@@ -3,7 +3,6 @@
   <!-- 添加公告信息 -->
   <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>
@@ -69,12 +68,12 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/addOilPrice.vue

@@ -2,7 +2,6 @@
   <!-- 添加油价信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">油价信息</el-divider>
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="357" v-model="form1" ref="from1"></dil-form>
     </div>
@@ -66,14 +65,14 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addPersonnel.vue

@@ -2,7 +2,6 @@
   <!-- 添加人员信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">人员信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="325" v-model="form1" ref="from1"></dil-form>
       </div>
@@ -36,8 +35,12 @@ 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
       };
+      let userName={
+
+      }
       if(
         RmsPersonnel.personnelJobNumber ==null ||
         RmsPersonnel.personnelName ==null ||
@@ -49,6 +52,9 @@ export default {
       )this.$message.error("存在空值！");
       else
       this.axios
+        .post(
+
+        )
         .post(
           "/api/v1/rms/insertPersonnel",
            RmsPersonnel
@@ -75,14 +81,14 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addPier.vue

@@ -82,4 +82,12 @@ export default {
     }
   }
 }
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/addPort.vue

@@ -65,14 +65,14 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addPortStorageYard.vue

@@ -67,12 +67,12 @@ export default {
   display: flex;
 }
 .form-box,
-.button-box{
+ .button-box{
     display: flex;
-    text-align: center;
-    align-items: center;
     justify-content: center;
-    margin-top: 0.3125rem;
-    margin-bottom: 1.25rem;
-}
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/addRawWarehouse.vue

@@ -2,7 +2,6 @@
   <!-- 添加原料仓库信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">原料仓库信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="315" v-model="form1" ref="from1"></dil-form>
       </div>
@@ -64,14 +63,14 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addRmsShipper.vue

@@ -2,7 +2,6 @@
   <!-- 添加托运人信息 -->
   <div class="addWagonLoad">
     <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>
@@ -76,14 +75,14 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addSupplier.vue

@@ -2,7 +2,6 @@
   <!-- 添加供应商信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">原料供应商信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="320" v-model="form1" ref="from1"></dil-form>
       </div>
@@ -31,7 +30,7 @@ export default {
       let RmsSupplier = {
         supplierName: this.form1.supplierName,
         supplierAddress: this.form1.supplierAddress,
-        supplierRegisterDate: sjTime(this.form1.supplierRegisterDate),
+        supplierRegisterDate: this.form1.supplierRegisterDate,
         supplierContactsName: this.form1.supplierContactsName,
         supplierContactNumber: this.form1.supplierContactNumber
       };
@@ -70,14 +69,14 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .form-box{
   display: flex;
   justify-content: center;

src/views/RMS/components/addTruckCalculate.vue

@@ -2,7 +2,6 @@
   <!-- 添加汽车衡信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">汽车衡信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="317" v-model="form1" ref="from1">
         </dil-form>
@@ -115,21 +114,25 @@ export default {
 };
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .inputBox{
   display: flex;
   text-align: center;
   align-items: center;
-  justify-content: center;
    margin-top: 2rem;
-  width: 400px;
+   width: 800px;
+  .el-input__inner{
+    display: flex;
+  text-align: center;
+  align-items: center;
+  }
 }
 .btn-left {
   margin-left: 470px;

src/views/RMS/components/editCapacity.vue

@@ -1,23 +1,21 @@
 <template>
   <!-- 修改运力信息 -->
+<div class="addWagonLoad">
   <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">
+      <div class="form_box" style="margin-right: 10rem">
           <dil-form :formId="310" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
-
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
+</div>
 </template>
 
 <script>
@@ -97,13 +95,34 @@ console.log(this.$route.params)
 };
 </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;
-}
+ .form_box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+    }
+ }
+ .button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+ }
 </style>

src/views/RMS/components/editCarDriver.vue

@@ -3,19 +3,15 @@
   <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">
+      <div class="form_box">
           <dil-form :formId="340" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
-
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>
@@ -97,13 +93,48 @@ export default {
 };
 </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;
-}
+  .form_box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+    }
+  }
+  .inputBox{
+    display: flex;
+    justify-content: center;
+    margin-bottom: 30px;
+    .text{
+      text-align: right;
+      display: flex;
+      align-items: center;
+      margin-right: 5px;
+    }
+    .input{
+      width: 250px;
+    }
+  }
+.button_box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editCarrier.vue

@@ -3,13 +3,10 @@
   <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="330" v-model="form1"></dil-form>
-        </div>
       </div>
     </div>
 
@@ -36,8 +33,8 @@
     </el-drawer>
 
     <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>
@@ -171,13 +168,37 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
+ .form-box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+       .el-radio{
+        width: 25px;
+      }
+    }
+  }
 .button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editConsignee.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">收货客户信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>
@@ -100,13 +99,37 @@ console.log(this.$route.params)
 };
 </script>
 <style lang='scss' scoped>
-.form-box,
+ .form-box {
+    width: 100%;
+    margin-top: 30px;
+    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-select{
+            width: 250px;
+          }
+          .el-input{
+            width: 250px;
+          }
+      }
+       .el-radio{
+        width: 25px;
+      }
+    }
+  }
 .button-box{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editGatepost.vue

@@ -295,5 +295,13 @@ export default {
   margin-left: 35rem;
   margin-bottom: 0.25rem;
 }
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 
 </style>

src/views/RMS/components/editMaterial.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">物资信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,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>
@@ -99,12 +98,12 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editNotice.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">通知信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,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>
@@ -88,14 +87,14 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>
 
 

src/views/RMS/components/editOilPrice.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">油价信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,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>
@@ -87,12 +86,12 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editPersonnel.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">人员信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>
@@ -92,12 +91,12 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editRawWarehouse.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">原料仓库信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,8 @@
     </div>
 
     <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>
   </div>
 </template>
@@ -81,12 +80,12 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editRmsShipper.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">托运人信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -92,14 +91,14 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .button-box{
   display: flex;
   justify-items: center;

src/views/RMS/components/editSupplier.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">供应商信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -14,8 +13,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>
@@ -92,12 +91,12 @@ export default {
 </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;
-}
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 </style>

src/views/RMS/components/editTruckCalculate.vue

@@ -3,7 +3,6 @@
   <div id="contractDetails">
     <page-title>编辑</page-title>
     <div class="main">
-      <span class="text">汽车衡信息</span>
     </div>
     <div class="contractTitle">
       <div class="form-box">
@@ -49,9 +48,9 @@
         </template>
       </el-table-column>
     </dilTable>
-       <div class="button-box">
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      <el-button @click="onClickCancel">返回</el-button>
     </div>  
   </div>
   </div>
@@ -235,19 +234,17 @@ makeSure() {
   text-align: center;
   align-items: center;
   justify-content: center;
-  width: 400px;
-}
-.inputBox{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  width: 400px;
-}
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
+  width: 800px;
 }
+
+ .button-box{
+    display: flex;
+    justify-content: center;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
 .btn-left {
   margin-left: 470px;
 }

src/views/RMS/components/getNoticeById.vue

@@ -63,9 +63,9 @@ export default {
 
 <style>
 
-.el-textarea .el-input--medium .is-disabled  {
-:rows="10"
-}
+/* .el-textarea .el-input--medium .is-disabled  {
+  /* rows="10" */
+/* } */ 
 
 
 .el-textarea__inner{

src/views/RMS/components/rawWarehouse.vue

@@ -46,13 +46,13 @@ export default {
       inputText:"",
       options:{
         // first请求数据的地址
-        requestUrl: "/api/v1/rms/getWarehouseList?apiId=345",
+        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415",
       },
     }
   },
   methods:{
     onclick(){
-      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=345&con="+this.inputText;
+      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=415&con="+this.inputText;
     },
      toInsert() {
       this.$router.push("/addRawWarehouse");

src/views/RMS/components/transitRoute.vue

@@ -132,12 +132,10 @@ export default {
 
 <style lang="scss" scode>
 .steel_inbound{
-  .sache{
-    padding: 1.25rem 0.375rem;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
-  }
+  .top{
+    display: flex;
+    width: 30%;
   }
+}
+
 </style>

src/views/RMS/components/transitRouteAdd.vue

@@ -10,7 +10,7 @@
       </div>
       <div class="link_name">
         <span>线路名称：</span>
-        <el-input placeholder="请输入内容" v-model="line_name" clearable>
+        <el-input placeholder="请输入内容" v-model="line_name" class="el_input_suffix" clearable>
         </el-input>
       </div>
       <div class="link_type">
@@ -107,6 +107,10 @@ export default {
           value: "4",
           label: "退货",
         },
+        {
+          value: "5",
+          label: "零星",
+        },
       ],
       value: "",
       btnList: [],
@@ -281,6 +285,11 @@ export default {
       align-items: center;
       justify-content: center;
       margin-top: 1.25rem;
+      .el_input_suffix{
+        widows: 50px;
+        
+      }
+      
     }
     .link_type {
       display: flex;

src/views/appoint/components/purchase/purchaseOrder.vue

@@ -28,7 +28,7 @@ export default {
       state: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/wmsh/getLoadPortStockList?apiId=158",
+        requestUrl: "/api/v1/ams/getPurchaseOrderList?apiId=81",
       },
     };
   },

src/views/inward/app.js

@@ -19,12 +19,12 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
-import 'xe-utils' 
+// import 'xe-utils' 
 
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-Vue.use(VXETable)
-Vue.prototype.$XModal = VXETable.modal
+// import VXETable from 'vxe-table'
+// import 'vxe-table/lib/style.css'
+// Vue.use(VXETable)
+// Vue.prototype.$XModal = VXETable.modal
 
 
 // 关闭生产模式下给出的提示

src/views/sale/components/dilNotice/addNotice.vue

@@ -0,0 +1,71 @@
+
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="369" 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,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/dilNotice/carrierNotice.vue

@@ -0,0 +1,148 @@
+//公告管理
+<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/ams/getCarrierNoticeList?apiId=414",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
+    },
+
+
+
+    CarrierNotice() {
+      this.$router.push("/addNotice");
+
+    },
+    /*新增通知*/
+    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/ams/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{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/components/dilNotice/clientNotice.vue

@@ -0,0 +1,148 @@
+//公告管理
+<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/ams/getClientNoticeList?apiId=414",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getClientNoticeList?apiId=414&con="+this.textInput;
+    },
+
+
+
+    CarrierNotice() {
+      this.$router.push("/addNotice");
+
+    },
+    /*新增通知*/
+    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/ams/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{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/components/dilNotice/editNotice.vue

@@ -0,0 +1,120 @@
+<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="369" 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/ams/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/ams/updateNotice",
+          DilNotice
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1);
+          }
+        });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+<style>
+
+.el-textarea__inner{
+/*  width: 300px !important;*/
+  min-height:250px !important;
+}
+
+
+</style>
+
+
+
+

src/views/sale/components/dilNotice/getNoticeById.vue

@@ -0,0 +1,101 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+    </div>
+<!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="369" 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/ams/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;
+
+}
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+
+
+<!--<el-input id="FormGroup_1639361270400"
+          type="textarea"
+          placeholder="请输入内容"
+          v-model="textarea"
+
+>
+</el-input>-->
+

src/views/sale/components/dilNotice/marketingNotice.vue

@@ -0,0 +1,149 @@
+//公告管理
+<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/ams/getMarketingNoticeList?apiId=414",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+      this.options.requestUrl = "/api/v1/ams/getCarrierNoticeList?apiId=414&con="+this.textInput;
+    },
+
+
+
+    CarrierNotice() {
+      this.$router.push("/addNotice");
+
+    },
+    /*新增通知*/
+    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/ams/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{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/sale/components/dilNotice/newNotice.vue

@@ -0,0 +1,91 @@
+<!--//公告管理-->
+<template>
+  <div>
+    <div class="noticeDetail">
+      <PageTitle>返回</PageTitle>
+    </div>
+    <!--//详细内容展示部分-->
+    <div class="form-box" style="margin-right: 10rem;text-fill-color: #111111;-webkit-input-placeholder:111111FF"  >
+      <dil-form :formId="369" 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/ams/getNewNoticeByPermission/" +this.$route.params.permissions
+
+        )
+        .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;
+
+}
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -109,7 +109,7 @@ export default {
     // 根据运输订单id查询物资信息
     getMaterial(orderId) {
       this.axios
-        .get("api/v1/tms/getMaterial?orderId=" + orderId)
+        .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
           this.tableData = res.data.data;
         });

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -109,7 +109,7 @@ export default {
     // 根据运输订单id查询物资信息
     getMaterial(orderId) {
       this.axios
-        .get("api/v1/tms/getMaterial?orderId=" + orderId)
+        .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
           this.tableData = res.data.data;
         });

src/views/sale/components/transport_order/receiveOrder.vue

@@ -36,15 +36,15 @@
 				inputText: "",
 				first: {
 					// first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierId=1",
+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierId=73",
 				},
 				second: {
 					// second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierId=1",
+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierId=73",
 				},
 				third: {
 					// second请求数据的地址
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=1",
+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=73",
 				},
 				activeName: "first",
 			}

src/views/sale/router/index.js

@@ -43,9 +43,18 @@ import directionalDispatch from '../components/transport_appointment/directional
 import openDistribution from '../components/transport_appointment/openDistribution.vue'
 import openDistributionSection from '../components/transport_appointment/openDistributionSection.vue'
 import orderGrabbing from '../components/transport_appointment/orderGrabbing.vue'
-import add_sale_dilNotice from '../components/transport_excute/dilNotice/add_sale_dilNotice.vue'
-import Carrier_dilNotice from '../components/transport_excute/dilNotice/Carrier_dilNotice.vue'
-import sale_dilNotice from '../components/transport_excute/dilNotice/sale_dilNotice.vue'
+
+import add_sale_dilNotice from '../components/dilNotice/add_sale_dilNotice.vue'
+import Carrier_dilNotice from '../components/dilNotice/Carrier_dilNotice.vue'
+import sale_dilNotice from '../components/dilNotice/sale_dilNotice.vue'
+import addNotice from '../components/dilNotice/addNotice.vue'
+import carrierNotice from '../components/dilNotice/carrierNotice.vue'
+import clientNotice from '../components/dilNotice/clientNotice.vue'
+import editNotice from '../components/dilNotice/editNotice.vue'
+import getNoticeById from '../components/dilNotice/getNoticeById.vue'
+import marketingNotice from '../components/dilNotice/marketingNotice.vue'
+import newNotice from '../components/dilNotice/newNotice.vue'
+
 import outFactoryResult from '../components/transport_excute/outFactory/outFactoryResult.vue'
 import smsResult from '../components/transport_excute/outFactory/smsResult.vue'
 import arrivalPhoto from '../components/transport_excute/tms-offsite/arrivalPhoto.vue'
@@ -136,9 +145,18 @@ const constantRouterMap = [
 		{path: 'openDistribution', name: 'openDistribution', meta: {code: 'xtpzgl-yhgl'}, component: openDistribution},
 		{path: 'openDistributionSection/:dispatchId', name: 'openDistributionSection', meta: {code: 'xtpzgl-yhgl'}, component: openDistributionSection},
 		{path: 'orderGrabbing', name: 'orderGrabbing', meta: {code: 'xtpzgl-yhgl'}, component: orderGrabbing},
+
 		{path: 'add_sale_dilNotice', name: 'add_sale_dilNotice', meta: {code: 'xtpzgl-yhgl'}, component: add_sale_dilNotice},
 		{path: 'Carrier_dilNotice', name: 'Carrier_dilNotice', meta: {code: 'xtpzgl-yhgl'}, component: Carrier_dilNotice},
 		{path: 'sale_dilNotice', name: 'sale_dilNotice', meta: {code: 'xtpzgl-yhgl'}, component: sale_dilNotice},
+		{path: 'addNotice', name: 'addNotice', meta: {code: 'xtpzgl-yhgl'}, component: addNotice},
+		{path: 'carrierNotice', name: 'carrierNotice', meta: {code: 'xtpzgl-yhgl'}, component: carrierNotice},
+		{path: 'clientNotice', name: 'clientNotice', meta: {code: 'xtpzgl-yhgl'}, component: clientNotice},
+		{path: 'editNotice/:noticeId', name: 'editNotice', meta: {code: 'xtpzgl-yhgl'}, component: editNotice},
+		{path: 'getNoticeById/:noticeId', name: 'getNoticeById', meta: {code: 'xtpzgl-yhgl'}, component: getNoticeById},
+		{path: 'marketingNotice', name: 'marketingNotice', meta: {code: 'xtpzgl-yhgl'}, component: marketingNotice},
+		{path: 'newNotice', name: 'newNotice', meta: {code: 'xtpzgl-yhgl'}, component: newNotice},
+
 		{path: 'outFactoryResult', name: 'outFactoryResult', meta: {code: 'xtpzgl-yhgl'}, component: outFactoryResult},
 		{path: 'smsResult', name: 'smsResult', meta: {code: 'xtpzgl-jggl'}, component: smsResult},
 		{path: 'arrivalPhoto', name: 'arrivalPhoto', meta: {code: 'xtpzgl-yhgl'}, component: arrivalPhoto},