3 lat temu · 6b321e872e
--- a/build/utils.js
+++ b/build/utils.js
@@ -3,7 +3,6 @@ const path = require('path')
 
				 const config = require('../config')
			
 
				 const ExtractTextPlugin = require('extract-text-webpack-plugin')
			
 
				 const packageConfig = require('../package.json')
			
 
				-
			
 
				 const HtmlWebpackPlugin = require('html-webpack-plugin');
			
 
				 const merge = require('webpack-merge');
			
 
				 const glob = require('glob');
			
@@ -18,14 +17,12 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
				 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
			
 
				 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
			
 
				 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
			
 
				-
			
 
				 // let devModules = ['all'];
			
 
				 // let devModules = ['index','TMS','RMS']
			
 
				 // let devModules = ['index','SporadicManage','TMS']
			
 
				 // let devModules = ['index','SporadicManage'];
			
 
				 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
			
 
				 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
			
 
				-
			
 
				  //let devModules = ['all'];
			
 
				 // let devModules = ['index','RMS']
			
 
				 //let devModules = ['index','SporadicManage','TMS']
			
@@ -36,7 +33,6 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
				 // let devModules = ['all'];
			
 
				 let devModules = ['index','appoint','sale','RMS','systemConfig']
			
 
				 
			
 
				-
			
 
				 if (pathSrc.indexOf('node_modules') > -1) {
			
 
				     devModules = require('../../../cors.js').devModules;
			
 
				 }
			
--- a/config/index.js
+++ b/config/index.js
@@ -56,14 +56,14 @@ let proxyTable = {
 
				   },
			
 
				   // 所有数据的请求域名地址
			
 
				   "/api/v1": {
			
 
				-    target: "http://172.16.33.166:8080",
			
 
				+    target: "http://192.168.1.114:8080",
			
 
				     ws: true,
			
 
				     pathRewrite: {
			
 
				       "^/api/v1": "/api/v1"
			
 
				     }
			
 
				   },
			
 
				   "/views/api/v1": {
			
 
				-    target: "http://172.16.33.166:8080",
			
 
				+    target: "http://192.168.1.114:8080",
			
 
				     ws: true,
			
 
				     pathRewrite: {
			
 
				       "^/views/api/v1": "/api/v1"
			
--- a/dist.zip
+++ b/dist.zip
--- a/index.html
+++ b/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>
			
--- a/src/assets/download/down.png
+++ b/src/assets/download/down.png
--- a/src/assets/download/image.png
+++ b/src/assets/download/image.png
--- a/src/assets/download/login.png
+++ b/src/assets/download/login.png
--- a/src/components/DilCommonUI/packages/form/src/form-item.vue
+++ b/src/components/DilCommonUI/packages/form/src/form-item.vue
@@ -168,4 +168,5 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 
			
 
				-<style></style>
			
 
				+<style>
			
 
				+</style>
			
--- a/src/config/routerBefore.js
+++ b/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)
			
 
				     }
			
 
				   });
			
--- a/src/views/RMS/components/addCapacity.vue
+++ b/src/views/RMS/components/addCapacity.vue
@@ -2,22 +2,23 @@
 
				   <!-- 添加运力信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">运力信息</el-divider>
			
 
				-     <div class="form-box" style="margin-right: 10rem">
			
 
				+
			
 
				+     <div class="form_box" style="margin-right: 10rem">
			
 
				         <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"
			
 
				         @input="onInput"
			
 
				         :fetch-suggestions="querySearch"
			
 
				-        placeholder="请输入内容"
			
 
				+        placeholder="边输入边查询"
			
 
				         :trigger-on-focus="false"
			
 
				         @select="handleSelect"
			
 
				       ></el-autocomplete>
			
 
				-      </div>
			
 
				-    <div class="button-box">
			
 
				+    </div>
			
 
				+    <div class="button_box">
			
 
				       <el-button @click="cancel">取消</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确定</el-button>
			
 
				     </div>
			
@@ -26,18 +27,25 @@
 
				 
			
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				-
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				+let _this ;
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				       form1: {},
			
 
				       // value: undefined,
			
 
				-     carrierIds:"",
			
 
				+      carrierIds: "",
			
 
				       state: "",
			
 
				       restaurants: [],
			
 
				+      accessToken:null,
			
 
				     };
			
 
				   },
			
 
				+  created(){
			
 
				+        _this = this;
			
 
				+        _this.accessToken = getCookie("accessToken");
			
 
				+       console.log(this.accessToken ,'cookie1')
			
 
				+  },
			
 
				   mounted() {},
			
 
				   methods: {
			
 
				      onInput() {
			
@@ -71,48 +79,106 @@ export default {
 
				       this.carrierIds=item.carrierIds;
			
 
				       console.log(item)
			
 
				     },
			
 
				-   
			
 
				-     makeSure() {
			
 
				-       console.log(this.from1)
			
 
				-       let RmsCapacity={
			
 
				-         capacityTypeId:this.form1.capacityTypeId,
			
 
				-         capacityNumber:this.form1.capacityNumber.toUpperCase(),
			
 
				-         capacityCorlor:this.form1.capacityCorlor,
			
 
				-         capacityOwneris:this.form1.capacityOwneris,
			
 
				-         capacityVip:this.form1.capacityVip,
			
 
				-         capacityBlacklist:this.form1.capacityBlacklist,
			
 
				+    makeSure() {
			
 
				+       console.log(_this ,'cookie1')
			
 
				+
			
 
				+//        let RmsCapacity={
			
 
				+//          capacityTypeId:this.form1.capacityTypeId,
			
 
				+//          capacityNumber:this.form1.capacityNumber.toUpperCase(),
			
 
				+//          number:this.capacityNumber,
			
 
				+//          capacityCorlor:this.form1.capacityCorlor,
			
 
				+//          capacityOwneris:this.form1.capacityOwneris,
			
 
				+//          capacityVip:this.form1.capacityVip,
			
 
				+//          capacityBlacklist:this.form1.capacityBlacklist,
			
 
				+//         // carrierId:this.form1.carrierId,
			
 
				+//         state:this.state,
			
 
				+//         carrierName:this.state,
			
 
				+//         carrierIds: this.carrierIds,
			
 
				+//        };
			
 
				+//        console.log("RmsCapacity",RmsCapacity)
			
 
				+//        if(
			
 
				+//          RmsCapacity.capacityNumber==null ||
			
 
				+//          RmsCapacity.capacityCorlor==null ||
			
 
				+//          RmsCapacity.capacityOwneris==null ||
			
 
				+//          RmsCapacity.capacityVip==null ||
			
 
				+//          RmsCapacity.capacityBlacklist==null ||
			
 
				+//          RmsCapacity.carrierIds==null
			
 
				+//        )this.$message.error("存在空值！");
			
 
				+//        else
			
 
				+//         this.axios
			
 
				+//         .post("/api/v1/rms/getCarrierName?state=" + this.state)
			
 
				+//         .then((res) => {
			
 
				+//           if (res.data.code == "200") {
			
 
				+//             res.data.data.forEach((element) => {
			
 
				+//               this.restaurants.push({
			
 
				+//                 value: element.carrierName,
			
 
				+//                 carrierIds: element.carrierId,
			
 
				+//               });
			
 
				+//             });
			
 
				+//           }
			
 
				+//         });
			
 
				+    },
			
 
				+    querySearch(queryString, cb) {
			
 
				+      var restaurants = this.restaurants;
			
 
				+      var results = queryString
			
 
				+        ? restaurants.filter(this.createFilter(queryString))
			
 
				+        : restaurants;
			
 
				+      // 调用 callback 返回建议列表的数据
			
 
				+      cb(results);
			
 
				+    },
			
 
				+    createFilter(queryString) {
			
 
				+      return (restaurant) => {
			
 
				+        return (
			
 
				+          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
			
 
				+          0
			
 
				+        );
			
 
				+      };
			
 
				+    },
			
 
				+    handleSelect(item) {
			
 
				+      this.carrierIds = item.carrierIds;
			
 
				+      console.log(item);
			
 
				+    },
			
 
				+
			
 
				+    makeSure() {
			
 
				+      console.log(this.from1);
			
 
				+      let RmsCapacity = {
			
 
				+        capacityTypeId: this.form1.capacityTypeId,
			
 
				+        capacityNumber: this.form1.capacityNumber.toUpperCase(),
			
 
				+        capacityCorlor: this.form1.capacityCorlor,
			
 
				+        capacityOwneris: this.form1.capacityOwneris,
			
 
				+        capacityVip: this.form1.capacityVip,
			
 
				+        capacityBlacklist: this.form1.capacityBlacklist,
			
 
				         // carrierId:this.form1.carrierId,
			
 
				-        state:this.state,
			
 
				-        carrierName:this.state,
			
 
				-        carrierIds: this.carrierIds,
			
 
				-       };
			
 
				-       if(
			
 
				-         RmsCapacity.capacityNumber==null ||
			
 
				-         RmsCapacity.capacityCorlor==null ||
			
 
				-         RmsCapacity.capacityOwneris==null ||
			
 
				-         RmsCapacity.capacityVip==null ||
			
 
				-         RmsCapacity.capacityBlacklist==null ||
			
 
				-         RmsCapacity.carrierIds==null
			
 
				-       )this.$message.error("存在空值！");
			
 
				-       else
			
 
				-      this.axios
			
 
				-        .post(
			
 
				-          "/api/v1/rms/insertCapacity", RmsCapacity
			
 
				-        )
			
 
				-        .then((res) => {
			
 
				-          console.log("res.data.code",res.data.code);
			
 
				-          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();
			
 
				-        });
			
 
				+        state: this.state,
			
 
				+        carrierName: this.state,
			
 
				+        carrierIds: this.carrierIds,
			
 
				+      };
			
 
				+      if (
			
 
				+        RmsCapacity.capacityNumber == null ||
			
 
				+        RmsCapacity.capacityCorlor == null ||
			
 
				+        RmsCapacity.capacityOwneris == null ||
			
 
				+        RmsCapacity.capacityVip == null ||
			
 
				+        RmsCapacity.capacityBlacklist == null ||
			
 
				+        RmsCapacity.carrierIds == null
			
 
				+      )
			
 
				+        this.$message.error("存在空值！");
			
 
				+      else
			
 
				+        this.axios
			
 
				+          .post("/api/v1/rms/insertCapacity", RmsCapacity)
			
 
				+          .then((res) => {
			
 
				+            console.log("res.data.code", res.data.code);
			
 
				+            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();
			
 
				+          });
			
 
				     },
			
 
				     // 取消
			
 
				     cancel() {
			
@@ -122,39 +188,49 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				-.inputBox{
			
 
				-     display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.1000rem;
			
 
				-  margin-bottom: 0.25rem;
			
 
				-  margin-left: -12rem;
			
 
				-}
			
 
				-.form-box{
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  .el-form-item{
			
 
				+.addWagonLoad {
			
 
				+  .form_box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .el-form-item__label{
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+      }
			
 
				+      .el-form-item__content{
			
 
				+         .el-select{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+          .el-input{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  .inputBox{
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				-    .el-form-item__label{
			
 
				+    margin-bottom: 30px;
			
 
				+    .text{
			
 
				+      text-align: right;
			
 
				       display: flex;
			
 
				       align-items: center;
			
 
				+      margin-right: 5px;
			
 
				     }
			
 
				-    .el-form-item__content{
			
 
				-      .el-input{
			
 
				-        .el-input__inner{
			
 
				-          width: 250px;
			
 
				-        }
			
 
				-      }
			
 
				+    .input{
			
 
				+      width: 250px;
			
 
				+    }
			
 
				+  }
			
 
				+  .button_box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				     }
			
 
				   }
			
 
				 }
			
--- a/src/views/RMS/components/addCarDriver.vue
+++ b/src/views/RMS/components/addCarDriver.vue
@@ -3,7 +3,7 @@
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				     <el-divider content-position="left">司机信息</el-divider>
			
 
				-    <div class="form-box" style="margin-right: 10rem">
			
 
				+    <div class="form_box" style="margin-right: 10rem">
			
 
				       <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
			
 
				     </div>
			
 
				     <div class="inputBox">
			
@@ -12,20 +12,20 @@
 
				         v-model="state"
			
 
				         @input="onInput"
			
 
				         :fetch-suggestions="querySearch"
			
 
				-        placeholder="请输入内容"
			
 
				+        placeholder="边输入边查询"
			
 
				         :trigger-on-focus="false"
			
 
				         @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="handleAvatarSuccess"
			
 
				-  :file-list="fileList"
			
 
				-  list-type="picture">
			
 
				+    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>
			
@@ -38,7 +38,7 @@
 
				   action="http://localhost:8080/api/v1/rms/upload"
			
 
				   :on-preview="handlePreview"
			
 
				   :on-remove="handleRemove"
			
 
				-  :on-success="handleAvatarSuccess"
			
 
				+  :on-success="handleAvatarSuccess2"
			
 
				   :file-list="fileList"
			
 
				   list-type="picture">
			
 
				   <div>驾驶证照片
			
@@ -53,7 +53,7 @@
 
				   action="http://localhost:8080/api/v1/rms/upload"
			
 
				   :on-preview="handlePreview"
			
 
				   :on-remove="handleRemove"
			
 
				-  :on-success="handleAvatarSuccess"
			
 
				+  :on-success="handleAvatarSuccess3"
			
 
				   :file-list="fileList"
			
 
				   list-type="picture">
			
 
				   <div>运输证照片
			
@@ -69,7 +69,7 @@
 
				   action="http://localhost:8080/api/v1/rms/upload"
			
 
				   :on-preview="handlePreview"
			
 
				   :on-remove="handleRemove"
			
 
				-  :on-success="handleAvatarSuccess"
			
 
				+  :on-success="handleAvatarSuccess4"
			
 
				   :file-list="fileList"
			
 
				   list-type="picture">
			
 
				   <div>从业资格证照片
			
@@ -78,7 +78,7 @@
 
				 </el-upload> 
			
 
				     </div>
			
 
				 
			
 
				-    <div class="button-box">
			
 
				+    <div class="button_box">
			
 
				       <el-button @click="cancel">取消</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确定</el-button>
			
 
				     </div>
			
@@ -100,10 +100,16 @@ export default {
 
				       fileList: [],
			
 
				       carrierIds:"",
			
 
				       state: "",
			
 
				-      imageUrl:"",
			
 
				+      imageUrl1:"",
			
 
				+      imageUrl2:"",
			
 
				+      imageUrl3:"",
			
 
				+      imageUrl4:"",
			
 
				+      imageUrls:[],
			
 
				     };
			
 
				   },
			
 
				-  mounted() {},
			
 
				+  mounted() {
			
 
				+     this.form1.driverSex = this.sex;	
			
 
				+},
			
 
				   methods: {
			
 
				     onInput() {
			
 
				       this.axios.post(
			
@@ -136,16 +142,53 @@ export default {
 
				       this.carrierIds=item.carrierIds;
			
 
				       console.log(item)
			
 
				     },
			
 
				-    handleAvatarSuccess(res,file){
			
 
				-      this.imageUrl=URL.createObjectURL(file.raw);
			
 
				+      beforeUpload2 (file) {
			
 
				+        const isLt2M = file.size < 1024 * 1024 * 0.5
			
 
				+        console.log('大小' + isLt2M)
			
 
				+        if (!isLt2M) {
			
 
				+          this.$message.error('上传文件大小不能超过500kb!')
			
 
				+        }
			
 
				+        let size = file.size / 1024
			
 
				+        console.log('大小' + size)
			
 
				+        let _URL = window.URL || window.webkitURL
			
 
				+        let img = new Image()
			
 
				+        img.onload = function () {
			
 
				+          let width = img.width
			
 
				+          let height = img.height
			
 
				+          console.log('width--->' + width)
			
 
				+          console.log('height--->' + height)
			
 
				+        }
			
 
				+        img.src = _URL.createObjectURL(file)
			
 
				+        return isLt2M
			
 
				+    },
			
 
				+    handleAvatarSuccess1(res,file){
			
 
				+      this.imageUrl1=URL.createObjectURL(file.raw);
			
 
				+    },
			
 
				+    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);
			
 
				-      },
			
 
				-  
			
 
				+      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);
			
 
				       let reg = new RegExp(/^[0-9]*$/);
			
@@ -156,7 +199,11 @@ 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,
			
@@ -175,7 +222,7 @@ export default {
 
				         RmsCarDriver.driverPhone==null ||
			
 
				         RmsCarDriver.transportTypeId==null ||
			
 
				         RmsCarDriver.carrierIds==null 
			
 
				-    
			
 
				+     //   RmsCarDriver.carrierId==null 
			
 
				     )this.$message.error("存在空值！");
			
 
				      else
			
 
				       this.axios
			
@@ -191,7 +238,7 @@ export default {
 
				           } else {
			
 
				             this.$message.error("新增失败,可能存在重复！");
			
 
				           }
			
 
				-          //this.$refs['table'].resetField();
			
 
				+          this.$refs['table'].resetField();
			
 
				         });
			
 
				     },
			
 
				     // 取消
			
@@ -202,50 +249,59 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss'>
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				-.inputBox{
			
 
				-     display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.1000rem;
			
 
				-  margin-bottom: 0.25rem;
			
 
				-  margin-left: -12.5rem;
			
 
				-}
			
 
				-.photoBox{
			
 
				+.addWagonLoad {
			
 
				+  .form_box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .el-form-item__label{
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+      }
			
 
				+      .el-form-item__content{
			
 
				+         .el-select{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+          .el-input{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  .photoBox{
			
 
				    display: flex;
			
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				-  margin-top: 1rem;
			
 
				+  margin-top: 0.1000rem;
			
 
				   margin-bottom: 0.25rem;
			
 
				-  margin-left: -18rem;
			
 
				+ // margin-left: -18rem;
			
 
				 }
			
 
				-.form-box{
			
 
				-  display:flex;
			
 
				-  justify-content: center;
			
 
				-  .el-form-item{
			
 
				-    display:flex;
			
 
				+  .inputBox{
			
 
				+    display: flex;
			
 
				     justify-content: center;
			
 
				-    .el-form-item__label{
			
 
				-      display:flex;
			
 
				+    margin-bottom: 30px;
			
 
				+    .text{
			
 
				+      text-align: right;
			
 
				+      display: flex;
			
 
				       align-items: center;
			
 
				+      margin-right: 5px;
			
 
				     }
			
 
				-    .el-form-item__content{
			
 
				-      .el-input{
			
 
				-        .el-input__inner{
			
 
				-          width:250px;
			
 
				-        }
			
 
				-      }
			
 
				+    .input{
			
 
				+      width: 250px;
			
 
				+    }
			
 
				+  }
			
 
				+  .button_box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				     }
			
 
				   }
			
 
				-  
			
 
				 }
			
 
				 </style>
			
--- a/src/views/RMS/components/addCarrier.vue
+++ b/src/views/RMS/components/addCarrier.vue
@@ -2,83 +2,93 @@
 
				   <!-- 添加承运商信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle @click="onClick">返回</PageTitle>
			
 
				-    <el-divider content-position="left">承运商信息</el-divider>
			
 
				-     <div class="form-box" style="margin-right: 10rem">
			
 
				-        <dil-form :formId="330" v-model="form1"></dil-form>
			
 
				-      </div>
			
 
				+    <div class="user_code">
			
 
				+      <span class="text">账号：</span>
			
 
				+      <el-input class="input" placeholder="请输入内容" v-model="input" clearable> </el-input>
			
 
				+    </div>
			
 
				+    <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"
			
 
				-      :on-success="handleAvatarSuccess1"
			
 
				       :file-list="fileList"
			
 
				       :before-upload="beforeUpload2"
			
 
				-      list-type="picture">
			
 
				+      list-type="picture"
			
 
				+    >
			
 
				       <el-button size="small" type="primary">点击上传运输证</el-button>
			
 
				-      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
			
 
				+      <div slot="tip" class="el-upload__tip">
			
 
				+        只能上传jpg/png文件，且不超过500kb
			
 
				+      </div>
			
 
				     </el-upload>
			
 
				     <el-upload
			
 
				       class="upload-demo"
			
 
				+      ref="upload"
			
 
				       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier2"
			
 
				       :on-preview="handlePreview"
			
 
				       :on-remove="handleRemove"
			
 
				-      :on-success="handleAvatarSuccess2"
			
 
				       :file-list="fileList"
			
 
				       :before-upload="beforeUpload2"
			
 
				-      list-type="picture">
			
 
				+      list-type="picture"
			
 
				+    >
			
 
				       <el-button size="small" type="primary">点击上传经营许可证</el-button>
			
 
				-      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
			
 
				+      <div slot="tip" class="el-upload__tip">
			
 
				+        只能上传jpg/png文件，且不超过500kb
			
 
				+      </div>
			
 
				     </el-upload>
			
 
				     <el-upload
			
 
				       class="upload-demo"
			
 
				+      ref="upload"
			
 
				       action="http://localhost:8070/api/v1/rms/rmscarrier/uploadCarrier3"
			
 
				       :on-preview="handlePreview"
			
 
				       :on-remove="handleRemove"
			
 
				-      :on-success="handleAvatarSuccess3"
			
 
				       :file-list="fileList"
			
 
				       :before-upload="beforeUpload2"
			
 
				-      list-type="picture">
			
 
				+      list-type="picture"
			
 
				+    >
			
 
				       <el-button size="small" type="primary">点击上传营业执照</el-button>
			
 
				-      <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
			
 
				+      <div slot="tip" class="el-upload__tip">
			
 
				+        只能上传jpg/png文件，且不超过500kb
			
 
				+      </div>
			
 
				     </el-upload>
			
 
				-
			
 
				-
			
 
				     <div class="form-box f1">
			
 
				       <el-form :inline="true" :model="formInline" class="demo-form-inline">
			
 
				-    <el-form-item>
			
 
				-    <el-button type="primary" @click="drawer = true">添加中标区域信息</el-button>
			
 
				-  </el-form-item>
			
 
				-    </el-form>
			
 
				+        <el-form-item>
			
 
				+          <el-button type="primary" @click="drawer = true"
			
 
				+            >添加中标区域信息</el-button
			
 
				+          >
			
 
				+        </el-form-item>
			
 
				+      </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>
			
 
				-      <dilTable v-bind.sync="option1">
			
 
				+      :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>
			
 
				+    <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 type="text" size="mini" @click="deleteclick(scope)"
			
 
				             >删除</el-button
			
 
				           >
			
 
				         </template>
			
 
				       </el-table-column>
			
 
				     </dilTable>
			
 
				-
			
 
				     <div class="button-box">
			
 
				       <el-button @click="cancel">取消</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确定</el-button>
			
@@ -95,44 +105,44 @@ export default {
 
				       form1: {},
			
 
				       value: undefined,
			
 
				       drawer: false,
			
 
				-      carrierType:{},
			
 
				-      carrierTransportType:{},
			
 
				-      options:{
			
 
				+      carrierType: {},
			
 
				+      carrierTransportType: {},
			
 
				+      options: {
			
 
				         // first请求数据的地址
			
 
				         requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
			
 
				         selectionType: "radio",
			
 
				-         mapList:[],
			
 
				-         registerDate:"",
			
 
				-         mapValue:""
			
 
				+        mapList: [],
			
 
				+        registerDate: "",
			
 
				+        mapValue: "",
			
 
				       },
			
 
				-      imageUrl1:"",
			
 
				-      imageUrl2:"",
			
 
				-      imageUrl3:"",
			
 
				-      imageUrls:[],
			
 
				+      imageUrl1: "",
			
 
				+      imageUrl2: "",
			
 
				+      imageUrl3: "",
			
 
				+      imageUrls: [],
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				-    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
			
 
				+    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);
			
 
				+    handleAvatarSuccess1(res, file) {
			
 
				+      this.imageUrl1 = URL.createObjectURL(file.raw);
			
 
				       // this.axios
			
 
				       // .then((res) => {
			
 
				       //   if (res.data.code == 200) {
			
@@ -140,130 +150,134 @@ export default {
 
				       //     type: "success",
			
 
				       //     message: "新增成功!",
			
 
				       //     });
			
 
				-      //   } 
			
 
				+      //   }
			
 
				       //   else {
			
 
				       //     this.$message.error("图片上传失败，图片格式不得超过500kb且只能是jpg/png文件！");
			
 
				       //   }
			
 
				       // });
			
 
				     },
			
 
				-    handleAvatarSuccess2(res,file){
			
 
				-      this.imageUrl2=URL.createObjectURL(file.raw);
			
 
				+    handleAvatarSuccess2(res, file) {
			
 
				+      this.imageUrl2 = URL.createObjectURL(file.raw);
			
 
				     },
			
 
				-    handleAvatarSuccess3(res,file){
			
 
				-      this.imageUrl3=URL.createObjectURL(file.raw);
			
 
				+    handleAvatarSuccess3(res, file) {
			
 
				+      this.imageUrl3 = URL.createObjectURL(file.raw);
			
 
				     },
			
 
				-    handleRemove(file,fileList){
			
 
				-      console.log(file,fileList)
			
 
				+    handleRemove(file, fileList) {
			
 
				+      console.log(file, fileList);
			
 
				     },
			
 
				     handlePreview(file) {
			
 
				-      console.log("*********"+file);
			
 
				+      console.log("*********" + file);
			
 
				     },
			
 
				-    
			
 
				-    onclick(){
			
 
				-      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
			
 
				+
			
 
				+    onclick() {
			
 
				+      this.options.requestUrl =
			
 
				+        "/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" + this.inputText;
			
 
				     },
			
 
				-    currentRadioChange(selection){
			
 
				-      this.mapList=selection, 
			
 
				-      this.bidArea=this.mapList.bidArea
			
 
				-     
			
 
				+    currentRadioChange(selection) {
			
 
				+      (this.mapList = selection), (this.bidArea = this.mapList.bidArea);
			
 
				     },
			
 
				-     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
			
 
				+    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={
			
 
				+      let registerDate = {
			
 
				         registerDate: this.form1.registerDate,
			
 
				       };
			
 
				-      let imageUrls={
			
 
				-        imageUrl1:this.imageUrl1,
			
 
				-        imageUrl1:this.imageUrl2,
			
 
				-        imageUrl1:this.imageUrl3
			
 
				+      let imageUrls = {
			
 
				+        imageUrl1: this.imageUrl1,
			
 
				+        imageUrl1: this.imageUrl2,
			
 
				+        imageUrl1: this.imageUrl3,
			
 
				       };
			
 
				-      console.log(imageUrls)
			
 
				-      let mapValue={
			
 
				-        RmsCarrier:RmsCarrier,
			
 
				-        registerDate:registerDate,
			
 
				-        imageUrls:imageUrls
			
 
				+      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 ||
			
 
				+      if (reg.test(RmsCarrier.carrierContactNumber) == false)
			
 
				+        this.$message.error("输入的格式不正确");
			
 
				+      else if (
			
 
				+        RmsCarrier.carrierName == null ||
			
 
				+        // imageUrls.imageUrl1 ==null ||
			
 
				+        // imageUrls.imageUrl2 ==null ||
			
 
				+        // imageUrls.imageUrl3 ==null ||
			
 
				 
			
 
				-          // imageUrls.imageUrl1 ==null ||
			
 
				-          // imageUrls.imageUrl2 ==null ||
			
 
				-          // imageUrls.imageUrl3 ==null ||
			
 
				-
			
 
				-          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();
			
 
				-          });
			
 
				-      },
			
 
				-      // // 取消
			
 
				-      cancel() {
			
 
				-        this.$router.go(-1);
			
 
				-      },
			
 
				+        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();
			
 
				+        });
			
 
				+    },
			
 
				+    // // 取消
			
 
				+    cancel() {
			
 
				+      this.$router.go(-1);
			
 
				     },
			
 
				+  },
			
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				+.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;
			
@@ -271,40 +285,38 @@ export default {
 
				   margin-top: 0.3125rem;
			
 
				   margin-bottom: 1.25rem;
			
 
				 }
			
 
				-.form-box{
			
 
				+.form-box {
			
 
				   display: flex;
			
 
				   justify-content: center;
			
 
				-  .el-form-item{
			
 
				+  .el-form-item {
			
 
				     display: flex;
			
 
				-    width: 350px;
			
 
				     justify-content: center;
			
 
				-    
			
 
				-    .el-form-item__label{
			
 
				+
			
 
				+    .el-form-item__label {
			
 
				       display: flex;
			
 
				       align-items: center;
			
 
				     }
			
 
				-    .el-form-item__content{
			
 
				-      .el-input{
			
 
				-        .el-input__inner{
			
 
				+    .el-form-item__content {
			
 
				+      .el-input {
			
 
				+        .el-input__inner {
			
 
				           width: 250px;
			
 
				         }
			
 
				       }
			
 
				     }
			
 
				   }
			
 
				 }
			
 
				-.upload-demo{
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  padding-bottom: 1.0rem;
			
 
				-  .el-upload__tip{
			
 
				+.upload-demo {
			
 
				   display: flex;
			
 
				   justify-content: center;
			
 
				+  padding-bottom: 1rem;
			
 
				+  .el-upload__tip {
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				   }
			
 
				-  .el-button el-button--primary el-button--small{
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  word-wrap:break-word;
			
 
				+  .el-button el-button--primary el-button--small {
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    word-wrap: break-word;
			
 
				   }
			
 
				 }
			
 
				-
			
 
				 </style>
			
--- a/src/views/RMS/components/addConsignee.vue
+++ b/src/views/RMS/components/addConsignee.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加收货客户信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">收货客户信息</el-divider>
			
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				         <dil-form :formId="367" v-model="form1" ref="from1"></dil-form>
			
 
				       </div>
			
@@ -76,31 +75,34 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.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{
			
 
				+  .button-box{
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				-    .el-form-item__label{
			
 
				-      display: flex;
			
 
				-      align-items: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				     }
			
 
				-    .el-form-item__content{
			
 
				-      .el-input{
			
 
				-        .el-input__inner{
			
 
				-          width: 250px;
			
 
				-        }
			
 
				+  }
			
 
				+.form-box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .el-form-item__label{
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+      }
			
 
				+      .el-form-item__content{
			
 
				+         .el-select{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+          .el-input{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				       }
			
 
				     }
			
 
				   }
			
 
				-}
			
 
				 </style>
			
--- a/src/views/RMS/components/addGatepost.vue
+++ b/src/views/RMS/components/addGatepost.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加门岗信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">门岗信息</el-divider>
			
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				        <!-- 287 -->
			
 
				         <dil-form :formId="328" v-model="form1" ref="from1">
			
@@ -85,14 +84,14 @@ export default {
 
				 
			
 
				 </style>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .btn-left {
			
 
				   margin-left: 470px;
			
 
				 }
			
--- a/src/views/RMS/components/addMaterial.vue
+++ b/src/views/RMS/components/addMaterial.vue
@@ -2,10 +2,8 @@
 
				   <!-- 添加物资信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">物资信息</el-divider>
			
 
				      <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">
			
@@ -123,22 +121,21 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .disableBox{
			
 
				   display: flex;
			
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				-  margin-top: 3rem;
			
 
				+  margin-top: 1.5rem;
			
 
				   margin-bottom: 1.25rem;
			
 
				-  margin-left: -23rem;
			
 
				 }
			
 
				 .btn-left {
			
 
				   margin-left: 470px;
			
@@ -146,27 +143,6 @@ export default {
 
				 .input {
			
 
				   margin-left: 90px;
			
 
				 }
			
 
				-.label{
			
 
				-  margin-left: 445px;
			
 
				-  margin-bottom: -30px;
			
 
				-  font: bold;
			
 
				-  font-size: 1rem;
			
 
				-  padding-left: -30px;
			
 
				-  font-family:Arial, Helvetica, sans-serif;
			
 
				-  margin-bottom:20px;
			
 
				-} 
			
 
				-.label2{
			
 
				-  margin-left: 425px;
			
 
				-  margin-bottom: -30px;
			
 
				-  font: bold;
			
 
				-  font-size: 1rem;
			
 
				-  font-family:Arial, Helvetica, sans-serif
			
 
				-}
			
 
				-.label1{
			
 
				-  margin-left: 345px;
			
 
				-  margin-bottom: -30px;
			
 
				-  font: bold;
			
 
				-}
			
 
				 .common{
			
 
				   font-weight: 700;
			
 
				   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
			
--- a/src/views/RMS/components/addNotice.vue
+++ b/src/views/RMS/components/addNotice.vue
@@ -3,7 +3,6 @@
 
				   <!-- 添加公告信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">公告信息</el-divider>
			
 
				 
			
 
				     <div class="form-box" style="margin-right: 10rem">
			
 
				       <dil-form :formId="302" v-model="form1" ref="from1"></dil-form>
			
@@ -69,12 +68,12 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/addOilPrice.vue
+++ b/src/views/RMS/components/addOilPrice.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加油价信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">油价信息</el-divider>
			
 
				     <div class="form-box" style="margin-right: 10rem">
			
 
				       <dil-form :formId="357" v-model="form1" ref="from1"></dil-form>
			
 
				     </div>
			
@@ -66,14 +65,14 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .form-box{
			
 
				   display: flex;
			
 
				   justify-content: center;
			
--- a/src/views/RMS/components/addPersonnel.vue
+++ b/src/views/RMS/components/addPersonnel.vue
@@ -35,12 +35,12 @@
 
				       <div>
			
 
				         <div class="role">
			
 
				                 <span>赋权角色：</span>
			
 
				-                <el-select v-model="value3" placeholder="请选择" @change="onchange3">
			
 
				+                <el-select v-model="value3" placeholder="请选择">
			
 
				                     <el-option
			
 
				                         v-for="(item,i) in options3"
			
 
				                         :key="i"
			
 
				-                        :label="item.label"
			
 
				-                        :value="item.value"
			
 
				+                        :label="item.roleName"
			
 
				+                        :value="item.roleId"
			
 
				                     >
			
 
				                     </el-option>
			
 
				                 </el-select>
			
@@ -63,6 +63,8 @@ export default {
 
				     return {
			
 
				       form1: {},
			
 
				       value: undefined,
			
 
				+      //新增用户的SSO主键
			
 
				+      personnelSsoId:'',
			
 
				       //token
			
 
				       token: null,
			
 
				       //二级部门
			
@@ -87,7 +89,6 @@ export default {
 
				   },
			
 
				   created(){
			
 
				     this.token = getCookie("accessToken");
			
 
				-    console.log('this.token',this.token)
			
 
				   },
			
 
				   mounted() {
			
 
				     //初始化二级机构和角色
			
@@ -98,86 +99,131 @@ export default {
 
				        //初始化选择二级机构
			
 
				          this.axios.get('/api/v1/rms/getSecondShipper').then((res)=>{
			
 
				              this.options1 = res.data.data;
			
 
				-             console.log("this.options1",this.options1)
			
 
				          })
			
 
				          //初始化角色
			
 
				-         this.axios({
			
 
				-           Headers:{
			
 
				-            //  'Content-Type':'application/x-www-form-urlencoded',
			
 
				-             'authorization' : 'Bearer' + this.token
			
 
				-           },
			
 
				-           method:'get',
			
 
				-           url:'https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysroles/getRolesUser?companyId=713710108567277568&appId=821034072422879232',
			
 
				-         })
			
 
				-         .then((res)=>{
			
 
				-           console.log('res',res)
			
 
				-             this.options3 = res.data.data;
			
 
				-             console.log("this.options3",this.options3)
			
 
				-         })
			
 
				+        const formData = new FormData();
			
 
				+        this.$store.dispatch('system/rolesManage/list',formData)
			
 
				+        .then((res)=>{
			
 
				+          var roleList = [];
			
 
				+          roleList=res.data;
			
 
				+          roleList.forEach((item,i)=>{
			
 
				+              if(item.roleId!='superadmin'){
			
 
				+                this.options3.push(item);
			
 
				+              }
			
 
				+          })
			
 
				+          // this.options3 = res.data;
			
 
				+        })
			
 
				      },
			
 
				      onchange1(val){
			
 
				-            console.log("val",val);
			
 
				             //  查询选中的二级机构下的三级机构
			
 
				              this.value2 = '';
			
 
				              this.axios.get('/api/v1/rms/getThirdShipper?shipperId='+val).then((res)=>{
			
 
				              this.options2 = res.data.data;    
			
 
				-              console.log("this.options2",this.options2)
			
 
				          })
			
 
				          //获取二级部门的机构ID和机构编码
			
 
				          this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
			
 
				              this.map1 = res.data.data;
			
 
				-              console.log("this.map1",this.map1)
			
 
				          })
			
 
				      },
			
 
				      onchange2(val){
			
 
				-            console.log("val",val);
			
 
				          //获取三级部门的机构ID和机构编码
			
 
				          this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
			
 
				              this.map2 = res.data.data; 
			
 
				-              console.log("this.map2",this.map2)
			
 
				          })
			
 
				      },
			
 
				 
			
 
				-
			
 
				-
			
 
				      //确定人员新增
			
 
				      makeSure() {
			
 
				+      //初始化用户信息
			
 
				+      let userInfo = {};
			
 
				+      //该用户没有三级部门
			
 
				       if(this.options2.length==0){
			
 
				-      let userInfo = {
			
 
				+      userInfo = {
			
 
				         userName : this.form1.personnelName,
			
 
				         userCode : this.form1.personnelJobNumber,
			
 
				         orgCode : this.map1.shipperOrgCode,
			
 
				         orgName : this.value1,
			
 
				         orgId : this.map1.shipperSsoId,
			
 
				-        mobile : '13500000011',
			
 
				-        email : '123456789@qq.com',
			
 
				+        // mobile : '13500000011',
			
 
				+        // email : '123456789@qq.com',
			
 
				         groupId : '506514577756917769',
			
 
				         companyId : '713710108567277568'
			
 
				       }
			
 
				+      //该用户有三级部门
			
 
				       }else{
			
 
				-        let userInfo = {
			
 
				+        userInfo = {
			
 
				         userName : this.form1.personnelName,
			
 
				         userCode : this.form1.personnelJobNumber,
			
 
				         orgCode : this.map2.shipperOrgCode,
			
 
				         orgName : this.value1,
			
 
				         orgId : this.map2.shipperSsoId,
			
 
				-        mobile : '13500000011',
			
 
				-        email : '123456789@qq.com',
			
 
				+        // mobile : '13500000011',
			
 
				+        // email : '123456789@qq.com',
			
 
				         groupId : '506514577756917769',
			
 
				         companyId : '713710108567277568'
			
 
				       }
			
 
				       }
			
 
				        //先新增SSO中的用户
			
 
				-      
			
 
				       const formData = new FormData();
			
 
				+      
			
 
				       Object.keys(userInfo).forEach((key) => {
			
 
				       formData.append(key, userInfo[key]);
			
 
				       });
			
 
				-      console.log('formData',formData)
			
 
				-      //  this.axios.post('https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysusers/',)
			
 
				-      //  .then((res)=>{
			
 
				-      //    console.log("res",res)
			
 
				-      //  })
			
 
				+      //新增用户
			
 
				+      this.$store.dispatch('system/usersManage/addUser',formData)
			
 
				+      .then((res)=>{
			
 
				+
			
 
				+      //再新增RMS_PERSONNEL表信息
			
 
				+      let rmsPersonnel = {
			
 
				+        personnelJobNumber : this.form1.personnelJobNumber,
			
 
				+        personnelPost : this.form1.personnelPost,
			
 
				+        personnelName : this.form1.personnelName,
			
 
				+        personnelDepartmentId : this.form1.shipperId,
			
 
				+        // personnelWorkshopid : this.form1.personnelWorkshopid,
			
 
				+        personnelShifts : this.form1.personnelShifts,
			
 
				+        personnelTeam : this.form1.personnelTeam,
			
 
				+        personnelSsoId : res.data.userId
			
 
				+      }
			
 
				+      if(
			
 
				+        RmsPersonnel.personnelJobNumber ==null ||
			
 
				+        RmsPersonnel.personnelName ==null ||
			
 
				+        RmsPersonnel.personnelPost ==null ||
			
 
				+        // RmsPersonnel.personnelWorkshopid==null ||
			
 
				+        RmsPersonnel.personnelShifts==null ||
			
 
				+        RmsPersonnel.departmentId==null ||
			
 
				+        RmsPersonnel.personnelTeam==null ||
			
 
				+        userInfo.orgName==null ||
			
 
				+        userInfo.orgCode==null ||
			
 
				+        userInfo.orgId==null ||
			
 
				+        this.value3==null
			
 
				+      )this.$message.error("存在空值！");
			
 
				+      else
			
 
				+
			
 
				+      this.axios.post('/api/v1/rms/addPersonnel',rmsPersonnel)
			
 
				+      .then((res)=>{
			
 
				+            if (res.data.code == 200) {
			
 
				+            this.$message({
			
 
				+              type: "success",
			
 
				+              message: "新增成功!",
			
 
				+            });
			
 
				+            // this.$refs.table.refreshData();
			
 
				+          } else {
			
 
				+            this.$message.error("新增失败,可能存在重复！");
			
 
				+          }
			
 
				+          // this.$refs['table'].resetField();
			
 
				+      })
			
 
				+
			
 
				+      //最后新增角色赋权表
			
 
				+      this.axios.post('pass/v1/sysuserroles/addUserroles?userId='
			
 
				+      +res.data.userId+'&userCode='+this.form1.personnelJobNumber+'&roleId='+this.value3)
			
 
				+      .then((res)=>{
			
 
				+          this.$router.go(-1);
			
 
				+      })    
			
 
				+      });
			
 
				+
			
 
				+      //最后新增角色赋权表
			
 
				+      
			
 
				+      
			
 
				 
			
 
				       // let RmsPersonnel={
			
 
				       //   personnelId:this.form1.personnelId,
			
@@ -226,14 +272,15 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    margin-top: 2rem;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .form-box{
			
 
				   display: flex;
			
 
				   justify-content: center;
			
--- a/src/views/RMS/components/addPier.vue
+++ b/src/views/RMS/components/addPier.vue
@@ -82,4 +82,12 @@ export default {
 
				     }
			
 
				   }
			
 
				 }
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/addPort.vue
+++ b/src/views/RMS/components/addPort.vue
@@ -65,14 +65,14 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .form-box{
			
 
				   display: flex;
			
 
				   justify-content: center;
			
--- a/src/views/RMS/components/addPortStorageYard.vue
+++ b/src/views/RMS/components/addPortStorageYard.vue
@@ -67,12 +67,12 @@ export default {
 
				   display: flex;
			
 
				 }
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				+ .button-box{
			
 
				     display: flex;
			
 
				-    text-align: center;
			
 
				-    align-items: center;
			
 
				     justify-content: center;
			
 
				-    margin-top: 0.3125rem;
			
 
				-    margin-bottom: 1.25rem;
			
 
				-}
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/addRawWarehouse.vue
+++ b/src/views/RMS/components/addRawWarehouse.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加原料仓库信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">原料仓库信息</el-divider>
			
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				         <dil-form :formId="315" v-model="form1" ref="from1"></dil-form>
			
 
				       </div>
			
@@ -64,14 +63,14 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .form-box{
			
 
				   display: flex;
			
 
				   justify-content: center;
			
--- a/src/views/RMS/components/addRmsShipper.vue
+++ b/src/views/RMS/components/addRmsShipper.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加托运人信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">托运人信息</el-divider>
			
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				        <!-- 323 -->
			
 
				         <dil-form :formId="323" v-model="form1" ref="from1"></dil-form>
			
@@ -76,14 +75,14 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .form-box{
			
 
				   display: flex;
			
 
				   justify-content: center;
			
--- a/src/views/RMS/components/addSupplier.vue
+++ b/src/views/RMS/components/addSupplier.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加供应商信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">原料供应商信息</el-divider>
			
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				         <dil-form :formId="320" v-model="form1" ref="from1"></dil-form>
			
 
				       </div>
			
@@ -31,7 +30,7 @@ export default {
 
				       let RmsSupplier = {
			
 
				         supplierName: this.form1.supplierName,
			
 
				         supplierAddress: this.form1.supplierAddress,
			
 
				-        supplierRegisterDate: sjTime(this.form1.supplierRegisterDate),
			
 
				+        supplierRegisterDate: this.form1.supplierRegisterDate,
			
 
				         supplierContactsName: this.form1.supplierContactsName,
			
 
				         supplierContactNumber: this.form1.supplierContactNumber
			
 
				       };
			
@@ -70,14 +69,14 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .form-box{
			
 
				   display: flex;
			
 
				   justify-content: center;
			
--- a/src/views/RMS/components/addTruckCalculate.vue
+++ b/src/views/RMS/components/addTruckCalculate.vue
@@ -2,7 +2,6 @@
 
				   <!-- 添加汽车衡信息 -->
			
 
				   <div class="addWagonLoad">
			
 
				     <PageTitle>返回</PageTitle>
			
 
				-    <el-divider content-position="left">汽车衡信息</el-divider>
			
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				         <dil-form :formId="317" v-model="form1" ref="from1">
			
 
				         </dil-form>
			
@@ -115,21 +114,25 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' >
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .inputBox{
			
 
				   display: flex;
			
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				-  justify-content: center;
			
 
				    margin-top: 2rem;
			
 
				-  width: 400px;
			
 
				+   width: 800px;
			
 
				+  .el-input__inner{
			
 
				+    display: flex;
			
 
				+  text-align: center;
			
 
				+  align-items: center;
			
 
				+  }
			
 
				 }
			
 
				 .btn-left {
			
 
				   margin-left: 470px;
			
--- a/src/views/RMS/components/editCapacity.vue
+++ b/src/views/RMS/components/editCapacity.vue
@@ -1,23 +1,51 @@
 
				 <template>
			
 
				   <!-- 修改运力信息 -->
			
 
				+<div class="addWagonLoad">
			
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">运力信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				-      <div class="form-box">
			
 
				-        <div class="form-one">
			
 
				+      <div class="form_box" style="margin-right: 10rem">
			
 
				           <dil-form :formId="310" v-model="form1"></dil-form>
			
 
				-        </div>
			
 
				       </div>
			
 
				     </div>
			
 
				-
			
 
				-    <div class="button-box">
			
 
				+</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>
			
 
				-      <el-button @click="onClickCancel">返回</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				+
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
@@ -27,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() {
			
@@ -35,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/" +
			
@@ -53,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);
			
 
				+        }); 
			
 
				         });
			
 
				     },
			
 
				     // 返回
			
@@ -71,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 ||
			
@@ -97,13 +151,42 @@ console.log(this.$route.params)
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				-.form-box,
			
 
				-.button-box{
			
 
				+ .form_box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .el-form-item__label{
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+      }
			
 
				+      .el-form-item__content{
			
 
				+         .el-select{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+          .el-input{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+      }
			
 
				+    }
			
 
				+ }
			
 
				+ .button_box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+ }
			
 
				+ .disableBox{
			
 
				   display: flex;
			
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				+  margin-top: 1.5rem;
			
 
				   margin-bottom: 1.25rem;
			
 
				 }
			
 
				 </style>
			
--- a/src/views/RMS/components/editCarDriver.vue
+++ b/src/views/RMS/components/editCarDriver.vue
@@ -3,19 +3,41 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">司机信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				-      <div class="form-box">
			
 
				-        <div class="form-one">
			
 
				+      <div class="form_box">
			
 
				           <dil-form :formId="340" v-model="form1"></dil-form>
			
 
				-        </div>
			
 
				       </div>
			
 
				     </div>
			
 
				-
			
 
				-    <div class="button-box">
			
 
				+     <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>
			
 
				-      <el-button @click="onClickCancel">返回</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -27,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() {
			
@@ -35,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
			
@@ -51,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() {
			
@@ -67,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,
			
@@ -97,13 +145,56 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				-.form-box,
			
 
				-.button-box{
			
 
				+  .form_box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .el-form-item__label{
			
 
				+        display: flex;
			
 
				+        align-items: center;
			
 
				+      }
			
 
				+      .el-form-item__content{
			
 
				+         .el-select{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+          .el-input{
			
 
				+            width: 250px;
			
 
				+          }
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				+  .inputBox{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    margin-bottom: 30px;
			
 
				+    .text{
			
 
				+      text-align: right;
			
 
				+      display: flex;
			
 
				+      align-items: center;
			
 
				+      margin-right: 5px;
			
 
				+    }
			
 
				+    .input{
			
 
				+      width: 250px;
			
 
				+    }
			
 
				+  }
			
 
				+.button_box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				+  .disableBox{
			
 
				   display: flex;
			
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				+  margin-top: 1.5rem;
			
 
				   margin-bottom: 1.25rem;
			
 
				 }
			
 
				 </style>
			
--- a/src/views/RMS/components/editCarrier.vue
+++ b/src/views/RMS/components/editCarrier.vue
@@ -3,13 +3,10 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">承运商信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
 
				-        <div class="form-one">
			
 
				           <dil-form :formId="330" v-model="form1"></dil-form>
			
 
				-        </div>
			
 
				       </div>
			
 
				     </div>
			
 
				 
			
@@ -36,8 +33,8 @@
 
				     </el-drawer>
			
 
				 
			
 
				     <div class="button-box">
			
 
				-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -171,13 +168,37 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				-.form-box,
			
 
				+ .form-box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .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;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				 .button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editConsignee.vue
+++ b/src/views/RMS/components/editConsignee.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">收货客户信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				 
			
 
				     <div class="button-box">
			
 
				+      <el-button @click="onClickCancel">返回</el-button>
			
 
				       <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				-      <el-button @click="onClickCancel">返回</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -100,13 +99,37 @@ console.log(this.$route.params)
 
				 };
			
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				-.form-box,
			
 
				+ .form-box {
			
 
				+    width: 100%;
			
 
				+    margin-top: 30px;
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-form-item{
			
 
				+      display: flex;
			
 
				+      justify-content: center;
			
 
				+      .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;
			
 
				+      }
			
 
				+    }
			
 
				+  }
			
 
				 .button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editGatepost.vue
+++ b/src/views/RMS/components/editGatepost.vue
@@ -295,5 +295,13 @@ export default {
 
				   margin-left: 35rem;
			
 
				   margin-bottom: 0.25rem;
			
 
				 }
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 
			
 
				 </style>
			
--- a/src/views/RMS/components/editMaterial.vue
+++ b/src/views/RMS/components/editMaterial.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">物资信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				     
			
 
				     <div class="button-box">
			
 
				-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -99,12 +98,12 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editNotice.vue
+++ b/src/views/RMS/components/editNotice.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">通知信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				 
			
 
				     <div class="button-box">
			
 
				-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -88,14 +87,14 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
 
				 
			
 
				 
			
--- a/src/views/RMS/components/editOilPrice.vue
+++ b/src/views/RMS/components/editOilPrice.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">油价信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				 
			
 
				     <div class="button-box">
			
 
				-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -87,12 +86,12 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editPersonnel.vue
+++ b/src/views/RMS/components/editPersonnel.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">人员信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				 
			
 
				     <div class="button-box">
			
 
				+      <el-button @click="onClickCancel">返回</el-button>
			
 
				       <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				-      <el-button @click="onClickCancel">返回</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -92,12 +91,12 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editRawWarehouse.vue
+++ b/src/views/RMS/components/editRawWarehouse.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">原料仓库信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				 
			
 
				     <div class="button-box">
			
 
				+      <el-button @click="onClickCancel">返回</el-button>
			
 
				       <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				-      <el-button @click="onClickCancel">返回</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -81,12 +80,12 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editRmsShipper.vue
+++ b/src/views/RMS/components/editRmsShipper.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">托运人信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -92,14 +91,14 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .button-box{
			
 
				   display: flex;
			
 
				   justify-items: center;
			
--- a/src/views/RMS/components/editSupplier.vue
+++ b/src/views/RMS/components/editSupplier.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">供应商信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -14,8 +13,8 @@
 
				     </div>
			
 
				 
			
 
				     <div class="button-box">
			
 
				-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				     </div>
			
 
				   </div>
			
 
				 </template>
			
@@ -92,12 +91,12 @@ export default {
 
				 </script>
			
 
				 <style lang='scss' scoped>
			
 
				 .form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				-}
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/RMS/components/editTruckCalculate.vue
+++ b/src/views/RMS/components/editTruckCalculate.vue
@@ -3,7 +3,6 @@
 
				   <div id="contractDetails">
			
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				-      <span class="text">汽车衡信息</span>
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				       <div class="form-box">
			
@@ -49,9 +48,9 @@
 
				         </template>
			
 
				       </el-table-column>
			
 
				     </dilTable>
			
 
				-       <div class="button-box">
			
 
				+    <div class="button-box">
			
 
				+      <el-button @click="onClickCancel">返回</el-button>
			
 
				       <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				-      <el-button @click="onClickCancel">返回</el-button>
			
 
				     </div>  
			
 
				   </div>
			
 
				   </div>
			
@@ -235,19 +234,17 @@ makeSure() {
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				-  width: 400px;
			
 
				-}
			
 
				-.inputBox{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  width: 400px;
			
 
				-}
			
 
				-.button-box {
			
 
				-  padding: 20px 30px;
			
 
				-  margin-left: 460px;
			
 
				+  width: 800px;
			
 
				 }
			
 
				+
			
 
				+ .button-box{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    .el-button{
			
 
				+      width: 80px;
			
 
				+      margin-right: 10px;
			
 
				+    }
			
 
				+  }
			
 
				 .btn-left {
			
 
				   margin-left: 470px;
			
 
				 }
			
--- a/src/views/RMS/components/getNoticeById.vue
+++ b/src/views/RMS/components/getNoticeById.vue
@@ -63,9 +63,9 @@ export default {
 
				 
			
 
				 <style>
			
 
				 
			
 
				-.el-textarea .el-input--medium .is-disabled  {
			
 
				-:rows="10"
			
 
				-}
			
 
				+/* .el-textarea .el-input--medium .is-disabled  {
			
 
				+  /* rows="10" */
			
 
				+/* } */ 
			
 
				 
			
 
				 
			
 
				 .el-textarea__inner{
			
--- a/src/views/RMS/components/rawWarehouse.vue
+++ b/src/views/RMS/components/rawWarehouse.vue
@@ -46,13 +46,13 @@ export default {
 
				       inputText:"",
			
 
				       options:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/rms/getWarehouseList?apiId=345",
			
 
				+        requestUrl: "/api/v1/rms/getWarehouseList?apiId=415",
			
 
				       },
			
 
				     }
			
 
				   },
			
 
				   methods:{
			
 
				     onclick(){
			
 
				-      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=345&con="+this.inputText;
			
 
				+      this.options.requestUrl="/api/v1/rms/getWarehouseList?apiId=415&con="+this.inputText;
			
 
				     },
			
 
				      toInsert() {
			
 
				       this.$router.push("/addRawWarehouse");
			
--- a/src/views/RMS/components/transitRoute.vue
+++ b/src/views/RMS/components/transitRoute.vue
@@ -132,12 +132,10 @@ export default {
 
				 
			
 
				 <style lang="scss" scode>
			
 
				 .steel_inbound{
			
 
				-  .sache{
			
 
				-    padding: 1.25rem 0.375rem;
			
 
				-    .el-input {
			
 
				-      width: 20%;
			
 
				-      margin-right: 1.25rem;
			
 
				-    }
			
 
				-  }
			
 
				+  .top{
			
 
				+    display: flex;
			
 
				+    width: 30%;
			
 
				   }
			
 
				+}
			
 
				+
			
 
				 </style>
			
--- a/src/views/RMS/components/transitRouteAdd.vue
+++ b/src/views/RMS/components/transitRouteAdd.vue
@@ -10,7 +10,7 @@
 
				       </div>
			
 
				       <div class="link_name">
			
 
				         <span>线路名称：</span>
			
 
				-        <el-input placeholder="请输入内容" v-model="line_name" clearable>
			
 
				+        <el-input placeholder="请输入内容" v-model="line_name" class="el_input_suffix" clearable>
			
 
				         </el-input>
			
 
				       </div>
			
 
				       <div class="link_type">
			
@@ -107,6 +107,10 @@ export default {
 
				           value: "4",
			
 
				           label: "退货",
			
 
				         },
			
 
				+        {
			
 
				+          value: "5",
			
 
				+          label: "零星",
			
 
				+        },
			
 
				       ],
			
 
				       value: "",
			
 
				       btnList: [],
			
@@ -281,6 +285,11 @@ export default {
 
				       align-items: center;
			
 
				       justify-content: center;
			
 
				       margin-top: 1.25rem;
			
 
				+      .el_input_suffix{
			
 
				+        widows: 50px;
			
 
				+        
			
 
				+      }
			
 
				+      
			
 
				     }
			
 
				     .link_type {
			
 
				       display: flex;
			
--- a/src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue
@@ -3,11 +3,13 @@
 
				   <!-- 新增运输作业页面 -->
			
 
				   <div id="contractDetails">
			
 
				     <page-title>运输预约</page-title>
			
 
				-    <div class="forwardingUnit from">
			
 
				+    <div class="truckList1">
			
 
				+      <div class="forwardingUnit from">
			
 
				       <span class="text">发货单位：</span>
			
 
				       <el-input v-model="supplierName" disabled> </el-input>
			
 
				       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
			
 
				     </div>
			
 
				+    </div>
			
 
				     <div class="forwardingUnit from">
			
 
				       <span class="text">收货单位：</span>
			
 
				       <el-input v-model="receiveName" disabled> </el-input>
			
@@ -467,7 +469,7 @@ export default {
 
				     },
			
 
				     currentRadioChange5(selection) {
			
 
				       console.log(selection)
			
 
				-      this.lineName = selection.lineName+selection.lineDesk 
			
 
				+      this.lineName = selection.lineName+'  '+selection.lineDesk 
			
 
				       this.lineId = selection.lineId;
			
 
				     },
			
 
				     currentRadioChange3(selection) {
			
@@ -506,6 +508,7 @@ export default {
 
				   display: flex;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				+  width: 40%;
			
 
				   margin-top: 5px;
			
 
				   margin-bottom: 20px;
			
 
				 }
			
--- a/src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue
@@ -101,7 +101,8 @@ export default {
 
				         .then((res) => {
			
 
				           if (res.data.code == "200") {
			
 
				             this.option1.requestUrl =
			
 
				-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
			
 
				+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1"
			
 
				+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&test=1"
			
 
				             this.$message({
			
 
				               type: "success",
			
 
				               message: "下发成功!",
			
@@ -120,7 +121,9 @@ export default {
 
				         .then((res) => {
			
 
				           if (res.data.code == "200") {
			
 
				             this.option1.requestUrl =
			
 
				-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12";
			
 
				+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
			
 
				+            this.option2.requestUrl =
			
 
				+            "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&test=1"
			
 
				             this.$message({
			
 
				               type: "success",
			
 
				               message: "删除成功!",
			
--- a/src/views/appoint/components/saleContract/addSaleOrder.vue
+++ b/src/views/appoint/components/saleContract/addSaleOrder.vue
@@ -74,8 +74,8 @@
 
				                 ></el-input>
			
 
				               </template>
			
 
				               <!-- 收货地址id -->
			
 
				-              <template v-if="item.prop == 'saleShipperAddressName'">
			
 
				-                <el-input v-model="scope.row.saleShipperAddressName" disabled>
			
 
				+              <template style="width: 400px" v-if="item.prop == 'saleShipperAddressName'">
			
 
				+                <el-input style="width: 200px" v-model="scope.row.saleShipperAddressName" disabled>
			
 
				                 </el-input>
			
 
				                 <el-button type="primary" @click="ondrawer(scope.row,scope.$index)"
			
 
				                   >浏览</el-button
			
@@ -126,7 +126,10 @@
 
				     <el-drawer
			
 
				       :visible.sync="drawer"
			
 
				       :direction="direction"
			
 
				-      :before-close="handleClose"
			
 
				+      :close-on-press-escape="true"
			
 
				+      :show-close="true"
			
 
				+      :wrapperClosable="true"
			
 
				+      modal
			
 
				       size="30%"
			
 
				     >
			
 
				       <el-input
			
@@ -243,6 +246,7 @@ export default {
 
				         {
			
 
				           prop: "saleShipperAddressName",
			
 
				           label: "收货地址",
			
 
				+          width: "300",
			
 
				           slot: true,
			
 
				         },
			
 
				         {
			
--- a/src/views/appoint/components/saleContract/saleOrder.vue
+++ b/src/views/appoint/components/saleContract/saleOrder.vue
@@ -12,8 +12,8 @@
 
				     </div>
			
 
				     <el-tabs v-model="activeName" @tab-click="handleClick">
			
 
				       <el-tab-pane label="未上报" name="first">
			
 
				-        <dilTable v-bind.sync="option">
			
 
				-          <el-table-column fixed="right" label="操作" align="center" width="150">
			
 
				+        <dilTable v-bind.sync="option" ref="table3">
			
 
				+          <el-table-column fixed="right" label="操作" align="center" width="200">
			
 
				             <template slot-scope="scope">
			
 
				               <el-button
			
 
				                 @click="uploadclick(scope.row.saleOrderId)"
			
@@ -33,17 +33,76 @@
 
				                 @click="deleteclick(scope.row.saleOrderId)"
			
 
				                 >删除</el-button
			
 
				               >
			
 
				+              <el-button
			
 
				+                @click="detailclick3(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="tableData3" 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="option2"> </dilTable>
			
 
				+        <dilTable v-bind.sync="option2" ref="table2">
			
 
				+        <el-table-column fixed="right" label="操作" width="70">
			
 
				+            <template slot-scope="scope">
			
 
				+              <el-button
			
 
				+                @click="detailclick2(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="tableData2" 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="third">
			
 
				-        <dilTable v-bind.sync="option3">
			
 
				+        <dilTable v-bind.sync="option3" ref="table1">
			
 
				           <el-table-column fixed="right" label="操作" width="200">
			
 
				             <template slot-scope="scope">
			
 
				               <el-button
			
@@ -58,8 +117,35 @@
 
				                 size="small"
			
 
				                 >修改日志</el-button
			
 
				               >
			
 
				+              <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="tableData1" 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>
			
 
				       <!-- 销售公司已审批 -->
			
@@ -134,10 +220,22 @@ export default {
 
				           "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409",
			
 
				       },
			
 
				       
			
 
				-      //记录旧的row对象
			
 
				+      //记录旧的row对象 (销售公司已审批)
			
 
				       oldRow: "",
			
 
				-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
			
 
				       oldRowCount: 1,
			
 
				+      //记录旧的row对象 (财务已审批)
			
 
				+      oldRow1: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (财务已审批)
			
 
				+      oldRowCount1: 1,
			
 
				+      //记录旧的row对象 (已上报)
			
 
				+      oldRow2: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (已上报)
			
 
				+      oldRowCount2: 1,
			
 
				+      //记录旧的row对象 (未上报)
			
 
				+      oldRow3: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (未上报)
			
 
				+      oldRowCount3: 1,
			
 
				       tableHead: [
			
 
				         {
			
 
				           prop: "materialName",
			
@@ -150,12 +248,24 @@ export default {
 
				           width: 150,
			
 
				         },
			
 
				         {
			
 
				-          prop: "orderMaterialNumber",
			
 
				+          prop: "materialNumber",
			
 
				           label: "物资件数",
			
 
				           width: 100,
			
 
				         },
			
 
				+        {
			
 
				+          prop: "materialWeight",
			
 
				+          label: "物资重量",
			
 
				+          width: 100,
			
 
				+        },
			
 
				       ],
			
 
				+      //(销售公司已审批)
			
 
				       tableData: [],
			
 
				+      //(财务已审批)
			
 
				+      tableData1: [],
			
 
				+      //(已上报)
			
 
				+      tableData2: [],
			
 
				+      //(未上报)
			
 
				+      tableData3: [],
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -181,7 +291,7 @@ export default {
 
				     // detailedClick(saleOrderId){
			
 
				     //   this.$router.push("saleOrderMaterial/" + saleOrderId);
			
 
				     // },
			
 
				-    // 查看物资详情
			
 
				+    // -------查看物资详情 (销售公司已审批)
			
 
				     detailclick(row) {
			
 
				       // 记录重复点击次数
			
 
				       if (this.oldRow === row) {
			
@@ -204,19 +314,107 @@ export default {
 
				       }
			
 
				       // 重置上一个点击对象
			
 
				       this.oldRow = row;
			
 
				-      // this.getMaterial(row.saleOrderId);
			
 
				-            this.getMaterial();
			
 
				-    },
			
 
				-    // 根据销售订单id查询物资信息
			
 
				-    getMaterial() {
			
 
				+      // 根据销售订单id查询物资信息
			
 
				       this.axios
			
 
				-      // "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId
			
 
				-        .get("/api/v1/tms/getMaterial?orderId=" +1074)
			
 
				+        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" +row.saleOrderId)
			
 
				         .then((res) => {
			
 
				           this.tableData = res.data.data;
			
 
				         });
			
 
				     },
			
 
				 
			
 
				+    // -------查看物资详情 (财务已审批)
			
 
				+    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.oldRow1);
			
 
				+          } else {
			
 
				+            this.oldRowCount1 = 1;
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.oldRow1 = null;
			
 
				+          return;
			
 
				+        }
			
 
				+      }
			
 
				+      // 重置上一个点击对象
			
 
				+      this.oldRow1 = row;
			
 
				+      // 根据销售订单id查询物资信息
			
 
				+      this.axios
			
 
				+        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" +row.saleOrderId)
			
 
				+        .then((res) => {
			
 
				+          this.tableData1 = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				+
			
 
				+    // -------查看物资详情 (已上报)
			
 
				+    detailclick2(row) {
			
 
				+      // 记录重复点击次数
			
 
				+      if (this.oldRow2 === row) {
			
 
				+        this.oldRowCount2 += 1;
			
 
				+      }
			
 
				+      // 切换当前详情表
			
 
				+      this.$refs.table2.toggleRowExpansion(row);
			
 
				+      // 打开前关闭上一个详情表
			
 
				+      if (this.oldRow2 != "") {
			
 
				+        if (this.oldRow2 != row) {
			
 
				+          if (this.oldRowCount2 % 2 === 1) {
			
 
				+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
			
 
				+          } else {
			
 
				+            this.oldRowCount2 = 1;
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.oldRow2 = null;
			
 
				+          return;
			
 
				+        }
			
 
				+      }
			
 
				+      // 重置上一个点击对象
			
 
				+      this.oldRow2 = row;
			
 
				+      // 根据销售订单id查询物资信息
			
 
				+      this.axios
			
 
				+        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" +row.saleOrderId)
			
 
				+        .then((res) => {
			
 
				+          this.tableData2 = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				+
			
 
				+    // -------查看物资详情 (未上报)
			
 
				+    detailclick3(row) {
			
 
				+      // 记录重复点击次数
			
 
				+      if (this.oldRow3 === row) {
			
 
				+        this.oldRowCount3 += 1;
			
 
				+      }
			
 
				+      // 切换当前详情表
			
 
				+      this.$refs.table3.toggleRowExpansion(row);
			
 
				+      // 打开前关闭上一个详情表
			
 
				+      if (this.oldRow3 != "") {
			
 
				+        if (this.oldRow3 != row) {
			
 
				+          if (this.oldRowCount3 % 2 === 1) {
			
 
				+            this.$refs.table3.toggleRowExpansion(this.oldRow3);
			
 
				+          } else {
			
 
				+            this.oldRowCount3 = 1;
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.oldRow3 = null;
			
 
				+          return;
			
 
				+        }
			
 
				+      }
			
 
				+      // 重置上一个点击对象
			
 
				+      this.oldRow3 = row;
			
 
				+      // 根据销售订单id查询物资信息
			
 
				+      this.axios
			
 
				+        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" +row.saleOrderId)
			
 
				+        .then((res) => {
			
 
				+          this.tableData3 = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				+
			
 
				     // 上传
			
 
				     uploadclick(saleOrderId) {
			
 
				       this.$confirm("是否上传", "提示", {
			
--- a/src/views/appoint/components/saleContract/saleOrderArrange.vue
+++ b/src/views/appoint/components/saleContract/saleOrderArrange.vue
@@ -13,10 +13,10 @@
 
				     </div>
			
 
				     <template>
			
 
				       <div>
			
 
				-        <dilTable v-bind.sync="first" @selection-change="selectionChange">
			
 
				-            <el-table-column fixed="right" label="操作" width="150">
			
 
				-                <template slot-scope="scope">
			
 
				-                <el-button
			
 
				+        <dilTable v-bind.sync="first" @selection-change="selectionChange" ref="table">
			
 
				+          <el-table-column fixed="right" label="操作" width="200">
			
 
				+            <template slot-scope="scope">
			
 
				+              <el-button
			
 
				                 @click="lookclick(scope.row.saleOrderId)"
			
 
				                 type="text"
			
 
				                 size="small"
			
@@ -28,8 +28,33 @@
 
				                 size="small"
			
 
				                 >修改日志</el-button
			
 
				               >
			
 
				-                </template>
			
 
				-            </el-table-column>
			
 
				+              <el-button
			
 
				+                @click="materialclick(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>
			
 
				       </div>
			
 
				     </template>
			
@@ -47,51 +72,79 @@ export default {
 
				         mapList: [],
			
 
				       },
			
 
				       activeName: "first",
			
 
				+      //记录旧的row对象
			
 
				+      oldRow: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
			
 
				+      oldRowCount: 1,
			
 
				+      tableHead: [
			
 
				+        {
			
 
				+          prop: "materialName",
			
 
				+          label: "物资名称",
			
 
				+          width: 150,
			
 
				+        },
			
 
				+        {
			
 
				+          prop: "specificationModel",
			
 
				+          label: "规格型号",
			
 
				+          width: 150,
			
 
				+        },
			
 
				+        {
			
 
				+          prop: "materialNumber",
			
 
				+          label: "物资件数",
			
 
				+          width: 100,
			
 
				+        },
			
 
				+        {
			
 
				+          prop: "materialWeight",
			
 
				+          label: "物资重量",
			
 
				+          width: 100,
			
 
				+        },
			
 
				+      ],
			
 
				+      tableData: [],
			
 
				     };
			
 
				+    
			
 
				   },
			
 
				   methods: {
			
 
				-    Issue(){
			
 
				-    if(this.first.mapList.length==0){
			
 
				-      this.$message({
			
 
				-            type: "warning",
			
 
				-            message: "请先选择订单!",
			
 
				-          });
			
 
				-    }else{
			
 
				-    this.$confirm("是否下发", "提示", {
			
 
				-        confirmButtonText: "确定",
			
 
				-        cancelButtonText: "取消",
			
 
				-        type: "warning",
			
 
				-        center: true,
			
 
				-      })
			
 
				-      .then(() => {
			
 
				-      //初始化maplist
			
 
				-      var mapList = [];
			
 
				-      this.first.mapList.forEach((item,i) => {
			
 
				-        //初始化mapItem
			
 
				-        var mapItem={
			
 
				-                //销售订单物资中间表id
			
 
				-                saleOrderMaterialId : 0,
			
 
				-            };
			
 
				-        mapItem.saleOrderMaterialId=item.saleOrderMaterialId;
			
 
				-        mapList.push(mapItem);
			
 
				-      });
			
 
				-          this.$message({
			
 
				-            type: "success",
			
 
				-            message: "下发成功!",
			
 
				-          });
			
 
				-         this.axios.post("/api/v1/ams/issueTruckNo", mapList).then((res) => {
			
 
				-          if (res.data.code == "200") {
			
 
				-            this.$router.go(0);
			
 
				-          }
			
 
				+    Issue() {
			
 
				+      if (this.first.mapList.length == 0) {
			
 
				+        this.$message({
			
 
				+          type: "warning",
			
 
				+          message: "请先选择订单!",
			
 
				         });
			
 
				+      } else {
			
 
				+        this.$confirm("是否下发", "提示", {
			
 
				+          confirmButtonText: "确定",
			
 
				+          cancelButtonText: "取消",
			
 
				+          type: "warning",
			
 
				+          center: true,
			
 
				         })
			
 
				-        .catch(() => {
			
 
				-          this.$message({
			
 
				-            type: "info",
			
 
				-            message: "取消上传!",
			
 
				+          .then(() => {
			
 
				+            //初始化maplist
			
 
				+            var mapList = [];
			
 
				+            this.first.mapList.forEach((item, i) => {
			
 
				+              //初始化mapItem
			
 
				+              var mapItem = {
			
 
				+                //销售订单物资中间表id
			
 
				+                saleOrderMaterialId: 0,
			
 
				+              };
			
 
				+              mapItem.saleOrderMaterialId = item.saleOrderMaterialId;
			
 
				+              mapList.push(mapItem);
			
 
				+            });
			
 
				+            this.$message({
			
 
				+              type: "success",
			
 
				+              message: "下发成功!",
			
 
				+            });
			
 
				+            this.axios.post("/api/v1/ams/issueTruckNo", mapList).then((res) => {
			
 
				+              if (res.data.code == "200") {
			
 
				+                this.$router.go(0);
			
 
				+              }
			
 
				+            });
			
 
				+          })
			
 
				+          .catch(() => {
			
 
				+            this.$message({
			
 
				+              type: "info",
			
 
				+              message: "取消上传!",
			
 
				+            });
			
 
				           });
			
 
				-        });
			
 
				-    }
			
 
				+      }
			
 
				     },
			
 
				     lookclick(saleOrderId) {
			
 
				       this.$router.push("/saleOrderDetailApproved/" + saleOrderId);
			
@@ -99,6 +152,41 @@ export default {
 
				     passclick(saleOrderId) {
			
 
				       this.$router.push("/saleOrderUpdateLog/" + saleOrderId);
			
 
				     },
			
 
				+    materialclick(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.saleOrderMaterialId);
			
 
				+    },
			
 
				+    // 根据车序号id查询物资信息
			
 
				+    getMaterial(saleOrderMaterialId) {
			
 
				+      this.axios
			
 
				+        .post(
			
 
				+          "/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +
			
 
				+            saleOrderMaterialId
			
 
				+        )
			
 
				+        .then((res) => {
			
 
				+          this.tableData = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				     selectionChange(selection) {
			
 
				       this.first.mapList = selection;
			
 
				     },
			
--- a/src/views/index/components/download.vue
+++ b/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>
			
--- a/src/views/index/router/index.js
+++ b/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',
			
--- a/src/views/inward/app.js
+++ b/src/views/inward/app.js
@@ -19,12 +19,12 @@ import apollo from '@/config/apolloConfig.js'
 
				 import DilCommonUI from "@/components/DilCommonUI";
			
 
				 Vue.use(DilCommonUI);
			
 
				 
			
 
				-import 'xe-utils' 
			
 
				+// import 'xe-utils' 
			
 
				 
			
 
				-import VXETable from 'vxe-table'
			
 
				-import 'vxe-table/lib/style.css'
			
 
				-Vue.use(VXETable)
			
 
				-Vue.prototype.$XModal = VXETable.modal
			
 
				+// import VXETable from 'vxe-table'
			
 
				+// import 'vxe-table/lib/style.css'
			
 
				+// Vue.use(VXETable)
			
 
				+// Vue.prototype.$XModal = VXETable.modal
			
 
				 
			
 
				 
			
 
				 // 关闭生产模式下给出的提示
			
--- a/src/views/inward/components/truckAppoint/addPlan.vue
+++ b/src/views/inward/components/truckAppoint/addPlan.vue
@@ -2,11 +2,9 @@
 
				 <template>
			
 
				   <div id="endMaintenance">
			
 
				     <page-title>新增计划</page-title>
			
 
				-    <div>
			
 
				-      <div class="truckList1">
			
 
				-      <div class="truckList from">
			
 
				-        <span class="text">选择承运商：</span>
			
 
				-       <el-autocomplete
			
 
				+  <el-form  label-width="80px">
			
 
				+  <el-form-item label="承运商">
			
 
				+    <el-autocomplete
			
 
				       class="inline-input"
			
 
				       v-model="state2"
			
 
				       :fetch-suggestions="querySearch"
			
@@ -19,12 +17,11 @@
 
				     <div class="name">{{ item.value }}</div>
			
 
				   </template>
			
 
				     </el-autocomplete>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-      <div class="form-box">
			
 
				-        <dil-form :formId="305" v-model="form"></dil-form>       
			
 
				-      </div>
			
 
				-    </div>
			
 
				+  </el-form-item>
			
 
				+  <el-form-item label="车数" >
			
 
				+    <el-input   v-model="planTruckNumber" placeholder="必填" ></el-input>
			
 
				+  </el-form-item>
			
 
				+</el-form>
			
 
				     <template>
			
 
				 			<div>		
			
 
				 						<dilTable v-bind.sync="first" @radio-change="currentRadioChange">
			
@@ -46,13 +43,17 @@ export default {
 
				     return {
			
 
				       restaurants: [],
			
 
				       state2:null,
			
 
				+      planTruckNumber:null,
			
 
				       carrierId:null,
			
 
				       form: {},
			
 
				       first:{
			
 
				         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
			
 
				         selectionType: "radio",
			
 
				 				mapList: [],
			
 
				-      }
			
 
				+      },
			
 
				+      numberValidateForm: {
			
 
				+          planTruckNumber: ''
			
 
				+        }
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -87,13 +88,24 @@ export default {
 
				     },
			
 
				     // 新增
			
 
				     makeSure() {
			
 
				-      console.log(this.form)
			
 
				+      console.log(this.planTruckNumber)
			
 
				+      console.log(typeof(this.planTruckNumber))  
			
 
				+      if(this.carrierId == null){
			
 
				+        this.$alert('请输入承运商！')
			
 
				+        return
			
 
				+      }else if(this.planTruckNumber == null){
			
 
				+        this.$alert('请输入车数！')
			
 
				+        return
			
 
				+      }else if(typeof(this.mapList.requirementId) == 'undefined'){
			
 
				+        this.$alert('请选择需要制定计划的需求！')
			
 
				+        return
			
 
				+      }
			
 
				       let plan = {
			
 
				         requirementId : this.mapList.requirementId,
			
 
				-        planTruckNumber: this.form.planTruckNumber,
			
 
				+        planTruckNumber: this.planTruckNumber,
			
 
				         carrierId: this.carrierId
			
 
				       };
			
 
				-          
			
 
				+      console.log(plan)  
			
 
				       this.axios
			
 
				         .post(
			
 
				           "/api/v1/ams/addTruckPlan",
			
@@ -121,6 +133,9 @@ export default {
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+.el-form{
			
 
				+  margin-left: 30%;
			
 
				+}
			
 
				 .el-form-item{
			
 
				   display: flex;
			
 
				 }
			
@@ -139,6 +154,9 @@ export default {
 
				   width: 100%;
			
 
				   .truckList {
			
 
				     width: 96%;
			
 
				+    .el-input{
			
 
				+     width:128%
			
 
				+    }
			
 
				     .text {
			
 
				       display: inline-block;
			
 
				       width: 120px;
			
--- a/src/views/inward/components/truckAppoint/addRequirement.vue
+++ b/src/views/inward/components/truckAppoint/addRequirement.vue
@@ -4,78 +4,51 @@
 
				     <page-title>新增需求</page-title>
			
 
				     <div>
			
 
				       <div class="form-box f2">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="采购订单号">
			
 
				-            <el-input v-model="purchaseOrder" disabled> </el-input>
			
 
				+            <el-input v-model="purchaseOrder" placeholder="必填" disabled > </el-input>
			
 
				           </el-form-item>
			
 
				           <el-form-item>
			
 
				             <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
			
 
				           </el-form-item>
			
 
				         </el-form>
			
 
				-      </div>
			
 
				-      <div class="form-box f3">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="外轮船名">
			
 
				             <el-input v-model="foreignShipName" disabled>浏览</el-input>
			
 
				           </el-form-item>
			
 
				-           <el-form-item>
			
 
				-            <el-button type="primary" disabled>船名</el-button>
			
 
				-          </el-form-item>
			
 
				         </el-form>
			
 
				-      </div>
			
 
				-      <div class="form-box f2">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="发货单位">
			
 
				             <el-input v-model="supplierName" disabled> </el-input>
			
 
				           </el-form-item>
			
 
				-          <el-form-item>
			
 
				-            <el-button type="primary" disabled>发货单位</el-button>
			
 
				-          </el-form-item>
			
 
				         </el-form>
			
 
				-      </div>
			
 
				-      <div class="form-box f2">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="收货单位">
			
 
				             <el-input v-model="shipperName" disabled> </el-input>
			
 
				-          </el-form-item>
			
 
				-          <el-form-item>
			
 
				-            <el-button type="primary" disabled>收货单位</el-button>
			
 
				-          </el-form-item>
			
 
				+          </el-form-item>        
			
 
				         </el-form>
			
 
				-      </div>
			
 
				-      <div class="form-box f4">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="物资名称">
			
 
				             <el-input v-model="materialName" disabled> </el-input>
			
 
				           </el-form-item>
			
 
				-           <el-form-item>
			
 
				-            <el-button type="primary" disabled>物资</el-button>
			
 
				-          </el-form-item>
			
 
				         </el-form>
			
 
				-      </div>
			
 
				-      <div class="form-box f5">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="装车点">
			
 
				-            <el-input v-model="truckPoint" disabled> </el-input>
			
 
				+            <el-input v-model="truckPoint" placeholder="必填" disabled> </el-input>
			
 
				           </el-form-item>
			
 
				           <el-form-item>
			
 
				             <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
			
 
				           </el-form-item>
			
 
				         </el-form>
			
 
				-      </div>
			
 
				-      <div class="form-box f5">
			
 
				-        <el-form :inline="true" class="demo-form-inline">
			
 
				+        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				           <el-form-item label="卸车点">
			
 
				-            <el-input v-model="truckPoint1" disabled> </el-input>
			
 
				+            <el-input v-model="truckPoint1" placeholder="必填" disabled> </el-input>
			
 
				           </el-form-item>
			
 
				           <el-form-item>
			
 
				             <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
			
 
				           </el-form-item>
			
 
				         </el-form>
			
 
				       </div>
			
 
				-      <div class="form-box">
			
 
				-        <dil-form :formId="300" v-model="form"></dil-form>
			
 
				-      </div>
			
 
				       <el-drawer
			
 
				         :visible.sync="drawer"
			
 
				         :direction="direction"
			
@@ -123,6 +96,9 @@
 
				         </div>
			
 
				       </el-drawer>
			
 
				     </div>
			
 
				+    <div class="box-form">
			
 
				+        <dil-form :formId="300" v-model="form"></dil-form>
			
 
				+    </div>
			
 
				     <div class="button-box">
			
 
				       <el-button type="primary" @click="makeSure">确认新增</el-button>
			
 
				       <el-button type="primary" @click="cancel">返回</el-button>
			
@@ -175,7 +151,6 @@ export default {
 
				     ondrawer(num) {
			
 
				       this.drawer = true;
			
 
				       this.a = num;
			
 
				-      console.log(this.a)
			
 
				     },
			
 
				     handleClose(done) {
			
 
				       done();
			
@@ -186,8 +161,13 @@ export default {
 
				         this.second.requestUrl =
			
 
				           "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
			
 
				       } else {
			
 
				-        this.second1.requestUrl =
			
 
				-          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
			
 
				+        if(this.input == ""){
			
 
				+          this.second1.requestUrl =
			
 
				+          "/api/v1/ams/getWareHouse?apiId=251"
			
 
				+        }else{
			
 
				+            this.second1.requestUrl =
			
 
				+          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input
			
 
				+        }     
			
 
				       }
			
 
				     },
			
 
				     currentRadioChange1(selection) {
			
@@ -200,37 +180,66 @@ export default {
 
				     },
			
 
				     currentRadioChange2(selection) {
			
 
				       this.mapList2 = selection
			
 
				-      console.log(this.mapList2)
			
 
				-      var s1 = "";
			
 
				-      this.truckPoint= s1.concat(this.mapList2.companyBranchName,this.mapList2.companyBranchName,this.mapList2.wareHouseName)
			
 
				-       this.mapList2.companyBranchName+' '+this.mapList2.companyBranchName+this.mapList2.wareHouseName
			
 
				+      console.log(this.mapList2)     
			
 
				+      if(this.mapList2.companyBranchName == null){
			
 
				+          this.mapList2.companyBranchName = ''
			
 
				+      }
			
 
				+      if(this.mapList2.branchFactory == null){
			
 
				+          this.mapList2.branchFactory = ''
			
 
				+      }
			
 
				+      if(this.mapList2.wareHouseName ==null){
			
 
				+          this.mapList2.wareHouseName = ''
			
 
				+      }
			
 
				+      this.truckPoint= this.mapList2.companyBranchName+this.mapList2.branchFactory+this.mapList2.wareHouseName
			
 
				     },
			
 
				     currentRadioChange3(selection) {
			
 
				       this.mapList3 = selection
			
 
				-      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.companyBranchName+this.mapList3.wareHouseName
			
 
				-    },
			
 
				+      console.log(selection)
			
 
				+        if(this.mapList3.companyBranchName == null){
			
 
				+          this.mapList3.companyBranchName = ''
			
 
				+      }
			
 
				+      if(this.mapList3.branchFactory == null){
			
 
				+          this.mapList3.branchFactory = ''
			
 
				+      }
			
 
				+      if(this.mapList3.wareHouseName ==null){
			
 
				+          this.mapList3.wareHouseName = ''
			
 
				+      }
			
 
				+      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.branchFactory+this.mapList3.wareHouseName
			
 
				     },
			
 
				     // 新增
			
 
				     makeSure() {
			
 
				-      console.log(this.form.materialNumber)
			
 
				-      console.log(this.form.materialWeight);
			
 
				-      console.log(typeof(this.form.materialNumber));
			
 
				       if(this.purchaseOrder == null){
			
 
				-          this.$alert('没有选择采购订单，请点击浏览选择采购订单')         
			
 
				+          this.$alert('没有选择采购订单，请点击浏览选择采购订单！')
			
 
				+          return         
			
 
				       }else if(this.truckPoint == null){
			
 
				-          this.$alert('没有选择用车地点，请点击浏览选择用车地点')
			
 
				+          this.$alert('没有选择装车点，请点击浏览选择装车点！')
			
 
				+          return
			
 
				       }else if(this.truckPoint1 == null){
			
 
				-          this.$alert('没有选择卸货点，请点击浏览选择卸货点')
			
 
				+          this.$alert('没有选择卸货点，请点击浏览选择卸货点！')
			
 
				+          return
			
 
				+      }else if(typeof(this.form.materialWeight)=='undefined'){
			
 
				+          this.$alert('没有输入物资重量，请输入！')
			
 
				+          return
			
 
				+      }else if(typeof(this.form.requirementType)=='undefined'){
			
 
				+          this.$alert('没有选择需求类型，请选择！')
			
 
				+          return
			
 
				+      }else if(typeof(this.form.requirementTruckTime)=='undefined'){
			
 
				+          this.$alert('没有选择用车时间，请选择！')
			
 
				+          return
			
 
				+      }else if(typeof(this.form.requirementShipperId)=='undefined'){
			
 
				+          this.$alert('没有选择用车单位，请选择！')
			
 
				+          return
			
 
				+      }else if(typeof(this.form.requirementWorkType)=='undefined'){
			
 
				+          this.$alert('没有选择费用类别，请选择！')
			
 
				+          return
			
 
				+      }else if(typeof(this.form.requirementEstimatedDuration)=='undefined'){
			
 
				+          this.$alert('没有输入预计作业时长，请输入！')
			
 
				+          return
			
 
				       }
			
 
				-      // }else if(typeof(this.form.materialNumber) =="undefined"&typeof(this.form.materialWeight) =="undefined"){
			
 
				-      //     this.$alert('请输入物资数量或者物资重量')
			
 
				-      // }
			
 
				       let requiremnet = {
			
 
				         purchaseOrderId: this.mapList1.purchaseOrderId,
			
 
				         requiremntUnitId: this.mapList2.wareHouseId,
			
 
				-        capacityTypeId: this.form.capacityTypeId,
			
 
				         materialWeight: this.form.materialWeight,
			
 
				-        materialNumber: this.form.materialNumber,
			
 
				         requirementEstimatedDuration: this.form.requirementEstimatedDuration,
			
 
				         requirementOverlimit: this.form.requirementOverlimit,
			
 
				         requirementShipperId: this.form.requirementShipperId,
			
@@ -241,7 +250,6 @@ export default {
 
				         requirementWorkType: this.form.requirementWorkType,
			
 
				         requirementUnloadUnitId:this.mapList3.wareHouseId
			
 
				       };
			
 
				-      console.log(requiremnet);
			
 
				       this.axios
			
 
				         .post("/api/v1/ams/addTruckRequirement", requiremnet)
			
 
				         .then((res) => {
			
@@ -259,23 +267,29 @@ export default {
 
				     // 返回
			
 
				     cancel() {
			
 
				       this.$router.go(-1);
			
 
				-    },
			
 
				-  
			
 
				-};
			
 
				+    }, 
			
 
				+}};
			
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				-.el-form-item{
			
 
				-  display: flex;
			
 
				+.form-box{
			
 
				+  display: inline-block;
			
 
				+  margin-left: 38%;
			
 
				+  .el-input{
			
 
				+    width:288px
			
 
				+  }
			
 
				+  .el-form{
			
 
				+    padding: 10px;
			
 
				+  }
			
 
				 }
			
 
				-.form-box,
			
 
				-.button-box
			
 
				-{
			
 
				+.box-form{
			
 
				+  display: flex;
			
 
				+  .el-form-item{
			
 
				   display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				+  }
			
 
				+}
			
 
				+.button-box{
			
 
				+  margin-left: 38%;
			
 
				+  
			
 
				 }
			
 
				 </style>
			
--- a/src/views/inward/components/truckAppoint/updateRequirement.vue
+++ b/src/views/inward/components/truckAppoint/updateRequirement.vue
@@ -2,10 +2,6 @@
 
				 <template>
			
 
				   <div id="endMaintenance">
			
 
				     <page-title>修改需求</page-title>
			
 
				-    <div class="main">
			
 
				-      <span class="text">修改</span>
			
 
				-      <span class="a"></span>
			
 
				-    </div>
			
 
				     <div>
			
 
				 <div class="form-box f2">
			
 
				 <el-form :inline="true"  class="demo-form-inline">
			
@@ -109,7 +105,6 @@ export default {
 
				         .then((res) => {
			
 
				           console.log(res.data.data)
			
 
				           const list = res.data.data;
			
 
				-
			
 
				           this.foreignShipName = list[0].resultForeignShipName,
			
 
				           this.purchaseOrder = list[0].purchaseOrderNo,
			
 
				           this.truckPoint = list[0].wareHouseName,
			
@@ -121,8 +116,8 @@ export default {
 
				           res.data.data.forEach((e) => {
			
 
				             this.form= e;
			
 
				             console.log(e);
			
 
				+            console.log(e);
			
 
				             console.log(this.form1);
			
 
				-            console.log(this.$route.params.resultId);
			
 
				           });
			
 
				         });
			
 
				     },
			
--- a/src/views/inward/components/truckOrder/decomposePlan.vue
+++ b/src/views/inward/components/truckOrder/decomposePlan.vue
@@ -213,8 +213,20 @@ export default {
 
				             },
			
 
				     // 修改
			
 
				     makeSure() {
			
 
				-      console.log(this.$refs.xTable.getInsertRecords())
			
 
				-      console.log(this.form)
			
 
				+      if(this.mapList0.lineId == null){
			
 
				+        this.$alert('没有选择运输路线，请选择！')
			
 
				+        console.log(this.lineId)
			
 
				+        return
			
 
				+      }else if(typeof(this.form.orderType) == 'undefined'){
			
 
				+        this.$alert('没有选择订单类型，请选择')
			
 
				+        return
			
 
				+      }
			
 
				+      for(var i=0;i<this.$refs.xTable.getInsertRecords().length;i++){
			
 
				+        if(this.$refs.xTable.getInsertRecords()[i].capacityNumber == null){
			
 
				+          this.$alert('未选择车牌，请选择车牌')
			
 
				+          return
			
 
				+        }     
			
 
				+      }
			
 
				       let BmsTrainFreight = {
			
 
				           planId:this.$route.params.planId,
			
 
				           lineId:this.mapList0.lineId,
			
--- a/src/views/inward/components/truckOrder/dispatchPlan.vue
+++ b/src/views/inward/components/truckOrder/dispatchPlan.vue
@@ -52,14 +52,14 @@ export default {
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				-    selectionChange(selection) {
			
 
				-      console.log("-----");
			
 
				-      this.first.mapList = selection;
			
 
				-      console.log(this.first.mapList);
			
 
				-      console.log("------");
			
 
				+    selectionChange(selection) { 
			
 
				+      this.first.mapList = selection
			
 
				     },
			
 
				     dispatch() {
			
 
				-      console.log(this.first.mapList);
			
 
				+      if(this.first.mapList.length == 0){
			
 
				+          this.$alert('请选择订单')
			
 
				+          return
			
 
				+      }
			
 
				       this.$confirm("是否分派", "提示", {
			
 
				         confirmButtonText: "确定",
			
 
				         cancelButtonText: "取消",
			
@@ -76,8 +76,9 @@ export default {
 
				                   message: "分派成功!",
			
 
				                 });
			
 
				                 this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=40&test=1"
			
 
				-                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=40&carrierId=1&test=1"
			
 
				+                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=40&test=1"
			
 
				                 this.activeName = 'second'
			
 
				+                this.first.mapList = []
			
 
				               } else {
			
 
				                 this.$message({
			
 
				                   message: "分派失败",
			
--- a/src/views/sale/components/transport_appointment/directionalDispatch.vue
+++ b/src/views/sale/components/transport_appointment/directionalDispatch.vue
@@ -20,11 +20,42 @@
 
				       <div>
			
 
				         <el-tabs v-model="activeName">
			
 
				           <el-tab-pane label="未下发" name="first">
			
 
				-            <dilTable v-bind.sync="first" @selection-change="selectionChange">
			
 
				+            <dilTable v-bind.sync="first" ref="table" @selection-change="selectionChange">
			
 
				+
			
 
				+              <el-table-column fixed="right" label="操作" width="70">
			
 
				+            <template slot-scope="scope">
			
 
				+              <el-button
			
 
				+                @click="detailclick(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 v-bind.sync="second" ref="table1">
			
 
				               <el-table-column fixed="right" label="操作" width="100">
			
 
				                 <template slot-scope="scope">
			
 
				                   <el-button
			
@@ -33,8 +64,35 @@
 
				                     size="small"
			
 
				                     >公开</el-button
			
 
				                   >
			
 
				+                  <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-tabs>
			
@@ -89,6 +147,38 @@ export default {
 
				         mapList: [],
			
 
				       },
			
 
				 
			
 
				+      //记录旧的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: [],
			
 
				+      tableData1: [],
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -183,49 +273,72 @@ export default {
 
				       }
			
 
				       
			
 
				     },
			
 
				-    // Issue() {
			
 
				-    //   console.log();
			
 
				-    //   if (this.first.mapList.length !== 0) {
			
 
				-    //     this.$confirm("是否下发", "提示", {
			
 
				-    //       confirmButtonText: "确定",
			
 
				-    //       cancelButtonText: "取消",
			
 
				-    //       type: "warning",
			
 
				-    //       center: true,
			
 
				-    //     })
			
 
				-    //       .then(() => {
			
 
				-    //         this.axios
			
 
				-    //           .post(
			
 
				-    //             "/api/v1/ams/addFixedAmsDispatchSaleOrder",
			
 
				-    //             this.first.mapList
			
 
				-    //           )
			
 
				-    //           .then((res) => {
			
 
				-    //             if (res.data.code == "200") {
			
 
				-    //               this.$message({
			
 
				-    //                 type: "success",
			
 
				-    //                 message: "下发成功!",
			
 
				-    //               });
			
 
				-		// 		  this.$router.go(0)
			
 
				-    //             } else {
			
 
				-    //               this.$message({
			
 
				-    //                 message: "下发失败",
			
 
				-    //                 type: "warning",
			
 
				-    //               });
			
 
				-    //             }
			
 
				-    //           });
			
 
				-    //       })
			
 
				-    //       .catch(() => {
			
 
				-    //         this.$message({
			
 
				-    //           type: "info",
			
 
				-    //           message: "取消下发!",
			
 
				-    //         });
			
 
				-    //       });
			
 
				-    //   } else {
			
 
				-    //     this.$message({
			
 
				-    //       type: "warning",
			
 
				-    //       message: "请选择订单后再下发!",
			
 
				-    //     });
			
 
				-    //   }
			
 
				-    // },
			
 
				+
			
 
				+    // -------查看物资详情(未下发)
			
 
				+    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.saleOrderMaterialId);
			
 
				+    },
			
 
				+    // 根据销售订单物资中间表id查询物资信息
			
 
				+    getMaterial(saleOrderMaterialId) {
			
 
				+      this.axios
			
 
				+        .post("/api/v1/ams/getTruckNoMaterialList?saleOrderMaterialId=" +saleOrderMaterialId)
			
 
				+        .then((res) => {
			
 
				+          this.tableData = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				+    // --------查看物资详情(已下发)
			
 
				+    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.oldRow1);
			
 
				+          } else {
			
 
				+            this.oldRowCount1 = 1;
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.oldRow1 = null;
			
 
				+          return;
			
 
				+        }
			
 
				+      }
			
 
				+      // 重置上一个点击对象
			
 
				+      this.oldRow1 = row;
			
 
				+      //根据销售订单物资中间表id查询物资信息
			
 
				+
			
 
				+      this.axios
			
 
				+        .post("/api/v1/ams/getDispatchMaterialList?dispatchId=" +row.dispatchId)
			
 
				+        .then((res) => {
			
 
				+          this.tableData1 = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				+
			
 
				   },
			
 
				 };
			
 
				 </script>
			
--- a/src/views/sale/components/transport_appointment/openDistribution.vue
+++ b/src/views/sale/components/transport_appointment/openDistribution.vue
@@ -21,8 +21,32 @@
 
				           <el-button @click="Grab(scope)" type="text" size="small">
			
 
				             接收
			
 
				           </el-button>
			
 
				+          <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">
			
@@ -55,6 +79,7 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   data(){
			
 
				     return{
			
@@ -69,13 +94,44 @@ export default {
 
				         requestUrl: "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0",
			
 
				       },
			
 
				       second:{
			
 
				-        requestUrl:"/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierId=73",
			
 
				+        requestUrl:"/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSSOId="+ getCookie('userId'),
			
 
				       },
			
 
				       third:{
			
 
				         requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246",
			
 
				         selectionType: "radio",
			
 
				 				mapList: []      
			
 
				-      }
			
 
				+      },
			
 
				+      //记录旧的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:{
			
@@ -172,6 +228,41 @@ export default {
 
				           });
			
 
				         });
			
 
				     },
			
 
				+
			
 
				+    // -------查看物资详情(未接收)
			
 
				+    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>
			
--- a/src/views/sale/components/transport_excute/enFactoryResult.vue
+++ b/src/views/sale/components/transport_excute/enFactoryResult.vue
@@ -70,6 +70,11 @@ export default {
 
				           label: "物资件数",
			
 
				           width: 100,
			
 
				         },
			
 
				+        {
			
 
				+          prop: "orderMaterialWeight",
			
 
				+          label: "物资重量",
			
 
				+          width: 100,
			
 
				+        },
			
 
				       ],
			
 
				       tableData: [],
			
 
				     };
			
--- a/src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue
+++ b/src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue
@@ -70,6 +70,11 @@ export default {
 
				           label: "物资件数",
			
 
				           width: 100,
			
 
				         },
			
 
				+        {
			
 
				+          prop: "orderMaterialWeight",
			
 
				+          label: "物资重量",
			
 
				+          width: 100,
			
 
				+        },
			
 
				       ],
			
 
				       tableData: [],
			
 
				     };
			
--- a/src/views/systemConfig/components/organizManage.vue
+++ b/src/views/systemConfig/components/organizManage.vue
@@ -1156,16 +1156,50 @@ export default {
 
				                     form: data,
			
 
				                   })
			
 
				                   .then((res) => {
			
 
				-                    console.log(res,'修改成功')
			
 
				-                    console.log(res.data.orgId,'机构主键id');
			
 
				-                    console.log(res.data.depType,"机构级别");
			
 
				-                    console.log(res.data.orgName,"机构名称");
			
 
				-                    console.log(res.data.pId,"父级机构id");
			
 
				-                    
			
 
				                     this.addLoading1 = false;
			
 
				                     //
			
 
				                     if (res.code === "0") {
			
 
				-                      this.$message.success("保存成功");
			
 
				+                      let pId = null;
			
 
				+                      if (res.data.pId) {
			
 
				+                        pId = res.data.pId;
			
 
				+                      }
			
 
				+                      let map = {
			
 
				+                        orgId: res.data.orgId,
			
 
				+                        depType: res.data.depType,
			
 
				+                        orgName: res.data.orgName,
			
 
				+                        pId: pId,
			
 
				+                      };
			
 
				+                      //调用物流系统的资源管理模块的接口，修改组织机构。
			
 
				+                      this.axios
			
 
				+                        .post("/api/v1/rms/updateShipperResult", map)
			
 
				+                        .then((res) => {
			
 
				+                          console.log(res, "物流修改成功");
			
 
				+                          if (res.data.code == "200") {
			
 
				+                            this.$message.success("保存成功");
			
 
				+                          } else {
			
 
				+                            this.store
			
 
				+                              .dispatch(
			
 
				+                                "system/organizManage/delOrg",
			
 
				+                                map.orgId
			
 
				+                              )
			
 
				+                              .then((res) => {
			
 
				+                                if (res.code === "0") {
			
 
				+                                  this.$message.success("保存失败");
			
 
				+                                  this.$router.go(0);
			
 
				+                                }
			
 
				+                              });
			
 
				+                          }
			
 
				+                        })
			
 
				+                        .catch((err) => {
			
 
				+                          this.store
			
 
				+                            .dispatch("system/organizManage/delOrg", map.orgId)
			
 
				+                            .then((res) => {
			
 
				+                              if (res.code === "0") {
			
 
				+                                this.$message.success("保存失败");
			
 
				+                                this.$router.go(0);
			
 
				+                              }
			
 
				+                            });
			
 
				+                        });
			
 
				                       // //  更新菜单项
			
 
				                       let tempItem = null;
			
 
				                       dgTree(this.orgTree, "children", (item) => {
			
@@ -1207,11 +1241,6 @@ export default {
 
				             this.store
			
 
				               .dispatch("system/organizManage/addOrg", data)
			
 
				               .then((res) => {
			
 
				-                console.log(res,'添加成功')
			
 
				-                console.log(res.data.orgId,'机构主键id');
			
 
				-                console.log(res.data.depType,"机构级别");
			
 
				-                console.log(res.data.orgName,"机构名称");
			
 
				-                console.log(res.data.pId,"父级机构id");
			
 
				                 //
			
 
				                 this.addLoading2 = false;
			
 
				                 //
			
@@ -1222,7 +1251,45 @@ export default {
 
				                   ) {
			
 
				                     this.addOrgDutys(res.data.orgId, this.formItem.dutys);
			
 
				                   }
			
 
				-                  this.$message.success("添加成功");
			
 
				+                  console.log(res, "sso添加成功");
			
 
				+                  let pId = null;
			
 
				+                  if (res.data.pId) {
			
 
				+                    pId = res.data.pId;
			
 
				+                  }
			
 
				+                  let map = {
			
 
				+                    orgId: res.data.orgId,
			
 
				+                    depType: res.data.depType,
			
 
				+                    orgName: res.data.orgName,
			
 
				+                    pId: pId,
			
 
				+                  };
			
 
				+                  //调用物流系统的资源管理模块的接口，新增组织机构。
			
 
				+                  this.axios
			
 
				+                    .post("/api/v1/rms/addShipperResult", map)
			
 
				+                    .then((res) => {
			
 
				+                      console.log(res, "物流添加成功");
			
 
				+                      if (res.data.code == "200") {
			
 
				+                        this.$message.success("添加成功");
			
 
				+                      } else {
			
 
				+                        this.store
			
 
				+                          .dispatch("system/organizManage/delOrg", map.orgId)
			
 
				+                          .then((res) => {
			
 
				+                            if (res.code === "0") {
			
 
				+                              this.$message.success("新增失败");
			
 
				+                              this.$router.go(0);
			
 
				+                            }
			
 
				+                          });
			
 
				+                      }
			
 
				+                    })
			
 
				+                    .catch((err) => {
			
 
				+                      this.store
			
 
				+                        .dispatch("system/organizManage/delOrg", map.orgId)
			
 
				+                        .then((res) => {
			
 
				+                          if (res.code === "0") {
			
 
				+                            this.$message.success("新增失败");
			
 
				+                            this.$router.go(0);
			
 
				+                          }
			
 
				+                        });
			
 
				+                    });
			
 
				                   //  更新树
			
 
				                   this.$refs["orgTree"].append(res.data, this.formItem.pId);
			
 
				                   this.$refs["orgTree"].setCurrentKey(res.data.id);
			
@@ -1301,50 +1368,62 @@ export default {
 
				      * 删除树节点元素
			
 
				      */
			
 
				     delTreeNode(node, data) {
			
 
				-      if (
			
 
				-        (data.children && data.children.length > 0) ||
			
 
				-        (node.childNodes && node.childNodes.length > 0)
			
 
				-      ) {
			
 
				-        this.$message.error("此节点有子节点，不允许删除");
			
 
				-        return false;
			
 
				-      }
			
 
				-      //
			
 
				-      this.$confirm("确定要删除已选择的记录吗？", "提示", {
			
 
				-        customClass: "org-Manage-changeprimaryforbutton",
			
 
				-        confirmButtonText: "确定",
			
 
				-        cancelButtonText: "取消",
			
 
				-        type: "warning",
			
 
				-      })
			
 
				-        .then(() => {
			
 
				-          this.store
			
 
				-            .dispatch("system/organizManage/delOrg", data.orgId)
			
 
				-            .then((res) => {
			
 
				-              if (res.code === "0") {
			
 
				-                this.$message.success("删除成功");
			
 
				-                //  更新树
			
 
				-                this.handleReset("formItem");
			
 
				-                this.$refs["orgTree"].remove(node);
			
 
				-              } else {
			
 
				-                this.$message.error(res.message);
			
 
				-              }
			
 
				-            });
			
 
				+      if (data.orgId !== "924126339513061376" &&  data.orgId !== "924126716337721344") {
			
 
				+        if (
			
 
				+          (data.children && data.children.length > 0) ||
			
 
				+          (node.childNodes && node.childNodes.length > 0)
			
 
				+        ) {
			
 
				+          this.$message.error("此节点有子节点，不允许删除");
			
 
				+          return false;
			
 
				+        }
			
 
				+        //
			
 
				+        this.$confirm("确定要删除已选择的记录吗？", "提示", {
			
 
				+          customClass: "org-Manage-changeprimaryforbutton",
			
 
				+          confirmButtonText: "确定",
			
 
				+          cancelButtonText: "取消",
			
 
				+          type: "warning",
			
 
				         })
			
 
				-        .catch(() => {
			
 
				-          this.$message.info("已取消操作");
			
 
				-        });
			
 
				+          .then(() => {
			
 
				+            this.store
			
 
				+              .dispatch("system/organizManage/delOrg", data.orgId)
			
 
				+              .then((res) => {
			
 
				+                if (res.code === "0") {
			
 
				+                  this.axios
			
 
				+                    .post("/api/v1/rms/deleteShipperResult", {
			
 
				+                      orgId: data.orgId,
			
 
				+                    })
			
 
				+                    .then((res) => {
			
 
				+                      console.log(res);
			
 
				+                      this.$message.success("删除成功");
			
 
				+                    });
			
 
				+                  //  更新树
			
 
				+                  this.handleReset("formItem");
			
 
				+                  console.log(node, node);
			
 
				+                  this.$refs["orgTree"].remove(node);
			
 
				+                } else {
			
 
				+                  this.$message.error(res.message);
			
 
				+                }
			
 
				+              });
			
 
				+          })
			
 
				+          .catch(() => {
			
 
				+            this.$message.info("已取消操作");
			
 
				+          });
			
 
				 
			
 
				-      this.$nextTick(() => {
			
 
				-        document
			
 
				-          .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
			
 
				-          .getElementsByClassName("el-message-box__btns")[0]
			
 
				-          .getElementsByTagName("button")[0]
			
 
				-          .classList.add("el-button--primary");
			
 
				-        document
			
 
				-          .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
			
 
				-          .getElementsByClassName("el-message-box__btns")[0]
			
 
				-          .getElementsByTagName("button")[1]
			
 
				-          .classList.remove("el-button--primary");
			
 
				-      });
			
 
				+        this.$nextTick(() => {
			
 
				+          document
			
 
				+            .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
			
 
				+            .getElementsByClassName("el-message-box__btns")[0]
			
 
				+            .getElementsByTagName("button")[0]
			
 
				+            .classList.add("el-button--primary");
			
 
				+          document
			
 
				+            .getElementsByClassName("org-Manage-changeprimaryforbutton")[0]
			
 
				+            .getElementsByClassName("el-message-box__btns")[0]
			
 
				+            .getElementsByTagName("button")[1]
			
 
				+            .classList.remove("el-button--primary");
			
 
				+        });
			
 
				+      }else{
			
 
				+        this.$message.error("此组织为基础数据不能进行删除");
			
 
				+      }
			
 
				     },
			
 
				     // 树形控件过滤数据
			
 
				     filterOrgTree(value, data) {
			
@@ -1354,17 +1433,15 @@ export default {
 
				     setCheckedKeys() {
			
 
				       this.defaultExpand = false;
			
 
				       for (var i = 0; i < this.$refs.orgTree.store._getAllNodes().length; i++) {
			
 
				-        this.$refs.orgTree.store._getAllNodes()[
			
 
				-          i
			
 
				-        ].expanded = this.defaultExpand;
			
 
				+        this.$refs.orgTree.store._getAllNodes()[i].expanded =
			
 
				+          this.defaultExpand;
			
 
				       }
			
 
				     },
			
 
				     setCheckedNodes() {
			
 
				       this.defaultExpand = true; // 展开所有节点
			
 
				       for (var i = 0; i < this.$refs.orgTree.store._getAllNodes().length; i++) {
			
 
				-        this.$refs.orgTree.store._getAllNodes()[
			
 
				-          i
			
 
				-        ].expanded = this.defaultExpand;
			
 
				+        this.$refs.orgTree.store._getAllNodes()[i].expanded =
			
 
				+          this.defaultExpand;
			
 
				       }
			
 
				     },
			
 
				     orgShowHidden() {
			
@@ -1617,7 +1694,8 @@ export default {
 
				 .rightMenuPr,
			
 
				 .leftMenuPr,
			
 
				 .addMenuPr,
			
 
				-.unlockMenuPr, .lockMenuPr {
			
 
				+.unlockMenuPr,
			
 
				+.lockMenuPr {
			
 
				   display: none;
			
 
				 }
			
 
				 .el-tree-node__content:hover {