Página inicial Explorar Ajuda
Entrar
DAL-DAZHOU
/
icore-pass
9
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

上传

zouzhd 3 anos atrás
pai
6b321e872e 3a1ffa6a06
commit
ac45a552da
25 arquivos alterados com 643 adições e 652 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 1 1
      build/utils.js
  2. BIN
      dist.zip
  3. 1 3
      index.html
  4. 0 1
      src/components/DilCommonUI/packages/form/src/form-item.vue
  5. 0 14
      src/js/QueueStartList.js
  6. 0 47
      src/js/sharedJsFile.js
  7. 0 48
      src/views/RMS/app.js
  8. 1 119
      src/views/RMS/components/addCarDriver.vue
  9. 314 222
      src/views/RMS/components/addCarrier.vue
  10. 2 1
      src/views/RMS/components/addMaterial.vue
  11. 13 4
      src/views/RMS/components/capacity.vue
  12. 2 2
      src/views/RMS/components/carDriver.vue
  13. 26 38
      src/views/RMS/components/carrier.vue
  14. 5 5
      src/views/RMS/components/editCapacity.vue
  15. 20 18
      src/views/RMS/components/editCarrier.vue
  16. 58 13
      src/views/RMS/components/editRawWarehouse.vue
  17. 9 9
      src/views/TMS/components/importedFuel/transportReserveFuAdd.vue
  18. 1 9
      src/views/homepage/app.js
  19. 4 75
      src/views/homepage/components/homepage.vue
  20. 2 0
      src/views/index/components/login.vue
  21. 4 3
      src/views/sale/components/transport_appointment/directionalDispatch.vue
  22. 79 14
      src/views/sale/components/transport_appointment/openDistribution.vue
  23. 95 2
      src/views/sale/components/transport_order/receiveOrder.vue
  24. 5 4
      src/views/systemConfig/components/organizManage.vue
  25. 1 0
      src/views/systemConfig/components/usersManage.vue

+ 1 - 1
build/utils.js
Ver arquivo 

@@ -31,7 +31,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 
 // let devModules = ['index','inward','SporadicManage']
 
 // let devModules = ['all'];
 
-let devModules = ['index','appoint','sale','RMS','systemConfig']
 
+let devModules = ['index','appoint','sale','systemConfig','RMS']
 
 
 if (pathSrc.indexOf('node_modules') > -1) {
 
     devModules = require('../../../cors.js').devModules;

BIN
dist.zip
Ver arquivo


+ 1 - 3
index.html
Ver arquivo 

@@ -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/index.html';
 
     </script>
 
   </head>
 
   <body>

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

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

+ 0 - 14
src/js/QueueStartList.js
Ver arquivo 

@@ -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
Ver arquivo 

@@ -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;
 
-    }
 
-  }

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

@@ -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 - 119
src/views/RMS/components/addCarDriver.vue
Ver arquivo 

@@ -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;

+ 314 - 222
src/views/RMS/components/addCarrier.vue
Ver arquivo 

@@ -1,76 +1,111 @@
 
 <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="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">
 
+    <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 +115,300 @@
 
         ></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 {
 
+      user_Name:'',
 
+      //营业执照
 
+      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) {
 
+    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;
 
+    },
 
+    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;
 
+      this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
 
+      if (!this.input) {
 
+        this.$message.error("账号不能为空");
 
+      } 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.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) {
 
+        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.user_Name);
 
+        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) => {
 
+            console.log(1)
 
+            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) => {
 
+                  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.axios
 
+                          .delete("pass/v1/sysusers/" + userId)
 
+                          .then((res) => {
 
+                            this.$message.error("添加失败");
 
+                          });
 
+                        }
 
+                      })
 
+                      .catch(() => {
 
+                        this.axios
 
+                          .delete("pass/v1/sysusers/" + userId)
 
+                          .then((res) => {
 
+                            this.$message.error("添加失败");
 
+                          });
 
+                      });
 
+                  }
 
+                });
 
+            }
 
+          });
 
+      }
 
     },
 
-    // // 取消
 
+    // 取消   
     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 {
 
+    margin: 10px;
 
+    .text {
 
       display: flex;
 
+      justify-content: center;
 
       align-items: center;
 
+      margin-right: 10px;
 
+    }
 
+    .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>

+ 2 - 1
src/views/RMS/components/addMaterial.vue
Ver arquivo 

@@ -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
Ver arquivo 

@@ -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
Ver arquivo 

@@ -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() {

+ 26 - 38
src/views/RMS/components/carrier.vue
Ver arquivo 

@@ -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,20 +15,12 @@
 
       <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>
 
+            </el-button> -->
 
           </template>
 
         </el-table-column>
 
       </dilTable>
 
@@ -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>

+ 5 - 5
src/views/RMS/components/editCapacity.vue
Ver arquivo 

@@ -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
Ver arquivo 

@@ -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
Ver arquivo 

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

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

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

+ 1 - 9
src/views/homepage/app.js
Ver arquivo 

@@ -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
Ver arquivo 

@@ -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
Ver arquivo 

@@ -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取值添加

+ 4 - 3
src/views/sale/components/transport_appointment/directionalDispatch.vue
Ver arquivo 

@@ -78,7 +78,7 @@
 
             <el-form label-position="center" inline class="demo-table-expand">
 
               <div v-if="false">{{ props }}</div>
 
               <div>
 
-                <el-table :data="tableData" border >
 
+                <el-table :data="tableData1" border >
 
                   <el-table-column
 
                     v-for="(item, i) in tableHead"
 
                     :key="i"
 
@@ -168,8 +168,8 @@ export default {
 
         },
 
         {
 
           prop: "materialNumber",
 
-          label: "物资件数",
 
-          width: 100,
 
+          label: "物资数量(件数/重量)",
 
+          width: 150,
 
         },
 
         // {
 
         //   prop: "materialWeight",
 
@@ -229,6 +229,7 @@ export default {
 
     //监听模态框点击事件
 
     currentRadioChange1(row) {
 
       this.carrierId = row.carrierId;
 
+      console.log("this.carrierId",this.carrierId)
 
     },
 
     //模糊查询承运商
 
     onclick(){

+ 79 - 14
src/views/sale/components/transport_appointment/openDistribution.vue
Ver arquivo 

@@ -14,14 +14,14 @@
 
     <div class="table">
 
       <el-tabs v-model="activeName" @tab-click="handleClick">
 
       <!-- 未抢单 -->
 
-      	<el-tab-pane label="未接收" name="first">
 
-						  <dilTable v-bind.sync="first">
 
-             <el-table-column fixed="right" label="操作" width="50">
 
+      	<el-tab-pane label="未接收" name="first" >
 
+						  <dilTable v-bind.sync="first" ref="table">
 
+             <el-table-column fixed="right" label="操作" width="120">
 
         <template slot-scope="scope">
 
           <el-button @click="Grab(scope)" type="text" size="small">
 
             接收
 
           </el-button>
 
-          <el-button @click="detailclick1(scope.row)" type="text" size="small">
 
+          <el-button @click="detailclick(scope.row)" type="text" size="small">
 
             物资详情
 
           </el-button>
 
         </template>
 
@@ -51,11 +51,13 @@
 
 		</el-tab-pane>
 
      	<el-tab-pane label="已接收" name="second">
 
 				<dilTable v-bind.sync="second">
 
-          <el-table-column fixed="right" label="操作" width="50">
 
+          <el-table-column fixed="right" label="操作" width="120">
 
             <template slot-scope="scope">
 
           <el-button @click="dispatch(scope)  " type="text" size="small">
 
-            <!-- ,handleBtnClick1() -->
 
             派单
 
+          </el-button>
 
+          <el-button @click="detailclick1(scope.row)" type="text" size="small">
 
+            物资详情
 
           </el-button>
 
             </template>
 
       </el-table-column>
 
@@ -84,6 +86,7 @@ export default {
 
   data(){
 
     return{
 
       drawer: false,
 
+      ssoId:null,
 
 			direction: 'rtl',
 
       activeName: "first",
 
       inputText:"",
 
@@ -91,10 +94,10 @@ export default {
 
       input:"",
 
       first:{
 
         // first请求数据的地址
 
-        requestUrl: "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0",
 
+        requestUrl: "",
 
       },
 
       second:{
 
-        requestUrl:"/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSSOId="+ getCookie('userId'),
 
+        requestUrl:"",
 
       },
 
       third:{
 
         requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246",
 
@@ -132,19 +135,44 @@ export default {
 
         },
 
       ],
 
       tableData: [],
 
+      tableData1: [],
 
     }
 
   },
 
+  created(){
 
+      this.firstGetRequestUrl();
 
+      this.secondGetRequestUrl();
 
+  },
 
   methods:{
 
       handleClick(tab, event) {
 
       console.log(tab, event);
 
+    },
 
+    firstGetRequestUrl(){
 
+    if(getCookie("orgCode") == "chengyunshang"){
 
+      console.log("enter",getCookie('userId'))
 
+      this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId="+ getCookie('userId');
 
+    }else{
 
+      console.log("out",this.ssoId)
 
+     this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" + this.ssoId;
 
+    }
 
+
 
+    },
 
+    secondGetRequestUrl(){
 
+    if(getCookie("orgCode") == "chengyunshang"){
 
+      console.log("enter",getCookie('userId'))
 
+      this.second.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId="+ getCookie('userId');
 
+    }else{
 
+            console.log("out",this.ssoId)
 
+     this.second.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" + this.ssoId;
 
+    }
 
+
 
     },
 
     onclick1(){
 
-       if(this.activeName == "first"){
 
-        this.option1.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&con=" + this.input;
 
-      }else if
 
+       if(this.activeName == "first"){
 
+         this.option1.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&con=" + this.input;
 
+      }else if
 
         (this.activeName == "second"){
 
-        this.option2.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierId=1&con=" + this.input;
 
-      }
 
+        this.option2.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierId=1&con=" + this.input;
 
+    }
 
     },
 
     dispatch(scope){
 
       this.dispatchId = scope.row.dispatchId
 
@@ -204,8 +232,14 @@ export default {
 
         center: true,
 
       })
 
         .then(() => {
 
+          var carrierSsoId = '';
 
+          if(getCookie("orgCode") == "chengyunshang"){
 
+            carrierSsoId =  getCookie('userId');
 
+          }else{
 
+            carrierSsoId = null;
 
+          }
 
           this.axios
 
-            .post("/api/v1/ams/lockDispatchSaleOrder?dispatchId="+ scope.row.dispatchId+"&carrierId=" + 73)
 
+            .post("/api/v1/ams/lockDispatchSaleOrder?dispatchId="+ scope.row.dispatchId+"&carrierSsoId=" + carrierSsoId)
 
             .then((res) => {
 
               if (res.data.code == 200) {
 
                 this.$message({
 
@@ -263,6 +297,37 @@ export default {
 
         });
 
     },
 
 
+    // -------查看物资详情(已接收)
 
+    detailclick1(row) {
 
+      // 记录重复点击次数
 
+      if (this.oldRow1 === row) {
 
+        this.oldRowCount1 += 1;
 
+      }
 
+      // 切换当前详情表
 
+      this.$refs.table1.toggleRowExpansion(row);
 
+      // 打开前关闭上一个详情表
 
+      if (this.oldRow1 != "") {
 
+        if (this.oldRow1 != row) {
 
+          if (this.oldRowCount1 % 2 === 1) {
 
+            this.$refs.table1.toggleRowExpansion(this.oldRow);
 
+          } else {
 
+            this.oldRowCount1 = 1;
 
+          }
 
+        } else {
 
+          this.oldRow1 = null;
 
+          return;
 
+        }
 
+      }
 
+      // 重置上一个点击对象
 
+      this.oldRow1 = row;
 
+      // 根据销售订单物资中间表id查询物资信息
 
+      this.axios
 
+        .post("/api/v1/ams/getDispatchMaterialList?dispatchId=" +dispatchId)
 
+        .then((res) => {
 
+          this.tableData1 = res.data.data;
 
+        });
 
+    },
 
+
 
   }
 
 }
 
 </script>

+ 95 - 2
src/views/sale/components/transport_order/receiveOrder.vue
Ver arquivo 

@@ -11,14 +11,43 @@
 
 		<template>
 
 			<div>
 
 				<el-tabs v-model="activeName" @tab-click="handleClick">
 
+					<!-- 已接收 -->
 
 					<el-tab-pane label="已接收" name="first">
 
-						<dilTable v-bind.sync="first" >
 
+						<dilTable v-bind.sync="first" ref="table">
 
+							<el-table-column fixed="right" label="操作" width="50">
 
+								<template slot-scope="scope">
 
+								<el-button @click="detailclick1(scope.row)" type="text" size="small">
 
+									物资详情
 
+								</el-button>
 
+								</template>
 
+							</el-table-column>
 
+							 <!-- 物资详情抽屉 -->
 
+							<el-table-column type="expand" width="1">
 
+							<template slot-scope="props">
 
+								<el-form label-position="center" inline class="demo-table-expand">
 
+								<div v-if="false">{{ props }}</div>
 
+								<div>
 
+									<el-table :data="tableData" border >
 
+									<el-table-column
 
+										v-for="(item, i) in tableHead"
 
+										:key="i"
 
+										:prop="item.prop"
 
+										:label="item.label"
 
+										:width="item.width"
 
+									></el-table-column>
 
+									</el-table>
 
+								</div>
 
+								</el-form>
 
+							</template>
 
+							</el-table-column>
 
 						</dilTable>
 
 					</el-tab-pane>
 
+					<!-- 已拒绝 -->
 
 					<el-tab-pane label="已拒绝" name="second">
 
 						<dilTable v-bind.sync="second">
 
 						</dilTable>
 
 					</el-tab-pane>
 
+					<!-- 未接收 -->
 
 					<el-tab-pane label="未接收" name="third">
 
 						<dilTable v-bind.sync="third">
 
 						</dilTable>
 
@@ -47,6 +76,37 @@
 
 					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=73",
 
 				},
 
 				activeName: "first",
 
+				//记录旧的row对象(未接收)
 
+				oldRow: "",
 
+				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
 
+				oldRowCount: 1,
 
+				//记录旧的row对象(已接收)
 
+				oldRow1: "",
 
+				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
 
+				oldRowCount1: 1,
 
+				tableHead: [
 
+					{
 
+					prop: "materialName",
 
+					label: "物资名称",
 
+					width: 150,
 
+					},
 
+					{
 
+					prop: "specificationModel",
 
+					label: "规格型号",
 
+					width: 150,
 
+					},
 
+					{
 
+					prop: "materialNumber",
 
+					label: "物资件数",
 
+					width: 100,
 
+					},
 
+					{
 
+					prop: "materialWeight",
 
+					label: "物资重量",
 
+					width: 100,
 
+					},
 
+				],
 
+				tableData: [],
 
 			}
 
 		},
 
 		methods: {
 
@@ -60,7 +120,40 @@
 
 		  }
 
         
       
-		 }
 
+		 },
 
+		// -------查看物资详情(未接收)
 
+		detailclick(row) {
 
+		// 记录重复点击次数
 
+		if (this.oldRow === row) {
 
+			this.oldRowCount += 1;
 
+		}
 
+		// 切换当前详情表
 
+		this.$refs.table.toggleRowExpansion(row);
 
+		// 打开前关闭上一个详情表
 
+		if (this.oldRow != "") {
 
+			if (this.oldRow != row) {
 
+			if (this.oldRowCount % 2 === 1) {
 
+				this.$refs.table.toggleRowExpansion(this.oldRow);
 
+			} else {
 
+				this.oldRowCount = 1;
 
+			}
 
+			} else {
 
+			this.oldRow = null;
 
+			return;
 
+			}
 
+		}
 
+		// 重置上一个点击对象
 
+		this.oldRow = row;
 
+		this.getMaterial(row.dispatchId);
 
+		},
 
+		// 根据销售订单物资中间表id查询物资信息
 
+		getMaterial(dispatchId) {
 
+		this.axios
 
+			.post("/api/v1/ams/getDispatchMaterialList?dispatchId=" +dispatchId)
 
+			.then((res) => {
 
+			this.tableData = res.data.data;
 
+			});
 
+		},
 
 		 }
 
 	}
 
 </script>

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

@@ -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
Ver arquivo 

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