修改合并冲突

src/views/RMS/components/addCarrier.vue

@@ -32,13 +32,8 @@
       :on-remove="handleRemove"
       :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
@@ -52,13 +47,8 @@
       :on-remove="handleRemove"
       :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
@@ -121,7 +111,6 @@ export default {
         // first请求数据的地址
         requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
         selectionType: "radio",
-<<<<<<< HEAD
         mapList: [],
         registerDate: "",
         mapValue: "",
@@ -175,44 +164,6 @@ 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);
@@ -225,7 +176,6 @@ export default {
     currentRadioChange(selection) {
       (this.mapList = selection), (this.bidArea = this.mapList.bidArea);
     },
-<<<<<<< HEAD
     makeSure() {
       let reg = new RegExp(/^[0-9]*$/);
       let RmsCarrier = {
@@ -250,38 +200,10 @@ 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,
@@ -292,12 +214,6 @@ 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("输入的格式不正确");
@@ -307,7 +223,6 @@ export default {
         // imageUrls.imageUrl2 ==null ||
         // imageUrls.imageUrl3 ==null ||
 
-<<<<<<< HEAD
         RmsCarrier.carrierAbbreviation == null ||
         RmsCarrier.carrierAddress == null ||
         RmsCarrier.registerNo == null ||
@@ -342,54 +257,6 @@ 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() {
@@ -399,7 +266,6 @@ export default {
 };
 </script>
 <style lang='scss' >
-<<<<<<< HEAD
 .button-box {
   display: flex;
   text-align: center;
@@ -412,12 +278,8 @@ export default {
   display: flex;
   justify-content: center;
   .el-form-item {
-=======
- .button-box{
->>>>>>> e968621af3a8a6abdad33b49d406fac29ba239ec
     display: flex;
     justify-content: center;
-<<<<<<< HEAD
 
     .el-form-item__label {
       display: flex;
@@ -433,43 +295,6 @@ 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;