Ver Fonte

Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

Your Name há 3 anos atrás
pai
commit
bca9d39435

BIN
dist.zip


+ 2 - 1
index.html

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

BIN
src/assets/download/down.png


BIN
src/assets/download/image.png


BIN
src/assets/download/login.png


+ 0 - 1
src/components/DilCommonUI/packages/form/src/form-item.vue

@@ -7,7 +7,6 @@
           v-for="(radio, index) in itemList"
           :key="'radio_' + index"
           v-bind="radio"
-          @click="onClick"
         >
         </el-radio>
       </el-radio-group>

+ 4 - 2
src/config/routerBefore.js

@@ -16,7 +16,7 @@ import {
 } from '@/config/config.js';
 
 // 免登录白名单
-const whiteList = ['/', '/login', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd'];
+const whiteList = ['/', '/login', '/download', '/page404', '/dingtalkTaskMobileEnd', '/dingtalkWorkFlowMobileEnd'];
 
 /**
  * 当前路由取标题
@@ -96,9 +96,9 @@ const breadcrumbFn = function (to, menu) {
 //  路由前置操作
 const routerBefore = function (router, constantRouterMap) {
   let flag = false
+  console.log('开始了')
   router.beforeEach((to, from, next) => {
     //  面包屑
-    console.log('进入路由', to)
     if (document.domain.indexOf('steerinfo.com') > -1) {
       document.domain = 'steerinfo.com';
     }
@@ -110,6 +110,7 @@ const routerBefore = function (router, constantRouterMap) {
       document.title = to.meta.title + ' ' + document.title.substr(document.title.indexOf('-'));
     }
     if (to.query.ticket) {
+      console.log('开始了2')
       setCookie('ticket', to.query.ticket, '', '/');
       let res = axios.get('pass/auth/ticket', {
         params: {
@@ -125,6 +126,7 @@ const routerBefore = function (router, constantRouterMap) {
           Message('登陆账户异常, 请联系管理员')
         });
     } else {
+      console.log('开始了3')
       DoneCookie(to, from, next, to.query.accessToken, flag)
     }
   });

+ 0 - 48
src/views/RMS/app.js

@@ -29,54 +29,6 @@ const apolloProvider = new VueApollo({
     defaultClient: apollo
 })
 
- //把时间戳改为正常可读的时间
- 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;
-  }
-}
-
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

+ 1 - 1
src/views/RMS/components/addCapacity.vue

@@ -7,7 +7,7 @@
         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
       </div>
       <div class="inputBox">
-    <span class="text">所属单位类型</span>
+    <span class="text">所属承运商</span>
       <el-autocomplete
         class="input"
         v-model="state"

+ 0 - 1
src/views/RMS/components/addCarDriver.vue

@@ -79,7 +79,6 @@
     </div>
 
     <div class="button_box">
->>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>

+ 273 - 222
src/views/RMS/components/addCarrier.vue

@@ -1,76 +1,101 @@
 <template>
   <!-- 添加承运商信息 -->
-  <div class="addWagonLoad">
-    <PageTitle @click="onClick">返回</PageTitle>
+  <div class="addCarrier">
+    <PageTitle>返回</PageTitle>
     <div class="user_code">
-      <span class="text">账号:</span>
-      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">账号</span>
+      <el-input
+        class="input"
+        placeholder="请输入账号(必填项)"
+        v-model="input"
+        clearable
+      >
+      </el-input>
     </div>
-    <div class="form-box" style="margin-right: 10rem">
+    <div class="form_box" style="margin-right: 10rem">
       <dil-form :formId="330" v-model="form1"></dil-form>
     </div>
     <el-upload
       class="upload-demo"
-      ref="upload"
-      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier1"
-      :on-preview="handlePreview"
-      :on-remove="handleRemove"
-      :file-list="fileList"
-      :before-upload="beforeUpload2"
+      ref="upload1"
+      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier1"
+      :before-upload="beforeUpload"
+      :multiple="false"
       list-type="picture"
+      :show-file-list="false"
+      :on-success="handleAvatarSuccess"
+      :on-error="onError(1)"
     >
-      <el-button size="small" type="primary">点击上传运输证</el-button>
-      <div slot="tip" class="el-upload__tip">
-        只能上传jpg/png文件,且不超过500kb
-      </div>
+      <span class="span"></span>
+      <el-input
+        class="shippingCertificate"
+        placeholder="请选择运输证(必填项)"
+        v-model="shippingCertificate"
+        disabled
+      >
+      </el-input>
+      <el-button size="small" type="primary" @click="upCLick(1)"
+        >点击上传运输证</el-button
+      >
     </el-upload>
     <el-upload
       class="upload-demo"
-      ref="upload"
-      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
-      :on-preview="handlePreview"
-      :on-remove="handleRemove"
-      :file-list="fileList"
-      :before-upload="beforeUpload2"
+      ref="upload2"
+      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier2"
+      :before-upload="beforeUpload"
+      :multiple="false"
       list-type="picture"
+      :show-file-list="false"
+      :on-success="handleAvatarSuccess"
+      :on-error="onError(2)"
     >
-      <el-button size="small" type="primary">点击上传经营许可证</el-button>
-      <div slot="tip" class="el-upload__tip">
-        只能上传jpg/png文件,且不超过500kb
-      </div>
+      <span class="span"></span>
+      <el-input
+        class="businessLicense"
+        placeholder="请选择经营许可证(必填项)"
+        v-model="businessLicense"
+        disabled
+      >
+      </el-input>
+      <el-button size="small" type="primary" @click="upCLick(2)"
+        >点击上传经营许可证</el-button
+      >
     </el-upload>
     <el-upload
       class="upload-demo"
-      ref="upload"
-      action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
-      :on-preview="handlePreview"
-      :on-remove="handleRemove"
-      :file-list="fileList"
-      :before-upload="beforeUpload2"
+      ref="upload3"
+      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier3"
+      :before-upload="beforeUpload"
+      :multiple="false"
       list-type="picture"
+      :show-file-list="false"
+      :on-success="handleAvatarSuccess"
+      :on-error="onError(3)"
     >
-      <el-button size="small" type="primary">点击上传营业执照</el-button>
-      <div slot="tip" class="el-upload__tip">
-        只能上传jpg/png文件,且不超过500kb
-      </div>
+      <span class="span"></span>
+      <el-input
+        class="businessLicense1"
+        placeholder="请选择营业执照(必填项)"
+        v-model="businessLicense1"
+        disabled
+      >
+      </el-input>
+      <el-button size="small" type="primary" @click="upCLick(3)"
+        >点击上传营业执照</el-button
+      >
     </el-upload>
     <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
-          >
-        </el-form-item>
-      </el-form>
+      <el-button
+        type="primary"
+        v-if="this.form1.carrierType == '销售承运商'"
+        @click="drawer = true"
+        >添加中标区域信息</el-button
+      >
     </div>
-    <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose"
-    >
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <el-button type="primary" class="btn" @click="onClick">
         <i class="el-icon-search"></i>查询
       </el-button>
       <div>
@@ -80,243 +105,269 @@
         ></dilTable>
       </div>
     </el-drawer>
-    <dilTable v-bind.sync="option1">
-      <el-table-column fixed="right" label="操作" align="center" width="200">
-        <template slot-scope="scope">
-          <el-button type="text" size="mini" @click="deleteclick(scope)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </dilTable>
-    <div class="button-box">
+    <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";
+import { sjTime } from "@/utils/sharedJsFile.js";
 export default {
   components: { PageTitle },
   data() {
     return {
+      //营业执照
+      businessLicense1: null,
+      //营业执照
+      businessLicense: null,
+      //运输证
+      shippingCertificate: null,
+      inputText: "",
+      direction: "rtl",
+      input: "",
       form1: {},
-      value: undefined,
       drawer: false,
-      carrierType: {},
-      carrierTransportType: {},
       options: {
         // first请求数据的地址
         requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
         selectionType: "radio",
         mapList: [],
-        registerDate: "",
-        mapValue: "",
       },
       imageUrl1: "",
       imageUrl2: "",
       imageUrl3: "",
-      imageUrls: [],
+      num: null,
+      upBool: false,
+      bidAreaId: null,
+    };
+  },
+  created() {
+    this.form1 = {
+      carrierType: null,
     };
   },
   methods: {
-    beforeUpload2(file) {
+    upCLick(val) {
+      this.num = val;
+    },
+    beforeUpload(file) {
+      this.upBool = true;
       const isLt2M = file.size < 1024 * 1024 * 0.5;
-      console.log("大小" + isLt2M);
       if (!isLt2M) {
         this.$message.error("上传文件大小不能超过500kb!");
+      } else {
+        let size = file.size / 1024;
+        let _URL = window.URL || window.webkitURL;
+        let img = new Image();
+        img.src = _URL.createObjectURL(file);
       }
-      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);
+    onError(err) {
+      if (this.upBool) {
+        if (this.num == 1) {
+          this.shippingCertificate = null;
+          this.imageUrl1 = null;
+          this.$message.error("上传失败");
+        } else if (this.num == 2) {
+          this.businessLicense = null;
+          this.imageUrl2 = null;
+          this.$message.error("上传失败");
+        } else if (this.num == 3) {
+          this.businessLicense1 = null;
+          this.imageUrl3 = null;
+          this.$message.error("上传失败");
+        }
+      }
     },
-    handlePreview(file) {
-      console.log("*********" + file);
+    handleAvatarSuccess(res, file) {
+      if (res.code) {
+        this.upBool = false;
+        if (this.num == 1) {
+          this.imageUrl1 = URL.createObjectURL(file.raw);
+          this.shippingCertificate = file.name;
+        } else if (this.num == 2) {
+          this.imageUrl2 = URL.createObjectURL(file.raw);
+          this.businessLicense = file.name;
+        } else if (this.num == 3) {
+          this.imageUrl3 = URL.createObjectURL(file.raw);
+          this.businessLicense1 = file.name;
+        }
+        this.$message.success("上传成功");
+      }
     },
-
-    onclick() {
+    onClick() {
       this.options.requestUrl =
         "/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" + this.inputText;
     },
     currentRadioChange(selection) {
-      (this.mapList = selection), (this.bidArea = this.mapList.bidArea);
+      this.bidAreaId = selection.bidAreaId;
     },
     makeSure() {
-      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,
-      };
-      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,
-        imageUrls: imageUrls,
-      };
-      if (reg.test(RmsCarrier.carrierContactNumber) == false)
-        this.$message.error("输入的格式不正确");
-      else if (
-        RmsCarrier.carrierName == null ||
-        // imageUrls.imageUrl1 ==null ||
-        // imageUrls.imageUrl2 ==null ||
-        // imageUrls.imageUrl3 ==null ||
+      let status = false;
+      if (!this.input) {
+        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 {
+        status = true;
+      }
+      if (this.form1.registerDate) {
+        this.form1.registerDate = sjTime(this.form1.registerDate);
+      }
+      if (status) {
+        let rand = "";
+        for (let i = 0; i < 8; i++) {
+          rand += Math.floor(Math.random() * 10);
+        }
+        let fromData = new FormData();
+        fromData.append("userCode", this.input);
+        fromData.append("userName", this.form1.carrierName);
+        fromData.append("orgCode", "chengyunshang");
+        fromData.append("mobile", "133" + rand);
+        fromData.append("email", "133" + rand + "@163.com");
+        fromData.append("orgName", "承运商");
+        fromData.append("groupId", "506514577756917769");
+        fromData.append("companyId", "713710108567277568");
+        fromData.append("orgId", "924126339513061376");
 
-        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.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复!");
-          }
-          this.$refs["table"].resetField();
-        });
+        this.$store
+          .dispatch("system/usersManage/addUser", fromData)
+          .then((res) => {
+            if (res.code === "0") {
+              let userId = res.data.userId;
+              this.axios
+                .post(
+                  "pass/v1/sysuserroles/addUserroles?userId=" +
+                    userId +
+                    "&userCode=" +
+                    this.input +
+                    "&roleId=924449091658846208"
+                )
+                .then((res) => {
+                  if (res.code == "0") {
+                    let imageUrls = {
+                      imageUrl1: this.imageUrl1,
+                      imageUrl2: this.imageUrl2,
+                      imageUrl3: this.imageUrl3,
+                    };
+                    let mapValue = {
+                      from: this.form1,
+                      imageUrls: imageUrls,
+                      userId: userId,
+                    };
+                    this.axios
+                      .post("/api/v1/rms/insertCarrier", mapValue)
+                      .then((res) => {
+                        if (res.data.code == "200") {
+                          this.$message.success("添加成功");
+                        } else {
+                          this.$message.error("添加失败");
+                        }
+                      })
+                      .catch(() => {
+                        this.axios
+                          .delete("pass/v1/sysusers/" + userId)
+                          .then((res) => {
+                            console.log(res.data, "data");
+                          });
+                      });
+                  }
+                });
+            }
+          });
+      }
     },
-    // // 取消
+    // 取消   
     cancel() {
-      this.$router.go(-1);
+      this.$router.push("/carrier");
     },
   },
 };
 </script>
 <style lang='scss' >
-.user_code {
-  display: flex;
-  justify-content: center;
-  .text{
-    display: flex;
-    align-items: center;
-  }
-  .input{
-    width: 250px;
-  }
-}
-.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 {
+.addCarrier {
+  .user_code {
     display: flex;
     justify-content: center;
-
-    .el-form-item__label {
+    .text {
       display: flex;
+      justify-content: center;
       align-items: center;
+      margin-right: 15px;
+    }
+    .input {
+      width: 250px;
     }
-    .el-form-item__content {
-      .el-input {
+  }
+  .form_box {
+    display: flex;
+    justify-content: center;
+    margin-left: 170px;
+    margin-top: 15px;
+    .el-form-item {
+      display: flex;
+      justify-content: center;
+      .el-form-item__label {
+        display: flex;
+        align-items: center;
+      }
+      .el-form-item__content {
+        width: 250px;
+        .el-radio-group {
+          width: 500px;
+        }
+        .el-date-editor {
+          width: 250px;
+        }
         .el-input__inner {
           width: 250px;
         }
       }
     }
   }
-}
-.upload-demo {
-  display: flex;
-  justify-content: center;
-  padding-bottom: 1rem;
-  .el-upload__tip {
+  .upload-demo {
+    display: flex;
+    justify-content: center;
+    margin: 10px;
+    .span {
+      display: inline-block;
+      width: 200px;
+      height: 2px;
+    }
+    .el-button {
+      width: 150px;
+      margin-right: 10px;
+    }
+    .shippingCertificate,
+    .businessLicense,
+    .businessLicense1 {
+      width: 250px;
+    }
+  }
+  .form-box {
     display: flex;
     justify-content: center;
   }
-  .el-button el-button--primary el-button--small {
+  .button_box {
     display: flex;
     justify-content: center;
-    word-wrap: break-word;
+    margin: 20px;
+    .el-button {
+      width: 100px;
+    }
   }
 }
 </style>

+ 0 - 1
src/views/RMS/components/addMaterial.vue

@@ -4,7 +4,6 @@
     <PageTitle>返回</PageTitle>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
-
       </div>
         <div class="form-box f1">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">

+ 25 - 37
src/views/RMS/components/carrier.vue

@@ -2,15 +2,12 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input
-        placeholder="请输入内容"
-        v-model="inputText"
-        clearable>
+      <el-input placeholder="请输入内容" v-model="inputText" 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">
+      <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
     </div>
@@ -18,18 +15,10 @@
       <dilTable v-bind.sync="options">
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="updateCarrier(scope)"
-            >
+            <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>
           </template>
@@ -41,29 +30,29 @@
 
 <script>
 export default {
-  data(){
-    return{
-      inputText:"",
-      options:{
+  data() {
+    return {
+      inputText: "",
+      options: {
         // first请求数据的地址
         requestUrl: "/api/v1/rms/getCarrierList?apiId=342",
       },
-    }
+    };
   },
-  methods:{
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=342&con=" + this.inputText;
-      console.log(this.textInput)
+  methods: {
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getCarrierList?apiId=342&con=" + this.inputText;
+      console.log(this.textInput);
     },
-     toInsert() {
+    toInsert() {
       this.$router.push("/addCarrier");
-
     },
-    updateCarrier(scope){
-      console.log(scope.row.settlementId)
-      this.$router.push("/editCarrier/"+scope.row.carrierId)
+    updateCarrier(scope) {
+      console.log(scope.row.settlementId);
+      this.$router.push("/editCarrier/" + scope.row.carrierId);
     },
-    deleteCarrier(scope){
+    deleteCarrier(scope) {
       this.$confirm("是否删除", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -78,7 +67,7 @@ export default {
                 this.$message({
                   type: "success",
                   message: "删除成功!",
-                });     
+                });
                 this.$router.go(0);
               } else {
                 this.$message({
@@ -95,19 +84,18 @@ export default {
           });
         });
     },
-    },
-  }
-
+  },
+};
 </script>
 
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;
     }
   }
-  }
+}
 </style>

+ 70 - 6
src/views/RMS/components/editCapacity.vue

@@ -10,12 +10,42 @@
           <dil-form :formId="310" v-model="form1"></dil-form>
       </div>
     </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
+</div>
+        <div class="form-box f1">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+<div class="disableBox">
+  <el-form-item>
+     <el-input
+        placeholder=""
+        v-model="carrierName"
+        :disabled="true">
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
+  </el-form-item>
+  </div>
+   </el-form>
+    </div>
+  <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
+</el-drawer>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
-</div>
+
 </template>
 
 <script>
@@ -25,7 +55,16 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      drawer: false,
+      direction: 'rtl',
+      inputText:"",
       form1: {},
+      carrierName:"",
+    options:{
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
+        selectionType:"radio",
+        mapList:[]
+      }
     };
   },
   mounted() {
@@ -33,10 +72,18 @@ export default {
     this.information();
   },
   methods: {
+    currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.carrierName=this.mapList.carrierName
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    },
     information() {
       //编辑 
 console.log(this.$route.params)            
-
+     
       this.axios
         .post(
           "/api/v1/rms/getCapacityById/" +
@@ -51,7 +98,16 @@ console.log(this.$route.params)
             console.log(e);
             console.log(this.form1);
             console.log( this.$route.params.capacityId);
-          });
+          }); 
+ this.axios
+        .post(
+          "/api/v1/rms/getCarrierNameById/" +
+          this.$route.params.capacityId
+        )
+        .then((res) => {
+          this.carrierName=res.data.data.carrierName
+          console.log("carrierName",this.carrierName);
+        }); 
         });
     },
     // 返回
@@ -69,7 +125,7 @@ console.log(this.$route.params)
          capacityOwneris:this.form1.capacityOwneris,
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.form1.carrierId,
+         carrierId:this.mapList.carrierId,
        };if(
          RmsCapacity.capacityNumber==null ||
          RmsCapacity.capacityCorlor==null ||
@@ -125,4 +181,12 @@ console.log(this.$route.params)
       margin-right: 10px;
     }
  }
+ .disableBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.5rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 63 - 3
src/views/RMS/components/editCarDriver.vue

@@ -9,8 +9,34 @@
           <dil-form :formId="340" v-model="form1"></dil-form>
       </div>
     </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
+     <div class="form-box f1">
+          <el-form :inline="true" :model="formInline" class="demo-form-inline">
+<div class="disableBox">
+  <el-form-item>
+    <el-input v-model="carrierName" disabled>  
+    </el-input>
+  </el-form-item>
+  <el-form-item>
+    <el-button type="primary" @click="drawer = true">所属承运商</el-button>
+  </el-form-item>
+  </div>
+   </el-form>
+    </div>
+  <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+            <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
+</el-drawer>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
   </div>
@@ -23,7 +49,16 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      drawer: false,
+      direction: 'rtl',
+      inputText:"",
       form1: {},
+     carrierName:"",
+ options:{
+        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
+        selectionType:"radio",
+        mapList:[]
+      }
     };
   },
   mounted() {
@@ -31,6 +66,14 @@ export default {
     this.information();
   },
   methods: {
+    currentRadioChange(selection){
+      this.mapList=selection,
+      console.log(this.mapList)
+      this.carrierName=this.mapList.carrierName
+    },
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    },
     information() {
       //编辑
       this.axios
@@ -47,6 +90,15 @@ export default {
             console.log(this.$route.params.driverId);
           });
         });
+    this.axios
+        .post(
+          "/api/v1/rms/getCarrierNameByDriverId/" +
+          this.$route.params.driverId
+        )
+        .then((res) => {
+          this.carrierName=res.data.data.carrierName
+          console.log("carrierName",this.carrierName);
+        }); 
     },
     // 返回
     onClickCancel() {
@@ -63,7 +115,7 @@ export default {
        driverIdentityCard:this.form1.driverIdentityCard,
        driverPhone:this.form1.driverPhone,
        transportTypeId:this.form1.transportTypeId,
-       carrierId:this.form1.carrierId,
+       carrierId:this.mapList.carrierId,
        driverPermitNo:this.form1.driverPermitNo,
        driverLicence:this.form1.driverLicence,
        driverLicence:this.form1.driverLicence,
@@ -137,4 +189,12 @@ export default {
       margin-right: 10px;
     }
   }
+  .disableBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1.5rem;
+  margin-bottom: 1.25rem;
+}
 </style>

+ 9 - 9
src/views/TMS/components/importedFuel/transportReserveFuAdd.vue

@@ -67,14 +67,14 @@
       <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        style="margin-top: 10px; margin-left: 20px"
         clearable
       ></el-input>
       <el-button
         type="primary"
         class="btn"
         @click="onclick(a)"
-        style="margin-bottom: 0.9375rem"
+        style="margin-bottom: 15px"
       >
         <i class="el-icon-search"></i>查询
       </el-button>
@@ -331,20 +331,20 @@ export default {
   display: flex;
   align-items: center;
   justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+  margin-top: 5px;
+  margin-bottom: 20px;
 }
 .material {
   .text {
     display: inline-block;
-    width: 10rem;
+    width: 160px;
     text-align: right;
   }
 }
 .forwardingUnit {
   .text {
     display: inline-block;
-    width: 10rem;
+    width: 160px;
     text-align: right;
   }
 }
@@ -354,11 +354,11 @@ export default {
     width: 96%;
     .text {
       display: inline-block;
-      width: 9.375rem;
+      width: 150px;
       text-align: right;
     }
     .truckBtn {
-      width: 17.5rem;
+      width: 280px;
     }
   }
 }
@@ -367,6 +367,6 @@ export default {
   justify-content: center;
   align-items: center;
   width: 100%;
-  height: 6.25rem;
+  height: 100px;
 }
 </style>

+ 82 - 0
src/views/index/components/download.vue

@@ -0,0 +1,82 @@
+<template>
+     <div class="content" v-bind:style="{backgroundImage:'url(' + bg + ')'}" iud="body">
+        <img v-show="show_wx" :src="wx"   width="100%"  /> 
+        <!-- <img  :src="logo" style="margin:100px auto auto 150px;text-align:center; height:100px; width:85px;"  />  -->
+        <img   style="margin:90% auto auto 25%; height:8%; width:50%;"  :src="btn" id="btn_img" @click="download()"/>
+    </div> 
+</template> 
+
+<script>
+
+export default {
+    data() {
+        return {
+            type : "android",
+            // logo:require('@/assets/img/logoApp.png'),
+            wx:require('@/assets/download/image.png'),
+            btn:require('@/assets/download/down.png'),
+            show_wx :false,
+             bg: require('@/assets/download/login.png'),
+        };
+    },
+    created() {
+
+        let ua = navigator.userAgent.toLowerCase();
+
+        if (/iphone|ipad|ipod/.test(ua)) {
+
+            this.type = "ios";
+
+        } else if (/android/.test(ua)) {
+            this.type = "android";
+        }
+
+        if(isWeixinBrowser()){
+            this.show_wx = true;
+        }
+        function isWeixinBrowser() {
+            return (/micromessenger/.test(ua)) ? true : false;
+        }
+    },
+
+    methods: {
+
+        download() {
+
+            const that = this;
+
+            if(that.type == 'android') {
+
+                window.location.href = 'https://wl.dasteel.cn:32322 /%E6%95%B0%E8%A3%81%E7%89%A9%E6%B5%81.apk';
+                
+
+            } else {
+
+                window.location.href = 'IOS下载地址';
+
+            }
+
+        },
+
+    }
+
+};
+
+</script>
+<style>
+    .content {
+        position:relative;
+        margin:0px auto;
+        background-size: cover;
+        width: 100%;
+        height: 100%;
+ }
+
+
+
+
+div img:first-of-type { 
+    position: absolute; 
+   
+} 
+</style>

+ 12 - 1
src/views/index/router/index.js

@@ -6,7 +6,9 @@ import routerBefore from '@/config/routerBefore.js'
 import main from '@/components/main.vue'
 
 // 登录
-import login from '@/views/index/components/login.vue'
+import login from '@/views/index/components/login.vue'// 登录
+import download from '@/views/index/components/download.vue'
+
 
 // 网页登录不可访问
 import page404 from '@/views/index/components/page404.vue'
@@ -23,6 +25,15 @@ export const constantRouterMap = [{
         },
         component: login
     },
+    
+    {
+        path: '/download',
+        name: 'download',
+        meta: {
+            'title': '下载'
+        },
+        component: download
+    },
     {
         path: '/login',
         name: 'login',

+ 5 - 4
src/views/systemConfig/components/organizManage.vue

@@ -1184,7 +1184,7 @@ export default {
                               )
                               .then((res) => {
                                 if (res.code === "0") {
-                                  this.$message.success("保存失败");
+                                  this.$message.error("保存失败");
                                   this.$router.go(0);
                                 }
                               });
@@ -1195,7 +1195,7 @@ export default {
                             .dispatch("system/organizManage/delOrg", map.orgId)
                             .then((res) => {
                               if (res.code === "0") {
-                                this.$message.success("保存失败");
+                                this.$message.error("保存失败");
                                 this.$router.go(0);
                               }
                             });
@@ -1261,6 +1261,7 @@ export default {
                     depType: res.data.depType,
                     orgName: res.data.orgName,
                     pId: pId,
+                    orgCode:res.data.orgCode,
                   };
                   //调用物流系统的资源管理模块的接口,新增组织机构。
                   this.axios
@@ -1274,7 +1275,7 @@ export default {
                           .dispatch("system/organizManage/delOrg", map.orgId)
                           .then((res) => {
                             if (res.code === "0") {
-                              this.$message.success("新增失败");
+                              this.$message.error("新增失败");
                               this.$router.go(0);
                             }
                           });
@@ -1285,7 +1286,7 @@ export default {
                         .dispatch("system/organizManage/delOrg", map.orgId)
                         .then((res) => {
                           if (res.code === "0") {
-                            this.$message.success("新增失败");
+                            this.$message.error("新增失败");
                             this.$router.go(0);
                           }
                         });

+ 1 - 0
src/views/systemConfig/components/usersManage.vue

@@ -1138,6 +1138,7 @@ export default {
         type: "warning",
       })
         .then(() => {
+          console.log(items)
           this.store
             .dispatch("system/usersManage/delUser", items)
             .then((res) => {