首頁 探索 說明
登入
DAL-DAZHOU
/
icore-pass
9
0
複刻 0
Files 問題管理 0 合併請求 0 Wiki
瀏覽代碼

tijiao

Your Name 3 年之前
父節點
33b438ea30 3a1ffa6a06
當前提交
d1274c2fdb
共有 16 個文件被更改，包括 167 次插入 和 342 次删除
分割檢視 顯示文件統計
  1. 1 16
      build/utils.js
  2. 1 3
      index.html
  3. 0 14
      src/js/QueueStartList.js
  4. 0 47
      src/js/sharedJsFile.js
  5. 1 119
      src/views/RMS/components/addCarDriver.vue
  6. 55 14
      src/views/RMS/components/addCarrier.vue
  7. 2 1
      src/views/RMS/components/addMaterial.vue
  8. 13 4
      src/views/RMS/components/capacity.vue
  9. 2 2
      src/views/RMS/components/carDriver.vue
  10. 2 2
      src/views/RMS/components/carrier.vue
  11. 5 5
      src/views/RMS/components/editCapacity.vue
  12. 20 18
      src/views/RMS/components/editCarrier.vue
  13. 58 13
      src/views/RMS/components/editRawWarehouse.vue
  14. 1 9
      src/views/homepage/app.js
  15. 4 75
      src/views/homepage/components/homepage.vue
  16. 2 0
      src/views/index/components/login.vue

+ 1 - 16
build/utils.js
查看文件 

@@ -15,22 +15,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 // ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 
 //    物流         进程     成本   报表          基础配置        系统配置
 
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 
-// let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 
-// let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 
-// 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'];
 
- //let devModules = ['all'];
 
-// let devModules = ['index','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'];
 
-// let devModules = ['index','inward','SporadicManage','RMS']
 
-// let devModules = ['index','RMS']
 
+// let devModules = ['index','RMS','systemConfig']
 
 let devModules = ['all'];
 
 // let devModules = ['index','inward','appoint','sale']

+ 1 - 3
index.html
查看文件 

@@ -4,9 +4,7 @@
 
     <meta charset="utf-8">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <title>工业互联网平台 iCore-ICP</title>
 
-    <script>
 
-     
-      window.location.href='./views/download.html';
 
+    <script> window.location.href='./views/download.html';
 
     </script>
 
   </head>
 
   <body>

+ 0 - 14
src/js/QueueStartList.js
查看文件 

@@ -1,14 +0,0 @@
 
-import axios from 'axios'
 
-//返回月台
 
-export function loadingPoint(URL){
 
-  let loadingpoint = []
 
-  axios.get(URL).then((res)=>{
 
-    res.data.data.forEach(e => {
 
-      let arr = {
 
-          value:e.GRID_NAME
 
-      };
 
-    loadingpoint.push(arr)
 
-    });
 
-  })
 
-  return loadingpoint;
 
-}

+ 0 - 47
src/js/sharedJsFile.js
查看文件 

@@ -1,47 +0,0 @@
 
- //把时间戳改为正常可读的时间
 
-export function renderTime(date) {
 
-    if(date !== null){
 
-        let dateee = new Date(date).toJSON();
 
-        return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
 
-    }
 
-    return null;
 
-}
 
-//把毫秒数转换分
 
-export function getDuration(my_time) { 
 
-    if(my_time !== null){
 
-        return Math.floor(my_time / 1000 / 60);
 
-    }
 
-    return null;
 
-}
 
-export function sjTime(orderPlanInTime) {
 
-    var stringTime = renderTime(orderPlanInTime);
 
-    var timestamp1 = stringTime.replace(/-/g, "/");
 
-    return new Date(timestamp1).getTime();
 
-}
 
-//验证电话号码
 
-export function VerifyPhoneNumber(Phone) {
 
-    var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
 
-    if (!myreg.test(Phone)) {
 
-        return false;
 
-    } else {
 
-        return true;
 
-    }
 
-}
 
-export function isNumber(value) {
 
-    //验证是否为数字
 
-    var patrn = /^(-)?\d+(\.\d+)?$/;
 
-    if (patrn.exec(value) == null || value == "") {
 
-      return false;
 
-    } else {
 
-      return true;
 
-    }
 
-  }
 
-export function isIntegerNumber(value) {
 
-    //验证是否为整数
 
-    var patrn = /^\+?[1-9][0-9]*$/g;
 
-    if (patrn.exec(value) == null || value == "") {
 
-      return false;
 
-    } else {
 
-      return true;
 
-    }
 
-  }

+ 1 - 119
src/views/RMS/components/addCarDriver.vue
查看文件 

@@ -17,67 +17,7 @@
 
         @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="handleAvatarSuccess1"
 
-    :file-list="fileList"
 
-    list-type="picture">
 
-  <div>行驶证照片
 
-  <el-button size="small" type="primary">点击上传</el-button>
 
-  </div>
 
-</el-upload> 
-    </div>
 
-
 
-     <div class="photoBox">
 
-   <el-upload
 
-  class="upload-demo"
 
-  action="http://localhost:8080/api/v1/rms/upload"
 
-  :on-preview="handlePreview"
 
-  :on-remove="handleRemove"
 
-  :on-success="handleAvatarSuccess2"
 
-  :file-list="fileList"
 
-  list-type="picture">
 
-  <div>驾驶证照片
 
-  <el-button size="small" type="primary">点击上传</el-button>
 
-  </div>
 
-</el-upload> 
-    </div>
 
-
 
-      <div class="photoBox">
 
-   <el-upload
 
-  class="upload-demo"
 
-  action="http://localhost:8080/api/v1/rms/upload"
 
-  :on-preview="handlePreview"
 
-  :on-remove="handleRemove"
 
-  :on-success="handleAvatarSuccess3"
 
-  :file-list="fileList"
 
-  list-type="picture">
 
-  <div>运输证照片
 
-  <el-button size="small" type="primary">点击上传</el-button>
 
-  </div>
 
-</el-upload> 
-    </div>
 
-
 
-
 
- <div class="photoBox">
 
-   <el-upload
 
-  class="upload-demo"
 
-  action="http://localhost:8080/api/v1/rms/upload"
 
-  :on-preview="handlePreview"
 
-  :on-remove="handleRemove"
 
-  :on-success="handleAvatarSuccess4"
 
-  :file-list="fileList"
 
-  list-type="picture">
 
-  <div>从业资格证照片
 
-  <el-button size="small" type="primary">点击上传</el-button>
 
-  </div>
 
-</el-upload> 
-    </div>
 
-
 
+    
     <div class="button_box">
 
       <el-button @click="cancel">取消</el-button>
 
       <el-button type="primary" @click="makeSure">确定</el-button>
 
@@ -100,11 +40,6 @@ export default {
 
       fileList: [],
 
       carrierIds:"",
 
       state: "",
 
-      imageUrl1:"",
 
-      imageUrl2:"",
 
-      imageUrl3:"",
 
-      imageUrl4:"",
 
-      imageUrls:[],
 
     };
 
   },
 
   mounted() {
 
@@ -141,53 +76,6 @@ export default {
 
     handleSelect(item){
 
       this.carrierIds=item.carrierIds;
 
       console.log(item)
 
-    },
 
-      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);
 
-    },
 
-    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);
 
@@ -199,11 +87,6 @@ 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,
 
@@ -279,7 +162,6 @@ export default {
 
   justify-content: center;
 
   margin-top: 0.1000rem;
 
   margin-bottom: 0.25rem;
 
- // margin-left: -18rem;
 
 }
 
   .inputBox{
 
     display: flex;

+ 55 - 14
src/views/RMS/components/addCarrier.vue
查看文件 

@@ -12,6 +12,16 @@
 
       >
 
       </el-input>
 
     </div>
 
+    <div class="user_code">
 
+      <span class="text">用户名</span>
 
+      <el-input
 
+        class="input"
 
+        placeholder="请输入用户名(必填项)"
 
+        v-model="user_Name"
 
+        clearable
 
+      >
 
+      </el-input>
 
+    </div>
 
     <div class="form_box" style="margin-right: 10rem">
 
       <dil-form :formId="330" v-model="form1"></dil-form>
 
     </div>
 
@@ -118,6 +128,7 @@ export default {
 
   components: { PageTitle },
 
   data() {
 
     return {
 
+      user_Name:'',
 
       //营业执照
 
       businessLicense1: null,
 
       //营业执照
 
@@ -149,6 +160,14 @@ export default {
 
     };
 
   },
 
   methods: {
 
+    VerifyPhoneNumber(Phone) {
 
+      var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
 
+      if (!myreg.test(Phone)) {
 
+          return false;
 
+      } else {
 
+          return true;
 
+      }
 
+    },
 
     upCLick(val) {
 
       this.num = val;
 
     },
 
@@ -207,21 +226,26 @@ export default {
 
     },
 
     makeSure() {
 
       let status = false;
 
+      this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
 
       if (!this.input) {
 
         this.$message.error("账号不能为空");
 
-      } else if (!this.form1.carrierName) {
 
+      } else if(!this.user_Name){
 
+        this.$message.error("用户名不能为空");
 
+      }else if (!this.form1.carrierName) {
 
         this.$message.error("承运商名称不能为空");
 
       } else if (!this.form1.carrierType) {
 
         this.$message.error("承运商类型不能为空");
 
-      }
 
-      //  else if (!this.imageUrl1) {
 
-      //   this.$message.error("请上传运输证");
 
-      // } else if (!this.imageUrl2) {
 
-      //   this.$message.error("请上传经营许可证");
 
-      // } else if (!this.imageUrl3) {
 
-      //   this.$message.error("请上传营业执照");
 
-      // }
 
-      else {
 
+      }else if(!this.form1.contactsName){
 
+        this.$message.error("联系人不能为空");
 
+      }else if(!this.form1.carrierContactNumber){
 
+        this.$message.error("联系电话不能为空");
 
+      }else if (!this.imageUrl1) {
 
+        this.$message.error("请上传运输证");
 
+      } else if (!this.imageUrl2) {
 
+        this.$message.error("请上传经营许可证");
 
+      } else if (!this.imageUrl3) {
 
+        this.$message.error("请上传营业执照");
 
+      }else {
 
         status = true;
 
       }
 
       if (this.form1.registerDate) {
 
@@ -234,7 +258,7 @@ export default {
 
         }
 
         let fromData = new FormData();
 
         fromData.append("userCode", this.input);
 
-        fromData.append("userName", this.form1.carrierName);
 
+        fromData.append("userName", this.user_Name);
 
         fromData.append("orgCode", "chengyunshang");
 
         fromData.append("mobile", "133" + rand);
 
         fromData.append("email", "133" + rand + "@163.com");
 
@@ -246,6 +270,7 @@ export default {
 
         this.$store
 
           .dispatch("system/usersManage/addUser", fromData)
 
           .then((res) => {
 
+            console.log(1)
 
             if (res.code === "0") {
 
               let userId = res.data.userId;
 
               this.axios
 
@@ -257,31 +282,46 @@ export default {
 
                     "&roleId=924449091658846208"
 
                 )
 
                 .then((res) => {
 
+                  console.log(2)
 
                   if (res.code == "0") {
 
+                    //图片地址
 
                     let imageUrls = {
 
+                      //运输证
 
                       imageUrl1: this.imageUrl1,
 
+                      //经营许可证
 
                       imageUrl2: this.imageUrl2,
 
+                      //营业执照
 
                       imageUrl3: this.imageUrl3,
 
                     };
 
+                    //传给后端的数据
 
                     let mapValue = {
 
+                      //表单数据
 
                       from: this.form1,
 
+                      //图片数据
 
                       imageUrls: imageUrls,
 
+                      //sso的用户Id
 
                       userId: userId,
 
                     };
 
                     this.axios
 
                       .post("/api/v1/rms/insertCarrier", mapValue)
 
                       .then((res) => {
 
+                        console.log(2)
 
                         if (res.data.code == "200") {
 
+                          this.cancel();
 
                           this.$message.success("添加成功");
 
                         } else {
 
-                          this.$message.error("添加失败");
 
+                          this.axios
 
+                          .delete("pass/v1/sysusers/" + userId)
 
+                          .then((res) => {
 
+                            this.$message.error("添加失败");
 
+                          });
 
                         }
 
                       })
 
                       .catch(() => {
 
                         this.axios
 
                           .delete("pass/v1/sysusers/" + userId)
 
                           .then((res) => {
 
-                            console.log(res.data, "data");
 
+                            this.$message.error("添加失败");
 
                           });
 
                       });
 
                   }
 
@@ -302,11 +342,12 @@ export default {
 
   .user_code {
 
     display: flex;
 
     justify-content: center;
 
+    margin: 10px;
 
     .text {
 
       display: flex;
 
       justify-content: center;
 
       align-items: center;
 
-      margin-right: 15px;
 
+      margin-right: 10px;
 
     }
 
     .input {
 
       width: 250px;

+ 2 - 1
src/views/RMS/components/addMaterial.vue
查看文件 

@@ -134,8 +134,9 @@ export default {
 
   text-align: center;
 
   align-items: center;
 
   justify-content: center;
 
-  margin-top: 1.5rem;
 
+  margin-top: 2rem;
 
   margin-bottom: 1.25rem;
 
+  margin-right: 10px;
 
 }
 
 .btn-left {
 
   margin-left: 470px;

+ 13 - 4
src/views/RMS/components/capacity.vue
查看文件 

@@ -25,13 +25,13 @@
 
             >
 
               修改
 
             </el-button>
 
-            <el-button
 
+            <!-- <el-button
 
               type="text"
 
               size="mini"
 
               @click="deleteCapacity(scope)"
 
             >
 
               删除
 
-            </el-button>
 
+            </el-button> -->
 
           </template>
 
         </el-table-column>
 
       </dilTable>
 
@@ -39,21 +39,30 @@
 
   </div>
 
 </template>
 
 <script>
 
+import { getCookie } from "@/utils/util.js";
 
 export default {
 
   data(){
 
     return{
 
      name:"homeworkPath",
 
      textInput:"",
 
      restaurants: [],
 
+     ssoId:null,
 
      options:{
 
         // first请求数据的地址
 
-        requestUrl: "/api/v1/rms/getCapacityList?apiId=397",
 
+        requestUrl: "",
 
       },
 
     }
 
   },
 
+  created(){
 
+    if(getCookie("orgCode") == "chengyunshang"){
 
+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId");
 
+    }else{
 
+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + this.ssoId;
 
+    }
 
+  },
 
   methods:{
 
     onclick(){
 
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&con=" +this.textInput;
 
+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput;
 
     },
 
      toInsert() {
 
       this.$router.push("/addCapacity");

+ 2 - 2
src/views/RMS/components/carDriver.vue
查看文件 

@@ -47,13 +47,13 @@ export default {
 
       restaurants: [],
 
       options:{
 
         // first请求数据的地址
 
-        requestUrl: "/api/v1/rms/getCarDriverList?apiId=339",
 
+        requestUrl: "/api/v1/rms/getCarDriverList?apiId=420",
 
       },
 
     }
 
   },
 
   methods:{
 
     onclick(){
 
-        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=339&con=" +this.textInput;
 
+        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=420&con=" +this.textInput;
 
       },
 
 
      toInsert() {

+ 2 - 2
src/views/RMS/components/carrier.vue
查看文件 

@@ -18,9 +18,9 @@
 
             <el-button type="text" size="small" @click="updateCarrier(scope)">
 
               修改
 
             </el-button>
 
-            <el-button type="text" size="mini" @click="deleteCarrier(scope)">
 
+            <!-- <el-button type="text" size="mini" @click="deleteCarrier(scope)">
 
               删除
 
-            </el-button>
 
+            </el-button> -->
 
           </template>
 
         </el-table-column>
 
       </dilTable>

+ 5 - 5
src/views/RMS/components/editCapacity.vue
查看文件 

@@ -11,7 +11,7 @@
 
       </div>
 
     </div>
 
 </div>
 
-        <div class="form-box f1">
 
+        <!-- <div class="form-box f1">
 
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
 
 <div class="disableBox">
 
   <el-form-item>
 
@@ -40,7 +40,7 @@
 
             <i class="el-icon-search"></i>查询
 
           </el-button>
 
             <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
 
-</el-drawer>
 
+</el-drawer> -->
 
     <div class="button_box">
 
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
 
     </div>
 
@@ -125,14 +125,14 @@ console.log(this.$route.params)
 
          capacityOwneris:this.form1.capacityOwneris,
 
          capacityVip:this.form1.capacityVip,
 
          capacityBlacklist:this.form1.capacityBlacklist,
 
-         carrierId:this.mapList.carrierId,
 
+       //  carrierId:this.mapList.carrierId,
 
        };if(
 
          RmsCapacity.capacityNumber==null ||
 
          RmsCapacity.capacityCorlor==null ||
 
          RmsCapacity.capacityOwneris==null ||
 
          RmsCapacity.capacityVip==null ||
 
-         RmsCapacity.capacityBlacklist==null ||
 
-         RmsCapacity.carrierId==null
 
+         RmsCapacity.capacityBlacklist==null 
+         //RmsCapacity.carrierId==null
 
        )this.$message.error("存在空值！");  
         console.log( this.$route.params.capacityId);
 
         this.axios

+ 20 - 18
src/views/RMS/components/editCarrier.vue
查看文件 

@@ -5,12 +5,12 @@
 
     <div class="main">
 
     </div>
 
     <div class="contractTitle">
 
-      <div class="form-box">
 
+      <div class="form_box">
 
           <dil-form :formId="330" v-model="form1"></dil-form>
 
       </div>
 
     </div>
 
 
-    <div class="form-box f1">
 
+    <div class="form_box f1">
 
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
 
     <el-form-item>
 
     <el-button type="primary" @click="drawer = true">添加中标区域信息</el-button>
 
@@ -167,29 +167,31 @@ export default {
 
   },
 
 };
 
 </script>
 
-<style lang='scss' scoped>
 
- .form-box {
 
-    width: 100%;
 
-    margin-top: 30px;
 
+<style lang='scss'>
 
+
 
+  .form_box {
 
     display: flex;
 
     justify-content: center;
 
-    .el-form-item{
 
+    margin-left: 170px;
 
+    margin-top: 15px;
 
+    .el-form-item {
 
       display: flex;
 
       justify-content: center;
 
-      .el-form-item__label{
 
+      .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;
 
+      .el-form-item__content {
 
+        width: 250px;
 
+        .el-radio-group {
 
+          width: 500px;
 
+        }
 
+        .el-date-editor {
 
+          width: 250px;
 
+        }
 
+        .el-input__inner {
 
+          width: 250px;
 
+        }
 
       }
 
     }
 
   }

+ 58 - 13
src/views/RMS/components/editRawWarehouse.vue
查看文件 

@@ -4,14 +4,32 @@
 
     <page-title>编辑</page-title>
 
     <div class="main">
 
     </div>
 
-    <div class="contractTitle">
 
+<!--     <div class="contractTitle">
 
       <div class="form-box">
 
         <div class="form-one">
 
           <dil-form :formId="355" v-model="form1"></dil-form>
 
         </div>
 
       </div>
 
-    </div>
 
+    </div> -->
 
 
+    <div class="shipperName">
 
+    <label>托运人</label>
 
+    <el-select v-model="shipperName" placeholder="请选择" @change="getValue">
 
+    <el-option
 
+      v-for="item in options"
 
+      :key="item.value"
 
+      :label="item.label"
 
+      :value="item.value">
 
+    </el-option>
 
+  </el-select>
 
+     </div>
 
+  <div class="point">
 
+    <label>装卸点</label>
 
+  <el-input style="width: 220px;" v-model="warehouseName" placeholder="请输入内容"></el-input>
 
+  </div>
 
+  
+    
+         
     <div class="button-box">
 
       <el-button @click="onClickCancel">返回</el-button>
 
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
 
@@ -26,11 +44,17 @@ export default {
 
   components: { PageTitle },
 
   data() {
 
     return {
 
-      form1: {
 
-        warehouseName: '',
 
-      },
 
+    warehouseName : '',
 
+    shipperName: '',
 
+    options: [{
 
+          value: '',
 
+          label: ''
 
+        }],
 
     };
 
   },
 
+  created(){
 
+    this.getValue();
 
+  },
 
   mounted() {
 
       console.log(this.$route)
 
     this.information();
 
@@ -45,25 +69,36 @@ export default {
 
             this.$route.params.warehouseId
 
         )
 
         .then((res) => {
 
-            this.form1.warehouseName = res.data.data.warehouseName;
 
+            console.log("res",res)
 
+            this.shipperName=res.data.data.shipperId;
 
+            this.warehouseName=res.data.data.warehouseName;
 
+            
         });
 
     },
 
+    //单选下拉框
 
+    getValue(){
 
+       this.axios
 
+        .get(
 
+          "/api/v1/rms/getShipperId" 
+           
 
+        )
 
+        .then((res) => {
 
+            this.options = res.data.data;
 
+        });
 
+    },
 
     // 返回
 
     onClickCancel() {
 
       this.$router.go(-1);
 
     },
 
     // 确认
 
     onClickConfirm() {
 
-      console.log(this.form1)
 
+     console.log("RmsWarehouse",RmsWarehouse)
 
        let RmsWarehouse={
 
       warehouseId:this.$route.params.warehouseId,
 
-      warehouseName:this.form1.warehouseName,
 
-      shipperId:this.form1.shipperId,
 
+      warehouseName:this.warehouseName,
 
+      shipperId:this.shipperName,
 
     };
 
-    if(
 
-         warehouseName==null
 
-       )this.$message.error("存在空值！");
 
-   console.log(RmsWarehouse)
 
+   console.log("RmsWarehouse",RmsWarehouse)
 
         this.axios
 
           .post(
 
             "/api/v1/rms/updateWarehouse",
 
@@ -83,9 +118,19 @@ export default {
 
  .button-box{
 
     display: flex;
 
     justify-content: center;
 
+    margin-top: 2rem;
 
     .el-button{
 
       width: 80px;
 
       margin-right: 10px;
 
     }
 
   }
 
+  .shipperName{
 
+    display: flex;
 
+    justify-content: center;
 
+  }
 
+  .point{
 
+    display: flex;
 
+    justify-content: center;
 
+    margin-top: 1rem;
 
+  }
 
 </style>

+ 1 - 9
src/views/homepage/app.js
查看文件 

@@ -48,15 +48,7 @@ export function sjTime(orderPlanInTime) {
 
   var timestamp1 = stringTime.replace(/-/g, "/");
 
   return new Date(timestamp1).getTime();
 
 }
 
-//验证电话号码
 
-export function VerifyPhoneNumber(Phone) {
 
-  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
 
-  if (!myreg.test(Phone)) {
 
-      return false;
 
-  } else {
 
-      return true;
 
-  }
 
-}
 
+
 
 export function isNumber(value) {
 
   //验证是否为数字
 
   var patrn = /^(-)?\d+(\.\d+)?$/;

+ 4 - 75
src/views/homepage/components/homepage.vue
查看文件 

@@ -1,84 +1,13 @@
 
 <template>
 
-  <div>
 
-    首页
 
-    <el-button @click="onClick">ces1</el-button>
 
-  </div>
 
+  <div>首页</div>
 
 </template>
 
 
 <script>
 
 export default {
 
-  methods: {
 
-    onClick() {
 
-      let data = {
 
-        userId: "",
 
-        userCode: "A12345",
 
-        userName: "A12345",
 
-        qrCode: "",
 
-        sex: "",
 
-        age: "",
 
-        cardNo: "",
 
-        birthDate: "",
 
-        nativePlace: "",
 
-        orgCode: "yunli",
 
-        orgName: "运力",
 
-        dep: "",
 
-        workTeam: "",
 
-        profilePhoto: "",
 
-        photo: "",
 
-        mobile: "13487481520",
 
-        qq: "",
 
-        wechat: "",
 
-        tel: "",
 
-        email: "213213@qq.com",
 
-        homeAddr: "",
 
-        entryDate: "",
 
-        workDate: "",
 
-        political: "",
 
-        title: "",
 
-        degree: "",
 
-        major: "",
 
-        gradSchool: "",
 
-        ability: "",
 
-        tranHis: "",
 
-        certificate: "",
 
-        special: "",
 
-        assessment: "",
 
-        leaveStatus: "",
 
-        onlineStatus: "",
 
-        status: "",
 
-        remark: "",
 
-        expireDays: "",
 
-        leave: "",
 
-        address: "",
 
-        ip: "",
 
-        rank: "",
 
-        responsibility: "",
 
-        groupData: "",
 
-        companyData: "",
 
-        groupId: "506514577756917769",
 
-        companyId: "713710108567277568",
 
-        photoType: "",
 
-        orgId: "922512907093282816",
 
-      };
 
-      this.store.dispatch("system/usersManage/addUser", data).then((res) => {
 
-        console.log(res);
 
-        if (res.code === "0") {
 
-          if (this.qrRole.length > 0) {
 
-            this.addRoleToUser(res.data.userId, res.data.userCode);
 
-          }
 
-          if (form.dutys.length > 0) {
 
-            this.addUserDutys(res.data.userId, form.dutys);
 
-          }
 
-          this.$message.success("添加成功");
 
-          this.$emit("on-then", "success", form);
 
-        } else {
 
-          this.$message.error(res.message);
 
-        }
 
-      });
 
-    },
 
-  },
 
-};
 
+
 
+}
 
 </script>
 
 
 <style>
 
+
 
 </style>

+ 2 - 0
src/views/index/components/login.vue
查看文件 

@@ -115,6 +115,7 @@ export default {
 
             .dispatch("index/login/login", form)
 
             .then((res) => {
 
               if (res.code === "0") {
 
+                console.log(res,"res")
 
                 //  登录成功
 
                 //  设置缓存信息
 
                 setCookie("accessToken", res.data.accessToken, cookieTime, "/");
 
@@ -124,6 +125,7 @@ export default {
 
                   cookieTime,
 
                   "/"
 
                 );
 
+                setCookie("orgCode", res.data.user.orgCode);
 
                 setCookie("userId", res.data.user.userId);
 
                 setCookie("appId", res.data.appId);
 
                 setCookie("loginId", res.data.user.userId); // 为配合bms取值添加