资源管理12.24

build/utils.js

@@ -18,8 +18,12 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-let devModules = ['all'];
-// let devModules = ['index','inward','appoint','sale']
+// let devModules = ['all'];
+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'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

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

@@ -8,16 +8,42 @@
       </div>
     <el-upload
       class="upload-demo"
-      action="http://localhost:8060/api/v1/rms/rmscarrier/uploadCarrier"
+      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
       :on-preview="handlePreview"
       :on-remove="handleRemove"
-      :on-success="handleAvatarSuccess"
+      :on-success="handleAvatarSuccess1"
       :file-list="fileList"
+      :before-upload="beforeUpload2"
       list-type="picture">
-      <el-button size="small" type="primary">点击上传照片</el-button>
+      <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="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleAvatarSuccess2"
+      :file-list="fileList"
+      :before-upload="beforeUpload2"
+      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="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :on-success="handleAvatarSuccess3"
+      :file-list="fileList"
+      :before-upload="beforeUpload2"
+      list-type="picture">
+      <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">
     <el-form-item>
@@ -79,12 +105,52 @@ export default {
          registerDate:"",
          mapValue:""
       },
-      imageUrl:""
+      imageUrl1:"",
+      imageUrl2:"",
+      imageUrl3:"",
+      imageUrls:[],
     };
   },
   methods: {
-    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);
+      // this.axios
+      // .then((res) => {
+      //   if (res.data.code == 200) {
+      //     this.$message({
+      //     type: "success",
+      //     message: "新增成功!",
+      //     });
+      //   } 
+      //   else {
+      //     this.$message.error("图片上传失败，图片格式不得超过500kb且只能是jpg/png文件！");
+      //   }
+      // });
+    },
+    handleAvatarSuccess2(res,file){
+      this.imageUrl2=URL.createObjectURL(file.raw);
+    },
+    handleAvatarSuccess3(res,file){
+      this.imageUrl3=URL.createObjectURL(file.raw);
     },
     handleRemove(file,fileList){
       console.log(file,fileList)
@@ -98,7 +164,6 @@ export default {
     },
     currentRadioChange(selection){
       this.mapList=selection, 
-      console.log(this.mapList) 
       this.bidArea=this.mapList.bidArea
      
     },
@@ -130,18 +195,27 @@ export default {
       let registerDate={
         registerDate: this.form1.registerDate,
       };
+      let imageUrls={
+        imageUrl1:this.imageUrl1,
+        imageUrl1:this.imageUrl2,
+        imageUrl1:this.imageUrl3
+      };
+      console.log(imageUrls)
       let mapValue={
         RmsCarrier:RmsCarrier,
-        registerDate:registerDate
+        registerDate:registerDate,
+        imageUrls:imageUrls
       };
       if(
         reg.test(RmsCarrier.carrierContactNumber)==false
       )this.$message.error("输入的格式不正确");
        else if(
           RmsCarrier.carrierName ==null ||
-        // RmsCarrier.carrierTransportCertificate ==null ||
-        // RmsCarrier.carrierBusinessLicense ==null ||
-        // RmsCarrier.carrierBusinessAblelicense ==null ||
+
+          // imageUrls.imageUrl1 ==null ||
+          // imageUrls.imageUrl2 ==null ||
+          // imageUrls.imageUrl3 ==null ||
+
           RmsCarrier.carrierAbbreviation ==null ||
           RmsCarrier.carrierAddress ==null ||
           RmsCarrier.registerNo ==null ||

src/views/RMS/components/addPersonnel.vue

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