托运人修改

build/utils.js

@@ -19,8 +19,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 // let devModules = ['all'];
-// let devModules = ['index','inward','TMS','RMS']
-let devModules = ['index','SporadicManage','TMS']
+let devModules = ['index','TMS','RMS']
+// let devModules = ['index','SporadicManage','TMS']
 // let devModules = ['index','SporadicManage'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];

config/index.js

@@ -56,7 +56,7 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
@@ -70,7 +70,7 @@ let proxyTable = {
   //   }
   // },
   "/views/api/v1": {
-    target: "http://172.16.33.166:8080",
+    target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

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/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/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/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/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>