3 年之前 · 16cfe547e1
--- a/build/utils.js
+++ b/build/utils.js
@@ -32,8 +32,10 @@ let devModules = ['all'];
 
				 // let devModules = ['index','inward','SporadicManage']
			
 
				 // let devModules = ['index','']
			
 
				 // let devModules = ['all'];
			
 
				+// let devModules = ['index','RMS','systemConfig','TMS']
			
 
				+// let devModules = ['all'];
			
 
				 // let devModules = ['index','inward','appoint','sale']
			
 
				-
			
 
				+// let devModules = ['index','SporadicManage']
			
 
				 if (pathSrc.indexOf('node_modules') > -1) {
			
 
				     devModules = require('../../../cors.js').devModules;
			
 
				 }
			
--- a/dist.zip
+++ b/dist.zip
--- a/index.html
+++ b/index.html
@@ -4,8 +4,7 @@
 
				     <meta charset="utf-8">
			
 
				     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			
 
				     <title>工业互联网平台 iCore-ICP</title>
			
 
				-    <script>
			
 
				-      window.location.href='./views/index.html';
			
 
				+    <script> window.location.href='./views/index.html';
			
 
				     </script>
			
 
				   </head>
			
 
				   <body>
			
--- a/src/config/apolloConfig.js
+++ b/src/config/apolloConfig.js
@@ -73,7 +73,6 @@ const defaultOptions = {
 
				         errorPolicy: 'all'
			
 
				     }
			
 
				 }
			
 
				-
			
 
				 const fragmentMatcher = new IntrospectionFragmentMatcher({
			
 
				     introspectionQueryResultData: {
			
 
				         __schema: {
			
--- a/src/js/QueueStartList.js
+++ b/src/js/QueueStartList.js
@@ -1,14 +0,0 @@
 
				-import axios from 'axios'
			
 
				-//返回月台
			
 
				-export function loadingPoint(URL){
			
 
				-  let loadingpoint = []
			
 
				-  axios.get(URL).then((res)=>{
			
 
				-    res.data.data.forEach(e => {
			
 
				-      let arr = {
			
 
				-          value:e.GRID_NAME
			
 
				-      };
			
 
				-    loadingpoint.push(arr)
			
 
				-    });
			
 
				-  })
			
 
				-  return loadingpoint;
			
 
				-}
			
--- a/src/js/sharedJsFile.js
+++ b/src/js/sharedJsFile.js
@@ -1,47 +0,0 @@
 
				- //把时间戳改为正常可读的时间
			
 
				-export function renderTime(date) {
			
 
				-    if(date !== null){
			
 
				-        let dateee = new Date(date).toJSON();
			
 
				-        return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
			
 
				-    }
			
 
				-    return null;
			
 
				-}
			
 
				-//把毫秒数转换分
			
 
				-export function getDuration(my_time) { 
			
 
				-    if(my_time !== null){
			
 
				-        return Math.floor(my_time / 1000 / 60);
			
 
				-    }
			
 
				-    return null;
			
 
				-}
			
 
				-export function sjTime(orderPlanInTime) {
			
 
				-    var stringTime = renderTime(orderPlanInTime);
			
 
				-    var timestamp1 = stringTime.replace(/-/g, "/");
			
 
				-    return new Date(timestamp1).getTime();
			
 
				-}
			
 
				-//验证电话号码
			
 
				-export function VerifyPhoneNumber(Phone) {
			
 
				-    var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
			
 
				-    if (!myreg.test(Phone)) {
			
 
				-        return false;
			
 
				-    } else {
			
 
				-        return true;
			
 
				-    }
			
 
				-}
			
 
				-export function isNumber(value) {
			
 
				-    //验证是否为数字
			
 
				-    var patrn = /^(-)?\d+(\.\d+)?$/;
			
 
				-    if (patrn.exec(value) == null || value == "") {
			
 
				-      return false;
			
 
				-    } else {
			
 
				-      return true;
			
 
				-    }
			
 
				-  }
			
 
				-export function isIntegerNumber(value) {
			
 
				-    //验证是否为整数
			
 
				-    var patrn = /^\+?[1-9][0-9]*$/g;
			
 
				-    if (patrn.exec(value) == null || value == "") {
			
 
				-      return false;
			
 
				-    } else {
			
 
				-      return true;
			
 
				-    }
			
 
				-  }
			
--- a/src/views/RMS/components/addCapacity.vue
+++ b/src/views/RMS/components/addCapacity.vue
@@ -6,7 +6,7 @@
 
				      <div class="form_box" style="margin-right: 10rem">
			
 
				         <dil-form :formId="309" v-model="form1" ref="from1"></dil-form>
			
 
				       </div>
			
 
				-      <div class="inputBox">
			
 
				+      <!-- <div class="inputBox">
			
 
				     <span class="text">所属承运商</span>
			
 
				       <el-autocomplete
			
 
				         class="input"
			
@@ -17,7 +17,7 @@
 
				         :trigger-on-focus="false"
			
 
				         @select="handleSelect"
			
 
				       ></el-autocomplete>
			
 
				-    </div>
			
 
				+    </div> -->
			
 
				     <div class="button_box">
			
 
				       <el-button @click="cancel">取消</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确定</el-button>
			
@@ -28,120 +28,91 @@
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				 import { getCookie } from "@/utils/util.js";
			
 
				-let _this ;
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				       form1: {},
			
 
				-      // value: undefined,
			
 
				+      value: undefined,
			
 
				       carrierIds: "",
			
 
				       state: "",
			
 
				+      userId:null,
			
 
				       restaurants: [],
			
 
				       accessToken:null,
			
 
				+      userCode:null,
			
 
				+      carrierUserId:null
			
 
				     };
			
 
				   },
			
 
				   created(){
			
 
				-        _this = this;
			
 
				-        _this.accessToken = getCookie("accessToken");
			
 
				-       console.log(this.accessToken ,'cookie1')
			
 
				+      this.carrierUserId = getCookie("userId");
			
 
				+      console.log(this.carrierUserId ,'carrierUserId')
			
 
				+  },
			
 
				+  mounted() {
			
 
				+    
			
 
				   },
			
 
				-  mounted() {},
			
 
				   methods: {
			
 
				-     onInput() {
			
 
				-      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
			
 
				-            })
			
 
				-          });
			
 
				-        }
			
 
				+    //  onInput() {
			
 
				+    //   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 ,'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);
			
 
				+    // },
			
 
				+    deleteUser(userId){
			
 
				+        this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
			
 
				+           this.$message.error("添加失败,车牌可能重复");
			
 
				+           });
			
 
				     },
			
 
				-    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);
			
 
				+    insertRole(userId,userCode){
			
 
				+        this.axios
			
 
				+        .post(
			
 
				+          "pass/v1/sysuserroles/addUserroles?userId=" +
			
 
				+            userId +
			
 
				+            "&userCode=" +
			
 
				+            userCode +
			
 
				+            "&roleId=" +
			
 
				+            '923693668269953024'
			
 
				+        ).then((res) => {
			
 
				+          if (res.code === "0") {
			
 
				+            this.$message.success("操作成功");
			
 
				+            this.saveLoading = false;
			
 
				+            this.rolesTree.loading = false;
			
 
				+          } else {
			
 
				+            this.$message.error(res.message);
			
 
				+          }
			
 
				+        })
			
 
				     },
			
 
				-
			
 
				     makeSure() {
			
 
				-      console.log(this.from1);
			
 
				-      let RmsCapacity = {
			
 
				+        let RmsCapacity = {
			
 
				         capacityTypeId: this.form1.capacityTypeId,
			
 
				         capacityNumber: this.form1.capacityNumber.toUpperCase(),
			
 
				         capacityCorlor: this.form1.capacityCorlor,
			
@@ -150,35 +121,70 @@ export default {
 
				         capacityBlacklist: this.form1.capacityBlacklist,
			
 
				         // carrierId:this.form1.carrierId,
			
 
				         state: this.state,
			
 
				-        carrierName: this.state,
			
 
				-        carrierIds: this.carrierIds,
			
 
				+        carrierUserId:this.carrierUserId
			
 
				       };
			
 
				       if (
			
 
				         RmsCapacity.capacityNumber == null ||
			
 
				         RmsCapacity.capacityCorlor == null ||
			
 
				         RmsCapacity.capacityOwneris == null ||
			
 
				         RmsCapacity.capacityVip == null ||
			
 
				-        RmsCapacity.capacityBlacklist == null ||
			
 
				-        RmsCapacity.carrierIds == null
			
 
				+        RmsCapacity.capacityBlacklist == 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();
			
 
				-          });
			
 
				+        var formData = new FormData();
			
 
				+        formData.append("userName",this.form1.capacityNumber.toUpperCase())
			
 
				+        console.log(formData.get("userName"))
			
 
				+        console.log(formData.set("userName",this.form1.capacityNumber.toUpperCase()))
			
 
				+        console.log(formData)
			
 
				+        formData.append('userCode',this.form1.capacityNumber.toUpperCase())
			
 
				+        formData.append('orgCode','yunli')
			
 
				+        formData.append('orgName','运力')
			
 
				+        formData.append('groupId','506514577756917769')
			
 
				+        formData.append('companyId','713710108567277568')
			
 
				+        formData.append('orgId','924126716337721344')
			
 
				+        console.log(formData.get("userCode"))
			
 
				+        console.log(typeof formData)
			
 
				+        this.$store.dispatch("system/usersManage/addUser", formData).then((res) => {
			
 
				+        console.log(res);
			
 
				+        if (res.code === "0") {
			
 
				+          console.log(res.data.userId)
			
 
				+          this.userId = res.data.userId
			
 
				+          this.userCode = res.data.userCode
			
 
				+          RmsCapacity.ssoId = res.data.userId
			
 
				+          console.log(RmsCapacity)
			
 
				+          this.axios.post("/api/v1/rms/insertCapacity",RmsCapacity).then((res) => {
			
 
				+              console.log(res)
			
 
				+              if(res.data.code == '200'){
			
 
				+                this.insertRole(this.userId,this.userCode)
			
 
				+                this.$message.success("添加成功");
			
 
				+                this.$router.push('capacity')
			
 
				+              }
			
 
				+              else if(res.data.code == '201'){
			
 
				+                this.deleteUser(this.userId)
			
 
				+              }else{
			
 
				+                this.deleteUser(this.userId)
			
 
				+              }
			
 
				+          })         
			
 
				+        } else {
			
 
				+          this.$message.error(res.message);
			
 
				+        }
			
 
				+      });
			
 
				+      //   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() {
			
--- a/src/views/RMS/components/addCarDriver.vue
+++ b/src/views/RMS/components/addCarDriver.vue
@@ -17,67 +17,7 @@
 
				         @select="handleSelect"
			
 
				       ></el-autocomplete>
			
 
				       </div>
			
 
				-    <div class="photoBox">
			
 
				-   <el-upload
			
 
				-    class="upload-demo"
			
 
				-    action="http://localhost:8080/api/v1/rms/upload"
			
 
				-    :on-preview="handlePreview"
			
 
				-    :on-remove="handleRemove"
			
 
				-    :on-success="handleAvatarSuccess1"
			
 
				-    :file-list="fileList"
			
 
				-    list-type="picture">
			
 
				-  <div>行驶证照片
			
 
				-  <el-button size="small" type="primary">点击上传</el-button>
			
 
				-  </div>
			
 
				-</el-upload> 
			
 
				-    </div>
			
 
				-
			
 
				-     <div class="photoBox">
			
 
				-   <el-upload
			
 
				-  class="upload-demo"
			
 
				-  action="http://localhost:8080/api/v1/rms/upload"
			
 
				-  :on-preview="handlePreview"
			
 
				-  :on-remove="handleRemove"
			
 
				-  :on-success="handleAvatarSuccess2"
			
 
				-  :file-list="fileList"
			
 
				-  list-type="picture">
			
 
				-  <div>驾驶证照片
			
 
				-  <el-button size="small" type="primary">点击上传</el-button>
			
 
				-  </div>
			
 
				-</el-upload> 
			
 
				-    </div>
			
 
				-
			
 
				-      <div class="photoBox">
			
 
				-   <el-upload
			
 
				-  class="upload-demo"
			
 
				-  action="http://localhost:8080/api/v1/rms/upload"
			
 
				-  :on-preview="handlePreview"
			
 
				-  :on-remove="handleRemove"
			
 
				-  :on-success="handleAvatarSuccess3"
			
 
				-  :file-list="fileList"
			
 
				-  list-type="picture">
			
 
				-  <div>运输证照片
			
 
				-  <el-button size="small" type="primary">点击上传</el-button>
			
 
				-  </div>
			
 
				-</el-upload> 
			
 
				-    </div>
			
 
				-
			
 
				-
			
 
				- <div class="photoBox">
			
 
				-   <el-upload
			
 
				-  class="upload-demo"
			
 
				-  action="http://localhost:8080/api/v1/rms/upload"
			
 
				-  :on-preview="handlePreview"
			
 
				-  :on-remove="handleRemove"
			
 
				-  :on-success="handleAvatarSuccess4"
			
 
				-  :file-list="fileList"
			
 
				-  list-type="picture">
			
 
				-  <div>从业资格证照片
			
 
				-  <el-button size="small" type="primary">点击上传</el-button>
			
 
				-  </div>
			
 
				-</el-upload> 
			
 
				-    </div>
			
 
				-
			
 
				+    
			
 
				     <div class="button_box">
			
 
				       <el-button @click="cancel">取消</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确定</el-button>
			
@@ -100,11 +40,6 @@ export default {
 
				       fileList: [],
			
 
				       carrierIds:"",
			
 
				       state: "",
			
 
				-      imageUrl1:"",
			
 
				-      imageUrl2:"",
			
 
				-      imageUrl3:"",
			
 
				-      imageUrl4:"",
			
 
				-      imageUrls:[],
			
 
				     };
			
 
				   },
			
 
				   mounted() {
			
@@ -141,53 +76,6 @@ export default {
 
				     handleSelect(item){
			
 
				       this.carrierIds=item.carrierIds;
			
 
				       console.log(item)
			
 
				-    },
			
 
				-      beforeUpload2 (file) {
			
 
				-        const isLt2M = file.size < 1024 * 1024 * 0.5
			
 
				-        console.log('大小' + isLt2M)
			
 
				-        if (!isLt2M) {
			
 
				-          this.$message.error('上传文件大小不能超过500kb!')
			
 
				-        }
			
 
				-        let size = file.size / 1024
			
 
				-        console.log('大小' + size)
			
 
				-        let _URL = window.URL || window.webkitURL
			
 
				-        let img = new Image()
			
 
				-        img.onload = function () {
			
 
				-          let width = img.width
			
 
				-          let height = img.height
			
 
				-          console.log('width--->' + width)
			
 
				-          console.log('height--->' + height)
			
 
				-        }
			
 
				-        img.src = _URL.createObjectURL(file)
			
 
				-        return isLt2M
			
 
				-    },
			
 
				-    handleAvatarSuccess1(res,file){
			
 
				-      this.imageUrl1=URL.createObjectURL(file.raw);
			
 
				-    },
			
 
				-    handleAvatarSuccess2(res,file){
			
 
				-      this.imageUrl2=URL.createObjectURL(file.raw);
			
 
				-    },
			
 
				-    handleAvatarSuccess3(res,file){
			
 
				-      this.imageUrl3=URL.createObjectURL(file.raw);
			
 
				-    },
			
 
				-    handleAvatarSuccess4(res,file){
			
 
				-       this.imageUrl4=URL.createObjectURL(file.raw);
			
 
				-    },
			
 
				-    handleRemove(file, fileList) {
			
 
				-      console.log(file, fileList);
			
 
				-    },
			
 
				-    handlePreview(file) {
			
 
				-      console.log(file);
			
 
				-    },
			
 
				-    handleExceed(files, fileList) {
			
 
				-      this.$message.warning(
			
 
				-        `当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${
			
 
				-          files.length + fileList.length
			
 
				-        } 个文件`
			
 
				-      );
			
 
				-    },
			
 
				-    beforeRemove(file, fileList) {
			
 
				-      return this.$confirm(`确定移除 ${file.name}？`);
			
 
				     },
			
 
				     makeSure() {
			
 
				       console.log(this.form1);
			
@@ -199,11 +87,6 @@ export default {
 
				         driverIdentityCard: this.form1.driverIdentityCard,
			
 
				         driverPhone: this.form1.driverPhone,
			
 
				         transportTypeId: this.form1.transportTypeId,
			
 
				-   //     carrierId: this.form1.carrierId,
			
 
				-        driverPermitNo: this.form1.driverPermitNo,
			
 
				-        driverLicence: this.form1.driverLicence,
			
 
				-        driverLicence: this.form1.driverLicence,
			
 
				-        driverLicence: this.form1.driverLicence,
			
 
				         state:this.state,
			
 
				         carrierName:this.state,
			
 
				         carrierIds: this.carrierIds,
			
@@ -279,7 +162,6 @@ export default {
 
				   justify-content: center;
			
 
				   margin-top: 0.1000rem;
			
 
				   margin-bottom: 0.25rem;
			
 
				- // margin-left: -18rem;
			
 
				 }
			
 
				   .inputBox{
			
 
				     display: flex;
			
--- a/src/views/RMS/components/addCarrier.vue
+++ b/src/views/RMS/components/addCarrier.vue
@@ -12,13 +12,23 @@
 
				       >
			
 
				       </el-input>
			
 
				     </div>
			
 
				+    <div class="user_code">
			
 
				+      <span class="text">用户名</span>
			
 
				+      <el-input
			
 
				+        class="input"
			
 
				+        placeholder="请输入用户名(必填项)"
			
 
				+        v-model="user_Name"
			
 
				+        clearable
			
 
				+      >
			
 
				+      </el-input>
			
 
				+    </div>
			
 
				     <div class="form_box" style="margin-right: 10rem">
			
 
				       <dil-form :formId="330" v-model="form1"></dil-form>
			
 
				     </div>
			
 
				     <el-upload
			
 
				       class="upload-demo"
			
 
				       ref="upload1"
			
 
				-      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier1"
			
 
				+      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier1"
			
 
				       :before-upload="beforeUpload"
			
 
				       :multiple="false"
			
 
				       list-type="picture"
			
@@ -41,7 +51,7 @@
 
				     <el-upload
			
 
				       class="upload-demo"
			
 
				       ref="upload2"
			
 
				-      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier2"
			
 
				+      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier2"
			
 
				       :before-upload="beforeUpload"
			
 
				       :multiple="false"
			
 
				       list-type="picture"
			
@@ -64,7 +74,7 @@
 
				     <el-upload
			
 
				       class="upload-demo"
			
 
				       ref="upload3"
			
 
				-      action="http://192.168.1.112:8070/api/v1/rms/rmscarrier/uploadCarrier3"
			
 
				+      action="https://wl.dasteel.cn:32322/api/v1/rms/rmscarrier/uploadCarrier3"
			
 
				       :before-upload="beforeUpload"
			
 
				       :multiple="false"
			
 
				       list-type="picture"
			
@@ -118,6 +128,7 @@ export default {
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				+      user_Name:'',
			
 
				       //营业执照
			
 
				       businessLicense1: null,
			
 
				       //营业执照
			
@@ -149,6 +160,14 @@ export default {
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				+    VerifyPhoneNumber(Phone) {
			
 
				+      var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
			
 
				+      if (!myreg.test(Phone)) {
			
 
				+          return false;
			
 
				+      } else {
			
 
				+          return true;
			
 
				+      }
			
 
				+    },
			
 
				     upCLick(val) {
			
 
				       this.num = val;
			
 
				     },
			
@@ -207,21 +226,22 @@ export default {
 
				     },
			
 
				     makeSure() {
			
 
				       let status = false;
			
 
				+      this.form1.carrierContactNumber = parseInt(this.form1.carrierContactNumber);
			
 
				       if (!this.input) {
			
 
				         this.$message.error("账号不能为空");
			
 
				-      } else if (!this.form1.carrierName) {
			
 
				+      } else if(!this.user_Name){
			
 
				+        this.$message.error("用户名不能为空");
			
 
				+      }else if (!this.form1.carrierName) {
			
 
				         this.$message.error("承运商名称不能为空");
			
 
				       } else if (!this.form1.carrierType) {
			
 
				         this.$message.error("承运商类型不能为空");
			
 
				-      }
			
 
				-      //  else if (!this.imageUrl1) {
			
 
				+      // }else if (!this.imageUrl1) {
			
 
				       //   this.$message.error("请上传运输证");
			
 
				       // } else if (!this.imageUrl2) {
			
 
				       //   this.$message.error("请上传经营许可证");
			
 
				       // } else if (!this.imageUrl3) {
			
 
				       //   this.$message.error("请上传营业执照");
			
 
				-      // }
			
 
				-      else {
			
 
				+      }else {
			
 
				         status = true;
			
 
				       }
			
 
				       if (this.form1.registerDate) {
			
@@ -234,7 +254,7 @@ export default {
 
				         }
			
 
				         let fromData = new FormData();
			
 
				         fromData.append("userCode", this.input);
			
 
				-        fromData.append("userName", this.form1.carrierName);
			
 
				+        fromData.append("userName", this.user_Name);
			
 
				         fromData.append("orgCode", "chengyunshang");
			
 
				         fromData.append("mobile", "133" + rand);
			
 
				         fromData.append("email", "133" + rand + "@163.com");
			
@@ -246,6 +266,7 @@ export default {
 
				         this.$store
			
 
				           .dispatch("system/usersManage/addUser", fromData)
			
 
				           .then((res) => {
			
 
				+            console.log(1)
			
 
				             if (res.code === "0") {
			
 
				               let userId = res.data.userId;
			
 
				               this.axios
			
@@ -257,31 +278,46 @@ export default {
 
				                     "&roleId=924449091658846208"
			
 
				                 )
			
 
				                 .then((res) => {
			
 
				+                  console.log(2)
			
 
				                   if (res.code == "0") {
			
 
				+                    //图片地址
			
 
				                     let imageUrls = {
			
 
				+                      //运输证
			
 
				                       imageUrl1: this.imageUrl1,
			
 
				+                      //经营许可证
			
 
				                       imageUrl2: this.imageUrl2,
			
 
				+                      //营业执照
			
 
				                       imageUrl3: this.imageUrl3,
			
 
				                     };
			
 
				+                    //传给后端的数据
			
 
				                     let mapValue = {
			
 
				+                      //表单数据
			
 
				                       from: this.form1,
			
 
				+                      //图片数据
			
 
				                       imageUrls: imageUrls,
			
 
				+                      //sso的用户Id
			
 
				                       userId: userId,
			
 
				                     };
			
 
				                     this.axios
			
 
				                       .post("/api/v1/rms/insertCarrier", mapValue)
			
 
				                       .then((res) => {
			
 
				+                        console.log(2)
			
 
				                         if (res.data.code == "200") {
			
 
				+                          this.cancel();
			
 
				                           this.$message.success("添加成功");
			
 
				                         } else {
			
 
				-                          this.$message.error("添加失败");
			
 
				+                          this.axios
			
 
				+                          .delete("pass/v1/sysusers/" + userId)
			
 
				+                          .then((res) => {
			
 
				+                            this.$message.error("添加失败");
			
 
				+                          });
			
 
				                         }
			
 
				                       })
			
 
				                       .catch(() => {
			
 
				                         this.axios
			
 
				                           .delete("pass/v1/sysusers/" + userId)
			
 
				                           .then((res) => {
			
 
				-                            console.log(res.data, "data");
			
 
				+                            this.$message.error("添加失败");
			
 
				                           });
			
 
				                       });
			
 
				                   }
			
@@ -302,11 +338,12 @@ export default {
 
				   .user_code {
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				+    margin: 10px;
			
 
				     .text {
			
 
				       display: flex;
			
 
				       justify-content: center;
			
 
				       align-items: center;
			
 
				-      margin-right: 15px;
			
 
				+      margin-right: 10px;
			
 
				     }
			
 
				     .input {
			
 
				       width: 250px;
			
--- a/src/views/RMS/components/addMaterial.vue
+++ b/src/views/RMS/components/addMaterial.vue
@@ -134,8 +134,9 @@ export default {
 
				   text-align: center;
			
 
				   align-items: center;
			
 
				   justify-content: center;
			
 
				-  margin-top: 1.5rem;
			
 
				+  margin-top: 2rem;
			
 
				   margin-bottom: 1.25rem;
			
 
				+  margin-right: 10px;
			
 
				 }
			
 
				 .btn-left {
			
 
				   margin-left: 470px;
			
--- a/src/views/RMS/components/addPersonnel.vue
+++ b/src/views/RMS/components/addPersonnel.vue
@@ -5,6 +5,48 @@
 
				      <div class="form-box" style="margin-right: 10rem">
			
 
				         <dil-form :formId="325" v-model="form1" ref="from1"></dil-form>
			
 
				       </div>
			
 
				+
			
 
				+      <div class="department">
			
 
				+        <div class="department2">
			
 
				+                <span>二级部门：</span>
			
 
				+                <el-select v-model="value1" placeholder="请选择" @change="onchange1">
			
 
				+                    <el-option
			
 
				+                    v-for="(item,i) in options1"
			
 
				+                    :key="i"
			
 
				+                    :label="item.label"
			
 
				+                    :value="item.value"
			
 
				+                    >
			
 
				+                    </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+            <div class="department3">
			
 
				+                <span>三级部门：</span>
			
 
				+                <el-select v-model="value2" placeholder="请选择" @change="onchange2">
			
 
				+                    <el-option
			
 
				+                        v-for="(item,i) in options2"
			
 
				+                        :key="i"
			
 
				+                        :label="item.label"
			
 
				+                        :value="item.value"
			
 
				+                    >
			
 
				+                    </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+      </div>
			
 
				+      <div>
			
 
				+        <div class="role">
			
 
				+                <span>赋权角色：</span>
			
 
				+                <el-select v-model="value3" placeholder="请选择">
			
 
				+                    <el-option
			
 
				+                        v-for="(item,i) in options3"
			
 
				+                        :key="i"
			
 
				+                        :label="item.roleName"
			
 
				+                        :value="item.roleId"
			
 
				+                    >
			
 
				+                    </el-option>
			
 
				+                </el-select>
			
 
				+            </div>
			
 
				+      </div>
			
 
				+
			
 
				     <div class="button-box">
			
 
				       <el-button @click="cancel">取消</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确定</el-button>
			
@@ -14,64 +56,194 @@
 
				 
			
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				-
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				-      form1: {},
			
 
				+      form1: {
			
 
				+        personnelJobNumber : '',
			
 
				+        personnelName : '',
			
 
				+        personnelPost : '',
			
 
				+        personnelWorkshopid : '',
			
 
				+        shipperId : '',
			
 
				+        personnelShifts : '',
			
 
				+        personnelTeam : ''
			
 
				+      },
			
 
				       value: undefined,
			
 
				+      //新增用户的SSO主键
			
 
				+      personnelSsoId:'',
			
 
				+      //token
			
 
				+      token: null,
			
 
				+      //二级部门
			
 
				+      options1:[],
			
 
				+      //选中的二级部门名称
			
 
				+      value1:'',
			
 
				+      //选中的二级部门机构ID和机构编码
			
 
				+      map1:{
			
 
				+          shipperOrgCode : '',
			
 
				+          shipperSsoId : ''
			
 
				+      },
			
 
				+      // 三级部门
			
 
				+      options2:[],
			
 
				+      // 选中的三级部门名称
			
 
				+      value2:'',
			
 
				+      //选中的三级部门机构ID和机构编码
			
 
				+      map2:{
			
 
				+          shipperOrgCode : '',
			
 
				+          shipperSsoId : ''
			
 
				+      },
			
 
				+      // 角色
			
 
				+      options3:[],
			
 
				+      // 选中的角色名称
			
 
				+      value3:'',
			
 
				+      // 选中的角色ID
			
 
				+      roleId:''
			
 
				     };
			
 
				   },
			
 
				-  mounted() {},
			
 
				+  created(){
			
 
				+    this.token = getCookie("accessToken");
			
 
				+  },
			
 
				+  mounted() {
			
 
				+    //初始化二级机构和角色
			
 
				+    this.initialization();
			
 
				+  },
			
 
				   methods: {
			
 
				+     initialization(){
			
 
				+       //初始化选择二级机构
			
 
				+         this.axios.get('/api/v1/rms/getSecondShipper').then((res)=>{
			
 
				+             this.options1 = res.data.data;
			
 
				+         })
			
 
				+         //初始化角色
			
 
				+        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){
			
 
				+            //  查询选中的二级机构下的三级机构
			
 
				+             this.value2 = '';
			
 
				+             this.axios.get('/api/v1/rms/getThirdShipper?shipperId='+val).then((res)=>{
			
 
				+             this.options2 = res.data.data;    
			
 
				+         })
			
 
				+         //获取二级部门的机构ID和机构编码
			
 
				+         this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
			
 
				+             this.map1 = res.data.data;
			
 
				+         })
			
 
				+     },
			
 
				+     onchange2(val){
			
 
				+         //获取三级部门的机构ID和机构编码
			
 
				+         this.axios.post('/api/v1/rms/getShipperMap?shipperId='+val).then((res)=>{
			
 
				+             this.map2 = res.data.data; 
			
 
				+         })
			
 
				+     },
			
 
				+
			
 
				+     //确定人员新增
			
 
				      makeSure() {
			
 
				-      console.log(this.form1)
			
 
				-      let RmsPersonnel={
			
 
				-        personnelId:this.form1.personnelId,
			
 
				-        personnelJobNumber: this.form1.personnelJobNumber,
			
 
				-        personnelName: this.form1.personnelName,
			
 
				-        personnelPost: this.form1.personnelPost,
			
 
				-        personnelWorkshopid: this.form1.personnelWorkshopid,
			
 
				-        personnelShifts: this.form1.personnelShifts,
			
 
				-        personnelTeam:this.form1.personnelTeam,
			
 
				-        departmentId: this.form1.shipperId,
			
 
				-        username:this.form1.username
			
 
				+      //初始化用户信息
			
 
				+      let userInfo = {
			
 
				+        orgCode : '',
			
 
				+        orgName : '',
			
 
				+        orgId : '',
			
 
				       };
			
 
				-      let userName={
			
 
				-
			
 
				+      //该用户没有三级部门
			
 
				+      if(this.options2.length==0){
			
 
				+      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',
			
 
				+        groupId : '506514577756917769',
			
 
				+        companyId : '713710108567277568'
			
 
				       }
			
 
				+      //该用户有三级部门
			
 
				+      }else{
			
 
				+        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',
			
 
				+        groupId : '506514577756917769',
			
 
				+        companyId : '713710108567277568'
			
 
				+      }
			
 
				+      }
			
 
				+       //先新增SSO中的用户
			
 
				+      const formData = new FormData();
			
 
				+      
			
 
				+      Object.keys(userInfo).forEach((key) => {
			
 
				+      formData.append(key, userInfo[key]);
			
 
				+      });
			
 
				+      //判断数据是否都填了
			
 
				       if(
			
 
				-        RmsPersonnel.personnelJobNumber ==null ||
			
 
				-        RmsPersonnel.personnelName ==null ||
			
 
				-        RmsPersonnel.personnelPost ==null ||
			
 
				-        RmsPersonnel.personnelWorkshopid==null ||
			
 
				-        RmsPersonnel.personnelShifts==null ||
			
 
				-        RmsPersonnel.departmentId==null ||
			
 
				-        RmsPersonnel.personnelTeam==null
			
 
				-      )this.$message.error("存在空值！");
			
 
				-      else
			
 
				-      this.axios
			
 
				-        .post(
			
 
				+            this.form1.personnelJobNumber =='' ||
			
 
				+            this.form1.personnelPost =='' ||
			
 
				+            this.form1.personnelName =='' ||
			
 
				+            // RmsPersonnel.personnelWorkshopid==null ||
			
 
				+            this.form1.shipperId=='' ||
			
 
				+            this.form1.personnelShifts=='' ||
			
 
				+            this.form1.personnelTeam=='' ||
			
 
				+            userInfo.orgName=='' ||
			
 
				+            userInfo.orgCode=='' ||
			
 
				+            userInfo.orgId=='' ||
			
 
				+            this.value3==''
			
 
				+          ){
			
 
				+              this.$message.error("存在空值！");
			
 
				+      }else{
			
 
				+
			
 
				+      //新增用户
			
 
				+      this.$store.dispatch('system/usersManage/addUser',formData)
			
 
				+      .then((res)=>{
			
 
				 
			
 
				-        )
			
 
				-        .post(
			
 
				-          "/api/v1/rms/insertPersonnel",
			
 
				-           RmsPersonnel
			
 
				-        )
			
 
				-        .then((res) => {
			
 
				-          if (res.data.code == 200) {
			
 
				-            this.$message({
			
 
				-              type: "success",
			
 
				-              message: "新增成功!",
			
 
				-            });
			
 
				-            // this.$refs.table.refreshData();
			
 
				-            this.$router.go(-1);
			
 
				-          } else {
			
 
				-            this.$message.error("新增失败,可能存在重复！");
			
 
				+          //再新增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
			
 
				           }
			
 
				-          this.$refs['table'].resetField();
			
 
				-        });
			
 
				+              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);
			
 
				+              })
			
 
				+
			
 
				+      });//end
			
 
				+      }
			
 
				+      
			
 
				     },
			
 
				     // 取消
			
 
				     cancel() {
			
@@ -84,6 +256,7 @@ export default {
 
				  .button-box{
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				+    margin-top: 2rem;
			
 
				     .el-button{
			
 
				       width: 80px;
			
 
				       margin-right: 10px;
			
@@ -108,4 +281,16 @@ export default {
 
				     }
			
 
				   }
			
 
				 }
			
 
				+.department{
			
 
				+  display: flex;
			
 
				+  justify-content: center;
			
 
				+  .department3{
			
 
				+    margin-left: 2rem;
			
 
				+  }
			
 
				+}
			
 
				+.role{
			
 
				+  display: flex;
			
 
				+  justify-content: center;
			
 
				+  margin-top: 2rem;
			
 
				+}
			
 
				 </style>
			
--- a/src/views/RMS/components/capacity.vue
+++ b/src/views/RMS/components/capacity.vue
@@ -25,13 +25,13 @@
 
				             >
			
 
				               修改
			
 
				             </el-button>
			
 
				-            <el-button
			
 
				+            <!-- <el-button
			
 
				               type="text"
			
 
				               size="mini"
			
 
				               @click="deleteCapacity(scope)"
			
 
				             >
			
 
				               删除
			
 
				-            </el-button>
			
 
				+            </el-button> -->
			
 
				           </template>
			
 
				         </el-table-column>
			
 
				       </dilTable>
			
@@ -39,21 +39,30 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   data(){
			
 
				     return{
			
 
				      name:"homeworkPath",
			
 
				      textInput:"",
			
 
				      restaurants: [],
			
 
				+     ssoId:null,
			
 
				      options:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/rms/getCapacityList?apiId=397",
			
 
				+        requestUrl: "",
			
 
				       },
			
 
				     }
			
 
				   },
			
 
				+  created(){
			
 
				+    if(getCookie("orgCode") == "chengyunshang"){
			
 
				+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId");
			
 
				+    }else{
			
 
				+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + this.ssoId;
			
 
				+    }
			
 
				+  },
			
 
				   methods:{
			
 
				     onclick(){
			
 
				-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&con=" +this.textInput;
			
 
				+      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput;
			
 
				     },
			
 
				      toInsert() {
			
 
				       this.$router.push("/addCapacity");
			
--- a/src/views/RMS/components/carDriver.vue
+++ b/src/views/RMS/components/carDriver.vue
@@ -47,13 +47,13 @@ export default {
 
				       restaurants: [],
			
 
				       options:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/rms/getCarDriverList?apiId=339",
			
 
				+        requestUrl: "/api/v1/rms/getCarDriverList?apiId=420",
			
 
				       },
			
 
				     }
			
 
				   },
			
 
				   methods:{
			
 
				     onclick(){
			
 
				-        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=339&con=" +this.textInput;
			
 
				+        this.options.requestUrl = "/api/v1/rms/getCarDriverList?apiId=420&con=" +this.textInput;
			
 
				       },
			
 
				 
			
 
				      toInsert() {
			
--- a/src/views/RMS/components/carrier.vue
+++ b/src/views/RMS/components/carrier.vue
@@ -18,9 +18,9 @@
 
				             <el-button type="text" size="small" @click="updateCarrier(scope)">
			
 
				               修改
			
 
				             </el-button>
			
 
				-            <el-button type="text" size="mini" @click="deleteCarrier(scope)">
			
 
				+            <!-- <el-button type="text" size="mini" @click="deleteCarrier(scope)">
			
 
				               删除
			
 
				-            </el-button>
			
 
				+            </el-button> -->
			
 
				           </template>
			
 
				         </el-table-column>
			
 
				       </dilTable>
			
--- a/src/views/RMS/components/editCapacity.vue
+++ b/src/views/RMS/components/editCapacity.vue
@@ -11,7 +11,7 @@
 
				       </div>
			
 
				     </div>
			
 
				 </div>
			
 
				-        <div class="form-box f1">
			
 
				+        <!-- <div class="form-box f1">
			
 
				           <el-form :inline="true" :model="formInline" class="demo-form-inline">
			
 
				 <div class="disableBox">
			
 
				   <el-form-item>
			
@@ -40,7 +40,7 @@
 
				             <i class="el-icon-search"></i>查询
			
 
				           </el-button>
			
 
				             <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
			
 
				-</el-drawer>
			
 
				+</el-drawer> -->
			
 
				     <div class="button_box">
			
 
				       <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
 
				     </div>
			
@@ -125,14 +125,14 @@ console.log(this.$route.params)
 
				          capacityOwneris:this.form1.capacityOwneris,
			
 
				          capacityVip:this.form1.capacityVip,
			
 
				          capacityBlacklist:this.form1.capacityBlacklist,
			
 
				-         carrierId:this.mapList.carrierId,
			
 
				+       //  carrierId:this.mapList.carrierId,
			
 
				        };if(
			
 
				          RmsCapacity.capacityNumber==null ||
			
 
				          RmsCapacity.capacityCorlor==null ||
			
 
				          RmsCapacity.capacityOwneris==null ||
			
 
				          RmsCapacity.capacityVip==null ||
			
 
				-         RmsCapacity.capacityBlacklist==null ||
			
 
				-         RmsCapacity.carrierId==null
			
 
				+         RmsCapacity.capacityBlacklist==null 
			
 
				+         //RmsCapacity.carrierId==null
			
 
				        )this.$message.error("存在空值！");  
			
 
				         console.log( this.$route.params.capacityId);
			
 
				         this.axios
			
--- a/src/views/RMS/components/editCarrier.vue
+++ b/src/views/RMS/components/editCarrier.vue
@@ -5,12 +5,12 @@
 
				     <div class="main">
			
 
				     </div>
			
 
				     <div class="contractTitle">
			
 
				-      <div class="form-box">
			
 
				+      <div class="form_box">
			
 
				           <dil-form :formId="330" v-model="form1"></dil-form>
			
 
				       </div>
			
 
				     </div>
			
 
				 
			
 
				-    <div class="form-box f1">
			
 
				+    <div class="form_box f1">
			
 
				       <el-form :inline="true" :model="formInline" class="demo-form-inline">
			
 
				     <el-form-item>
			
 
				     <el-button type="primary" @click="drawer = true">添加中标区域信息</el-button>
			
@@ -167,29 +167,31 @@ export default {
 
				   },
			
 
				 };
			
 
				 </script>
			
 
				-<style lang='scss' scoped>
			
 
				- .form-box {
			
 
				-    width: 100%;
			
 
				-    margin-top: 30px;
			
 
				+<style lang='scss'>
			
 
				+
			
 
				+  .form_box {
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				-    .el-form-item{
			
 
				+    margin-left: 170px;
			
 
				+    margin-top: 15px;
			
 
				+    .el-form-item {
			
 
				       display: flex;
			
 
				       justify-content: center;
			
 
				-      .el-form-item__label{
			
 
				+      .el-form-item__label {
			
 
				         display: flex;
			
 
				         align-items: center;
			
 
				       }
			
 
				-      .el-form-item__content{
			
 
				-         .el-select{
			
 
				-            width: 250px;
			
 
				-          }
			
 
				-          .el-input{
			
 
				-            width: 250px;
			
 
				-          }
			
 
				-      }
			
 
				-       .el-radio{
			
 
				-        width: 25px;
			
 
				+      .el-form-item__content {
			
 
				+        width: 250px;
			
 
				+        .el-radio-group {
			
 
				+          width: 500px;
			
 
				+        }
			
 
				+        .el-date-editor {
			
 
				+          width: 250px;
			
 
				+        }
			
 
				+        .el-input__inner {
			
 
				+          width: 250px;
			
 
				+        }
			
 
				       }
			
 
				     }
			
 
				   }
			
--- a/src/views/RMS/components/editRawWarehouse.vue
+++ b/src/views/RMS/components/editRawWarehouse.vue
@@ -4,14 +4,32 @@
 
				     <page-title>编辑</page-title>
			
 
				     <div class="main">
			
 
				     </div>
			
 
				-    <div class="contractTitle">
			
 
				+<!--     <div class="contractTitle">
			
 
				       <div class="form-box">
			
 
				         <div class="form-one">
			
 
				           <dil-form :formId="355" v-model="form1"></dil-form>
			
 
				         </div>
			
 
				       </div>
			
 
				-    </div>
			
 
				+    </div> -->
			
 
				 
			
 
				+    <div class="shipperName">
			
 
				+    <label>托运人</label>
			
 
				+    <el-select v-model="shipperName" placeholder="请选择" @change="getValue">
			
 
				+    <el-option
			
 
				+      v-for="item in options"
			
 
				+      :key="item.value"
			
 
				+      :label="item.label"
			
 
				+      :value="item.value">
			
 
				+    </el-option>
			
 
				+  </el-select>
			
 
				+     </div>
			
 
				+  <div class="point">
			
 
				+    <label>装卸点</label>
			
 
				+  <el-input style="width: 220px;" v-model="warehouseName" placeholder="请输入内容"></el-input>
			
 
				+  </div>
			
 
				+  
			
 
				+    
			
 
				+         
			
 
				     <div class="button-box">
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				       <el-button type="primary" @click="onClickConfirm">确认</el-button>
			
@@ -26,11 +44,17 @@ export default {
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				-      form1: {
			
 
				-        warehouseName: '',
			
 
				-      },
			
 
				+    warehouseName : '',
			
 
				+    shipperName: '',
			
 
				+    options: [{
			
 
				+          value: '',
			
 
				+          label: ''
			
 
				+        }],
			
 
				     };
			
 
				   },
			
 
				+  created(){
			
 
				+    this.getValue();
			
 
				+  },
			
 
				   mounted() {
			
 
				       console.log(this.$route)
			
 
				     this.information();
			
@@ -45,25 +69,36 @@ export default {
 
				             this.$route.params.warehouseId
			
 
				         )
			
 
				         .then((res) => {
			
 
				-            this.form1.warehouseName = res.data.data.warehouseName;
			
 
				+            console.log("res",res)
			
 
				+            this.shipperName=res.data.data.shipperId;
			
 
				+            this.warehouseName=res.data.data.warehouseName;
			
 
				+            
			
 
				         });
			
 
				     },
			
 
				+    //单选下拉框
			
 
				+    getValue(){
			
 
				+       this.axios
			
 
				+        .get(
			
 
				+          "/api/v1/rms/getShipperId" 
			
 
				+           
			
 
				+        )
			
 
				+        .then((res) => {
			
 
				+            this.options = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				     // 返回
			
 
				     onClickCancel() {
			
 
				       this.$router.go(-1);
			
 
				     },
			
 
				     // 确认
			
 
				     onClickConfirm() {
			
 
				-      console.log(this.form1)
			
 
				+     console.log("RmsWarehouse",RmsWarehouse)
			
 
				        let RmsWarehouse={
			
 
				       warehouseId:this.$route.params.warehouseId,
			
 
				-      warehouseName:this.form1.warehouseName,
			
 
				-      shipperId:this.form1.shipperId,
			
 
				+      warehouseName:this.warehouseName,
			
 
				+      shipperId:this.shipperName,
			
 
				     };
			
 
				-    if(
			
 
				-         warehouseName==null
			
 
				-       )this.$message.error("存在空值！");
			
 
				-   console.log(RmsWarehouse)
			
 
				+   console.log("RmsWarehouse",RmsWarehouse)
			
 
				         this.axios
			
 
				           .post(
			
 
				             "/api/v1/rms/updateWarehouse",
			
@@ -83,9 +118,19 @@ export default {
 
				  .button-box{
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				+    margin-top: 2rem;
			
 
				     .el-button{
			
 
				       width: 80px;
			
 
				       margin-right: 10px;
			
 
				     }
			
 
				   }
			
 
				+  .shipperName{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+  }
			
 
				+  .point{
			
 
				+    display: flex;
			
 
				+    justify-content: center;
			
 
				+    margin-top: 1rem;
			
 
				+  }
			
 
				 </style>
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/enFactory.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/enFactory.vue
@@ -21,7 +21,7 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12",
			
 
				       },
			
 
				     };
			
 
				   },
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/grossWeight.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/grossWeight.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12&con=" + this.input;
			
 
				+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&con=" + this.input;
			
 
				     },
			
 
				   },
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/outFactory.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/outFactory.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12&con=" + this.input;
			
 
				+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&con=" + this.input;
			
 
				     },
			
 
				   },
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=13",
			
 
				+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
			
 
				+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&con=" + this.input;
			
 
				     },
			
 
				   },
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/grossWeight.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/grossWeight.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12&con=" + this.input;
			
 
				+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=13&con=" + this.input;
			
 
				     },
			
 
				   },
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
			
 
				+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
			
 
				     },
			
 
				    }
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/outFactory.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12&con=" + this.input;
			
 
				+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&con=" + this.input;
			
 
				     },
			
 
				   },
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/tareWeight.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/tareWeight.vue
@@ -21,13 +21,13 @@ export default {
 
				       input: "",
			
 
				       option: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
			
 
				+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
			
 
				+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&con=" + this.input;
			
 
				     },
			
 
				   },
			
 
				 };
			
--- a/src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue
@@ -1,23 +1,45 @@
 
				 //新增运输预约
			
 
				 <template>
			
 
				   <!-- 新增运输作业页面 -->
			
 
				-  <div id="contractDetails">
			
 
				+  <div class="addSporadic">
			
 
				     <page-title>运输预约</page-title>
			
 
				-    <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>
			
 
				-      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
			
 
				-    </div>
			
 
				-    <div class="orderType from">
			
 
				-      <span class="text">流向：</span>
			
 
				-      <el-select v-model="orderType" placeholder="请选择">
			
 
				+    <div class="form-box">
			
 
				+        <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="发货单位">
			
 
				+          <el-input v-model="supplierName" placeholder="必填" disabled>
			
 
				+          </el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item>
			
 
				+          <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
			
 
				+        </el-form-item>
			
 
				+        </el-form>
			
 
				+        <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="收货单位">
			
 
				+          <el-input v-model="receiveName" placeholder="必填" disabled>
			
 
				+          </el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item>
			
 
				+          <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
			
 
				+        </el-form-item>
			
 
				+        </el-form>
			
 
				+        <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="流向">
			
 
				+        <el-select v-model="orderType" placeholder="请选择">
			
 
				         <el-option
			
 
				           v-for="item in orderTypeList"
			
 
				           :key="item.value"
			
@@ -26,45 +48,67 @@
 
				         >
			
 
				         </el-option>
			
 
				       </el-select>
			
 
				-    </div>
			
 
				-    <div class="lineId from">
			
 
				-      <span class="text">选择路线：</span>
			
 
				-      <el-input v-model="lineName" disabled> </el-input>
			
 
				-      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
			
 
				-    </div>
			
 
				-    <div class="truckList1">
			
 
				-      <div class="truckList from">
			
 
				-        <span class="text">选择承运商：</span>
			
 
				-       <el-autocomplete
			
 
				-      class="inline-input"
			
 
				-      v-model="state2"
			
 
				-      :fetch-suggestions="querySearch"
			
 
				-      placeholder="请输入承运商名称"
			
 
				-      :trigger-on-focus="false"
			
 
				-      @select="handleSelect"
			
 
				-      @input="oninput"
			
 
				-    >
			
 
				-  <template slot-scope="{ item }">
			
 
				-    <div class="name">{{ item.value }}</div>
			
 
				-  </template>
			
 
				-    </el-autocomplete>
			
 
				-      </div>
			
 
				-    </div>
			
 
				-    <div class="truckList1">
			
 
				-      <div class="truckList from">
			
 
				-        <span class="text">选择物资：</span>
			
 
				-        <el-button type="primary" @click=" table = true" class="truckBtn"
			
 
				-          >浏览</el-button
			
 
				+    </el-form-item>
			
 
				+        </el-form>
			
 
				+        <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="选择路线">
			
 
				+          <el-input v-model="lineName" placeholder="必填" disabled>
			
 
				+          </el-input>
			
 
				+        </el-form-item>
			
 
				+        <el-form-item>
			
 
				+          <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
			
 
				+        </el-form-item>
			
 
				+        </el-form>
			
 
				+        <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="选择承运商">
			
 
				+         <el-autocomplete
			
 
				+          class="inline-input"
			
 
				+          v-model="state2"
			
 
				+          :fetch-suggestions="querySearch"
			
 
				+          placeholder="请输入承运商名称"
			
 
				+          :trigger-on-focus="false"
			
 
				+          @select="handleSelect"
			
 
				+          @input="oninput"
			
 
				         >
			
 
				-      </div>
			
 
				+        <template slot-scope="{ item }">
			
 
				+          <div class="name">{{ item.value }}</div>
			
 
				+        </template>
			
 
				+        </el-autocomplete>
			
 
				+        </el-form-item>
			
 
				+        </el-form>
			
 
				+        <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="选择物资">      
			
 
				+        </el-form-item>
			
 
				+        <el-form-item > 
			
 
				+          <el-button type="primary" @click="drawTable" class="truckBtn"
			
 
				+          >浏览</el-button>
			
 
				+        </el-form-item>
			
 
				+        </el-form>
			
 
				     </div>
			
 
				-      <div class="switch" v-if="tableData.length > 0">
			
 
				+    <div class="swtichTop">
			
 
				+    <span class="titile">点击浏览选择物资之前请选择物资单位！</span>
			
 
				+    <div class="switch" v-if="tableData.length > 0">
			
 
				       <el-tooltip placement="top">
			
 
				         <div slot="content">下面表格已有数据，不能进行更改！！！</div>
			
 
				         <el-switch
			
 
				           v-model="value"
			
 
				-          active-text="重量"
			
 
				-          inactive-text="件数"
			
 
				+          active-text="件数"
			
 
				+          inactive-text="重量"
			
 
				           disabled
			
 
				         >
			
 
				         </el-switch>
			
@@ -73,10 +117,12 @@
 
				     <div class="switch" v-else>
			
 
				       <el-tooltip placement="top">
			
 
				         <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
			
 
				-        <el-switch v-model="value" active-text="重量" inactive-text="件数">
			
 
				+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
			
 
				         </el-switch>
			
 
				       </el-tooltip>
			
 
				     </div>
			
 
				+    </div>
			
 
				+
			
 
				     <!-- 物资表格 -->
			
 
				     <div class="truckListTable">
			
 
				     <div class="selectionTable">
			
@@ -142,7 +188,8 @@
 
				     </div>
			
 
				     </div>
			
 
				     <!-- 物资模态框 -->
			
 
				-    <el-drawer
			
 
				+    <div class="drawSty">
			
 
				+      <el-drawer
			
 
				       title="选择物资信息"
			
 
				       :visible.sync="table"
			
 
				       direction="rtl"
			
@@ -166,7 +213,7 @@
 
				       <el-input
			
 
				         placeholder="请输入内容"
			
 
				         v-model="input"
			
 
				-        style="margin-top: 0.625rem; margin-left: 1.25rem"
			
 
				+        style="margin-top: 20px"
			
 
				         clearable
			
 
				       ></el-input>
			
 
				       <el-button
			
@@ -195,12 +242,6 @@
 
				           @selection-change="currentRadioChange3"
			
 
				         ></dilTable>
			
 
				       </div>
			
 
				-      <div v-show="a == 4">
			
 
				-        <dilTable
			
 
				-          v-bind.sync="unloadPoint"
			
 
				-          @radio-change="currentRadioChange4"
			
 
				-        ></dilTable>
			
 
				-      </div>
			
 
				       <div v-show="a == 5">
			
 
				         <dilTable
			
 
				           v-bind.sync="line"
			
@@ -208,7 +249,8 @@
 
				         ></dilTable>
			
 
				       </div>
			
 
				     </el-drawer>
			
 
				-    <div class="button_box">
			
 
				+    </div>  
			
 
				+    <div class="button-box">
			
 
				       <el-button @click="onClickCancel">返回</el-button>
			
 
				       <el-button type="primary" @click="makeSure">确认</el-button>
			
 
				     </div>
			
@@ -216,6 +258,7 @@
 
				 </template>
			
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				+import { Checkbox } from 'element-ui';
			
 
				 
			
 
				 export default {
			
 
				   components: { PageTitle },
			
@@ -224,7 +267,7 @@ export default {
 
				       receiveName:'',
			
 
				       state2:null,
			
 
				       restaurants: [],
			
 
				-       orderTypeList:[
			
 
				+      orderTypeList:[
			
 
				         {
			
 
				           value:12,
			
 
				           label:'进厂'
			
@@ -259,16 +302,17 @@ export default {
 
				           label: "规格型号",
			
 
				           width: "140",
			
 
				         },
			
 
				-        {
			
 
				-          prop: "orderMaterialNumber",
			
 
				-          label: "件数",
			
 
				-          slot: true,
			
 
				-        },
			
 
				-          {
			
 
				+         {
			
 
				           prop: "materialPriority",
			
 
				           label: "装卸货优先级",
			
 
				           slot: true,
			
 
				         },
			
 
				+        {
			
 
				+          prop: "orderMaterialWeight",
			
 
				+          label: "重量",
			
 
				+          slot: true,
			
 
				+        },
			
 
				+       
			
 
				       ],
			
 
				       // 收货单位ID
			
 
				       receiveId:null,
			
@@ -313,17 +357,6 @@ export default {
 
				           "/api/v1/uc/queryConsigneeByLike?apiId=396",
			
 
				           selectionType:"radio",
			
 
				       },
			
 
				-      third:{
			
 
				-        requestUrl:
			
 
				-        "/api/v1/uc/getCarrierMesByLike?apiId=244",
			
 
				-        selectionType:"radio",
			
 
				-        carriermapList:[]
			
 
				-      },
			
 
				-      unloadPoint: {
			
 
				-        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
			
 
				-        selectionType: "radio",
			
 
				-        unloadMapList:[]
			
 
				-      },
			
 
				       line: {
			
 
				         requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
			
 
				         selectionType: "radio",
			
@@ -334,23 +367,31 @@ export default {
 
				   watch: {
			
 
				     value() {
			
 
				       if (this.value) {
			
 
				+        console.log(this.value)
			
 
				+        console.log(this.tableTop.length)
			
 
				         this.tableTop.splice(this.tableTop.length - 1, 1);
			
 
				         this.tableTop.push({
			
 
				-          prop: "orderMaterialWeight",
			
 
				-          label: "重量",
			
 
				+          prop: "orderMaterialNumber",
			
 
				+          label: "件数",
			
 
				           slot: true,
			
 
				         });
			
 
				       } else {
			
 
				         this.tableTop.splice(this.tableTop.length - 1, 1);
			
 
				         this.tableTop.push({
			
 
				-          prop: "orderMaterialNumber",
			
 
				-          label: "件数",
			
 
				+          prop: "orderMaterialWeight",
			
 
				+          label: "重量",
			
 
				           slot: true,
			
 
				         });
			
 
				       }
			
 
				     },
			
 
				   },
			
 
				   methods: {
			
 
				+    drawTable(){
			
 
				+      console.log('jll')
			
 
				+      this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=1"
			
 
				+      this.selectionList1 = []
			
 
				+      this.table = true
			
 
				+    },
			
 
				     handleSelect(item){
			
 
				       this.carrierId = item.carrierId
			
 
				       item.carrierName = this.state2
			
@@ -383,7 +424,8 @@ export default {
 
				     },
			
 
				     // 返回主界面
			
 
				     makeSure1() {
			
 
				-      console.log(this.selectionList1)     
			
 
				+      console.log(this.selectionList1)
			
 
				+      debugger  
			
 
				       this.selectionList1.forEach((e) => {
			
 
				         var addmap = {
			
 
				           materialCode: e.materialCode,
			
@@ -393,10 +435,11 @@ export default {
 
				           materialId: e.materialId,
			
 
				           materialPriority:e.materialPriority,
			
 
				         };
			
 
				-        this.tableData.push(addmap);
			
 
				+          this.tableData.push(addmap);
			
 
				+      });     
			
 
				         this.selectionList1 = [];
			
 
				         this.table = false;
			
 
				-      }); 
			
 
				+        console.log(this.selectionList1)
			
 
				     },
			
 
				     //取消模态框多选
			
 
				     open() {
			
@@ -414,9 +457,6 @@ export default {
 
				       } else {
			
 
				         this.table = false;
			
 
				       }
			
 
				-    },
			
 
				-    onClick(index) {
			
 
				-      this.tableData.splice(index, 1);
			
 
				     },
			
 
				       // 返回选中的物资信息
			
 
				     selectionChange(selection) {
			
@@ -430,17 +470,9 @@ export default {
 
				           this.input;
			
 
				       } else if (a == 2) {
			
 
				         this.secend.requestUrl =
			
 
				-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
			
 
				-          this.materialId +
			
 
				+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247" +
			
 
				           "&index=" +
			
 
				           this.input;
			
 
				-      } else if (a == 3) {
			
 
				-        this.third.requestUrl =
			
 
				-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
			
 
				-          this.input;
			
 
				-      } else if (a == 4) {
			
 
				-        this.third.requestUrl =
			
 
				-          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
			
 
				       } else if (a == 5) {
			
 
				         this.option.requestUrl =
			
 
				           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
			
@@ -469,8 +501,13 @@ export default {
 
				     },
			
 
				     currentRadioChange5(selection) {
			
 
				       console.log(selection)
			
 
				-      this.lineName = selection.lineName+'  '+selection.lineDesk 
			
 
				-      this.lineId = selection.lineId;
			
 
				+      if(selection.lineName == null &&selection.lineDesk == null){
			
 
				+          this.lineName = ''
			
 
				+      }else{
			
 
				+          this.lineName = selection.lineName+'  '+selection.lineDesk 
			
 
				+          this.lineId = selection.lineId;
			
 
				+      }
			
 
				+      
			
 
				     },
			
 
				     currentRadioChange3(selection) {
			
 
				       this.carriermapList = [];
			
@@ -499,122 +536,51 @@ export default {
 
				     },
			
 
				 };
			
 
				 </script>
			
 
				-
			
 
				-<style lang="scss" >
			
 
				-.contractDetails {
			
 
				+<style lang="scss" scoped>
			
 
				+.addSporadic{
			
 
				+  .contractDetails {
			
 
				   width: 100%;
			
 
				 }
			
 
				-.from {
			
 
				-  display: flex;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  width: 40%;
			
 
				-  margin-top: 5px;
			
 
				-  margin-bottom: 20px;
			
 
				-}
			
 
				-.remark {
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  .text {
			
 
				-    display: inline-block;
			
 
				-    width: 100px;
			
 
				-    text-align: right;
			
 
				-  }
			
 
				-  .input{
			
 
				-    width: 250px;
			
 
				-    margin-right: 20px;
			
 
				-  }
			
 
				-}
			
 
				-.lineId {
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  .text {
			
 
				-    display: inline-block;
			
 
				-    width: 170px;
			
 
				-    text-align: right;
			
 
				-  }
			
 
				-  .input{
			
 
				-    width: 250px;
			
 
				-    margin-right: 20px;
			
 
				+.drawSty{
			
 
				+  .el-input{
			
 
				+    width: 240px;
			
 
				   }
			
 
				 }
			
 
				-.material {
			
 
				+.swtichTop{
			
 
				   display: flex;
			
 
				+  height: 40px;
			
 
				+  align-content: center;
			
 
				   justify-content: center;
			
 
				-  margin-top: 20px;
			
 
				-  .text {
			
 
				-    display: inline-block;
			
 
				-    width: 170px;
			
 
				-    text-align: right;
			
 
				+  padding-right:20px ;
			
 
				+  .titile{
			
 
				+    color: red;
			
 
				+    font-size: 14px;
			
 
				   }
			
 
				-  .input{
			
 
				-    width: 250px;
			
 
				-    margin-right: 20px;
			
 
				+  .switch{
			
 
				+    margin-right: -60px
			
 
				   }
			
 
				 }
			
 
				-.orderType{
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  .text {
			
 
				-    display: inline-block;
			
 
				-    width: 110px;
			
 
				-    text-align: right;
			
 
				-  }
			
 
				-  .select{
			
 
				-    width: 250px;
			
 
				+.form-box {
			
 
				+  display: inline-block !important;
			
 
				+  margin-left: 488px;
			
 
				+  .el-input {
			
 
				+    width: 320px;
			
 
				   }
			
 
				-  .span{
			
 
				-    display: inline-block;
			
 
				-    width: 30px;height: 10px;
			
 
				+  .el-select{
			
 
				+    width: 320px;
			
 
				   }
			
 
				-}
			
 
				-.contractTitle{
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  .el-form-item{
			
 
				-    display: flex;
			
 
				-    justify-content: center;
			
 
				-    .el-form-item__label{
			
 
				-      display: flex;
			
 
				-      align-items: center;
			
 
				-    }
			
 
				-    .el-input{
			
 
				-      width: 250px;
			
 
				-    }
			
 
				+  .el-autocomplete{
			
 
				+    width: 320px;
			
 
				   }
			
 
				-}
			
 
				-.forwardingUnit {
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  .text {
			
 
				-    display: inline-block;
			
 
				-    width: 170px;
			
 
				-    text-align: right;
			
 
				+  .el-form {
			
 
				+    padding: 10px;
			
 
				   }
			
 
				-  .input{
			
 
				-    width: 250px;
			
 
				-    margin-right: 20px;
			
 
				+  .truckBtn{
			
 
				+    width: 320px;
			
 
				   }
			
 
				 }
			
 
				-.truckList1 {
			
 
				-  width: 100%;
			
 
				-  .truckList {
			
 
				-    width: 96%;
			
 
				-    .text {
			
 
				-      display: inline-block;
			
 
				-      width: 120px;
			
 
				-      text-align: right;
			
 
				-    }
			
 
				-    .truckBtn {
			
 
				-      width: 250px;
			
 
				-    }
			
 
				-  }
			
 
				+.button-box {
			
 
				+  margin-left: 25px !important;
			
 
				 }
			
 
				-.button_box {
			
 
				-  display: flex;
			
 
				-  justify-content: center;
			
 
				-  align-items: center;
			
 
				-  width: 100%;
			
 
				-  height: 100px;
			
 
				 }
			
 
				 </style>
			
--- a/src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue
+++ b/src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue
@@ -120,9 +120,11 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   data() {
			
 
				     return {
			
 
				+      carrierUserId:'',
			
 
				       //模态窗的框计算
			
 
				       inputText: null,
			
 
				       //是否弹出对话框
			
@@ -134,22 +136,22 @@ export default {
 
				       //未下发的表格
			
 
				       option: {
			
 
				         requestUrl:
			
 
				-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
			
 
				+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + '',
			
 
				         selectionType: "select",
			
 
				       },
			
 
				       //已下发的表格
			
 
				       first: {
			
 
				         requestUrl:
			
 
				-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4",
			
 
				+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +'',
			
 
				       },
			
 
				       //车辆信息的表格
			
 
				       truck: {
			
 
				-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
			
 
				+        requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
			
 
				         // 控制显示当选列
			
 
				         selectionType: "radio",
			
 
				       },
			
 
				       Received:{
			
 
				-        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5",
			
 
				+        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +'',
			
 
				       },
			
 
				       //物资信息的数据
			
 
				       tableData: [],
			
@@ -187,7 +189,22 @@ export default {
 
				       index: null,
			
 
				     };
			
 
				   },
			
 
				+  created(){
			
 
				+      this.carrierUserId = getCookie('userId')
			
 
				+      console.log(this.carrierUserId)
			
 
				+      this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
			
 
				+      this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
			
 
				+      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
			
 
				+      this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
			
 
				+  },
			
 
				   methods: {
			
 
				+       onclick(){
			
 
				+      if(this.input != ''){
			
 
				+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
			
 
				+      }else{
			
 
				+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
			
 
				+      }     
			
 
				+    },
			
 
				     //下发
			
 
				     Issue() {
			
 
				       if (this.selectionList.length == 0) {
			
@@ -223,6 +240,8 @@ export default {
 
				     },
			
 
				     //对话框点击确定，执行增加车牌号
			
 
				     determine() {
			
 
				+      console.log(this.selectOrderId)
			
 
				+      console.log(this.capacityId)
			
 
				       this.axios
			
 
				         .post("/api/v1/oms/updateOmstruckOrder", {
			
 
				           orderId: this.selectOrderId,
			
@@ -259,15 +278,9 @@ export default {
 
				         });
			
 
				       });
			
 
				     },
			
 
				-    //模态窗的框计算
			
 
				-    inputClick() {
			
 
				-      this.truck.requestUrl =
			
 
				-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" +
			
 
				-        this.inputText;
			
 
				-    },
			
 
				     //单选按钮选中的值
			
 
				     currentRadioChange(row) {
			
 
				-      this.capacityId = row.capacityId;
			
 
				+      this.capacityId = row.carrierId;
			
 
				       this.capacityNumber = row.capacityNumber;
			
 
				     },
			
 
				     //打开模态窗口
			
--- a/src/views/TMS/components/importedFuel/transportReserveRan.vue
+++ b/src/views/TMS/components/importedFuel/transportReserveRan.vue
@@ -15,7 +15,12 @@
 
				       <el-button type="primary" class="btn" @click="insertClick">
			
 
				         <i class="el-icon-plus"></i>新增
			
 
				       </el-button>
			
 
				-      <el-button type="primary" class="btn" @click="issue" v-if="activeName == 'first'">
			
 
				+      <el-button
			
 
				+        type="primary"
			
 
				+        class="btn"
			
 
				+        @click="issue"
			
 
				+        v-if="activeName == 'first'"
			
 
				+      >
			
 
				         <i class="el-icon-plus"></i>下发
			
 
				       </el-button>
			
 
				     </div>
			
@@ -70,6 +75,7 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   name: "inplantTMS",
			
 
				   data() {
			
@@ -79,28 +85,66 @@ export default {
 
				       activeName: "first",
			
 
				       option1: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl:
			
 
				-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1",
			
 
				+        requestUrl: "",
			
 
				         selectionType: "select",
			
 
				         mapList: [],
			
 
				       },
			
 
				       option2: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl:
			
 
				-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1",
			
 
				+        requestUrl: "",
			
 
				       },
			
 
				     };
			
 
				   },
			
 
				+  created() {
			
 
				+    //判断是否是承运商
			
 
				+    if (getCookie("orgCode") == "chengyunshang") {
			
 
				+      this.option1.requestUrl =
			
 
				+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
			
 
				+        getCookie("userId");
			
 
				+      this.option2.requestUrl =
			
 
				+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=&carrierSSOId=" +
			
 
				+        getCookie("userId");
			
 
				+    } else {
			
 
				+      this.option1.requestUrl =
			
 
				+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
			
 
				+        null;
			
 
				+      this.option2.requestUrl =
			
 
				+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=&carrierSSOId=" +
			
 
				+        null;
			
 
				+    }
			
 
				+  },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				       if (this.activeName == "first") {
			
 
				-        this.option1.requestUrl =
			
 
				-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&con=" +
			
 
				-          this.input;
			
 
				+        //判断是否是承运商
			
 
				+        if (getCookie("orgCode") == "chengyunshang") {
			
 
				+          this.option1.requestUrl =
			
 
				+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
			
 
				+            getCookie("userId") +
			
 
				+            "&con=" +
			
 
				+            this.input;
			
 
				+        } else {
			
 
				+          this.option1.requestUrl =
			
 
				+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&fuelOrder=1&carrierSSOId=" +
			
 
				+            null +
			
 
				+            "&con=" +
			
 
				+            this.input;
			
 
				+        }
			
 
				       } else {
			
 
				-        this.option2.requestUrl =
			
 
				-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&con=" +
			
 
				-          this.input;
			
 
				+        //判断是否是承运商
			
 
				+        if (getCookie("orgCode") == "chengyunshang") {
			
 
				+          this.option1.requestUrl =
			
 
				+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
			
 
				+            getCookie("userId") +
			
 
				+            "&con=" +
			
 
				+            this.input;
			
 
				+        } else {
			
 
				+          this.option1.requestUrl =
			
 
				+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&carrierSSOId=" +
			
 
				+            null +
			
 
				+            "&con=" +
			
 
				+            this.input;
			
 
				+        }
			
 
				       }
			
 
				     },
			
 
				     selectionChange(selection) {
			
@@ -197,7 +241,7 @@ export default {
 
				       width: 250px;
			
 
				       margin-right: 20px;
			
 
				     }
			
 
				-    .btn{
			
 
				+    .btn {
			
 
				       margin-right: 10px;
			
 
				     }
			
 
				   }
			
--- a/src/views/TMS/components/importedFuel/transportReserveRanAdd.vue
+++ b/src/views/TMS/components/importedFuel/transportReserveRanAdd.vue
@@ -31,11 +31,16 @@
 
				     </div>
			
 
				     <div class="orderType from">
			
 
				       <span class="text">订单类别：</span>
			
 
				-      <el-select class="select" v-model="orderType" placeholder="请选择" disabled>
			
 
				+      <el-select
			
 
				+        class="select"
			
 
				+        v-model="orderType"
			
 
				+        placeholder="请选择"
			
 
				+        disabled
			
 
				+      >
			
 
				         <el-option
			
 
				           v-for="item in orderTypeList"
			
 
				           :key="item.value"
			
 
				-          :label="item.label" 
			
 
				+          :label="item.label"
			
 
				           :value="item.value"
			
 
				         >
			
 
				         </el-option>
			
@@ -78,7 +83,7 @@
 
				             <template v-if="item.slot">
			
 
				               <template v-if="item.prop == 'orderMaterialWeight'">
			
 
				                 <el-input
			
 
				-                style="width:250px"
			
 
				+                  style="width: 250px"
			
 
				                   v-model.number="scope.row.orderMaterialWeight"
			
 
				                 ></el-input>
			
 
				               </template>
			
@@ -100,20 +105,16 @@
 
				     </div>
			
 
				     <!-- 模态窗口 -->
			
 
				     <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
			
 
				-      <div style="margin-bottom: 10px;">
			
 
				+      <div style="margin-bottom: 10px">
			
 
				         <el-input
			
 
				-        placeholder="请输入内容"
			
 
				-        v-model="input"
			
 
				-        style="margin-top: 10px;margin-right: 10px;width:250px;"
			
 
				-        clearable
			
 
				-      ></el-input>
			
 
				-      <el-button
			
 
				-        type="primary"
			
 
				-        class="btn"
			
 
				-        @click="onclick(a)"
			
 
				-      >
			
 
				-        <i class="el-icon-search"></i>查询
			
 
				-      </el-button>
			
 
				+          placeholder="请输入内容"
			
 
				+          v-model="input"
			
 
				+          style="margin-top: 10px; margin-right: 10px; width: 250px"
			
 
				+          clearable
			
 
				+        ></el-input>
			
 
				+        <el-button type="primary" class="btn" @click="onclick(a)">
			
 
				+          <i class="el-icon-search"></i>查询
			
 
				+        </el-button>
			
 
				       </div>
			
 
				       <div v-show="a == 1">
			
 
				         <dilTable
			
@@ -154,20 +155,22 @@
 
				 </template>
			
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				-import { sjTime,isNumber,isIntegerNumber } from '@/utils/sharedJsFile'
			
 
				+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
 
				     return {
			
 
				       //订单类别
			
 
				-      orderTypeList:[
			
 
				+      orderTypeList: [
			
 
				         {
			
 
				-          value:6,
			
 
				-          label:'老厂区'
			
 
				-        },{
			
 
				-          value:7,
			
 
				-          label:'新厂区'
			
 
				-        }
			
 
				+          value: 6,
			
 
				+          label: "老厂区",
			
 
				+        },
			
 
				+        {
			
 
				+          value: 7,
			
 
				+          label: "新厂区",
			
 
				+        },
			
 
				       ],
			
 
				       // 线路名称
			
 
				       lineName: "",
			
@@ -216,7 +219,7 @@ export default {
 
				       //卸货点名称
			
 
				       unloadPointName: "",
			
 
				       //订单类别
			
 
				-      orderType:null,
			
 
				+      orderType: null,
			
 
				       a: 1,
			
 
				       direction: "rtl",
			
 
				       input: "",
			
@@ -232,7 +235,7 @@ export default {
 
				         mapList2: [],
			
 
				       },
			
 
				       third: {
			
 
				-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
			
 
				+        requestUrl: "",
			
 
				         selectionType: "select",
			
 
				         mapList3: [],
			
 
				       },
			
@@ -246,11 +249,21 @@ export default {
 
				       },
			
 
				     };
			
 
				   },
			
 
				-  watch:{
			
 
				-    drawer(val){
			
 
				-      if(!val){
			
 
				+  watch: {
			
 
				+    drawer(val) {
			
 
				+      if (!val) {
			
 
				         this.input = null;
			
 
				       }
			
 
				+    },
			
 
				+  },
			
 
				+  created() {
			
 
				+    if (getCookie("orgCode") == "chengyunshang") {
			
 
				+      this.third.requestUrl =
			
 
				+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
			
 
				+        getCookie("userId");
			
 
				+    } else {
			
 
				+      this.third.requestUrl =
			
 
				+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
			
 
				     }
			
 
				   },
			
 
				   methods: {
			
@@ -280,14 +293,14 @@ export default {
 
				               });
			
 
				               this.form1 = [];
			
 
				             } else {
			
 
				-              console.log()
			
 
				+              console.log();
			
 
				               this.remark = res.data.data.remark;
			
 
				               this.purchaseOrderId = res.data.data.purchaseOrderId;
			
 
				               this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
			
 
				-              if(res.data.data.receiveUnitId == 1){
			
 
				-                  this.orderType = 6
			
 
				-              }else{
			
 
				-                this.orderType = 7
			
 
				+              if (res.data.data.receiveUnitId == 1) {
			
 
				+                this.orderType = 6;
			
 
				+              } else {
			
 
				+                this.orderType = 7;
			
 
				               }
			
 
				             }
			
 
				           } else {
			
@@ -308,9 +321,20 @@ export default {
 
				           "&index=" +
			
 
				           this.input;
			
 
				       } else if (a == 3) {
			
 
				-        this.third.requestUrl =
			
 
				-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
			
 
				-          this.input;
			
 
				+        //判断是否是承运商查询车辆
			
 
				+        if (getCookie("orgCode") == "chengyunshang") {
			
 
				+          this.third.requestUrl =
			
 
				+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
			
 
				+            getCookie("userId") +
			
 
				+            "&index=" +
			
 
				+            this.input;
			
 
				+        } else {
			
 
				+          this.third.requestUrl =
			
 
				+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
			
 
				+            null +
			
 
				+            "&index=" +
			
 
				+            this.input;
			
 
				+        }
			
 
				       } else if (a == 4) {
			
 
				         this.unloadPoint.requestUrl =
			
 
				           "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
			
@@ -480,7 +504,7 @@ export default {
 
				     width: 100px;
			
 
				     text-align: right;
			
 
				   }
			
 
				-  .input{
			
 
				+  .input {
			
 
				     width: 250px;
			
 
				     margin-right: 20px;
			
 
				   }
			
@@ -493,7 +517,7 @@ export default {
 
				     width: 170px;
			
 
				     text-align: right;
			
 
				   }
			
 
				-  .input{
			
 
				+  .input {
			
 
				     width: 250px;
			
 
				     margin-right: 20px;
			
 
				   }
			
@@ -507,12 +531,12 @@ export default {
 
				     width: 170px;
			
 
				     text-align: right;
			
 
				   }
			
 
				-  .input{
			
 
				+  .input {
			
 
				     width: 250px;
			
 
				     margin-right: 20px;
			
 
				   }
			
 
				 }
			
 
				-.orderType{
			
 
				+.orderType {
			
 
				   display: flex;
			
 
				   justify-content: center;
			
 
				   .text {
			
@@ -520,25 +544,26 @@ export default {
 
				     width: 110px;
			
 
				     text-align: right;
			
 
				   }
			
 
				-  .select{
			
 
				+  .select {
			
 
				     width: 250px;
			
 
				   }
			
 
				-  .span{
			
 
				+  .span {
			
 
				     display: inline-block;
			
 
				-    width: 30px;height: 10px;
			
 
				+    width: 30px;
			
 
				+    height: 10px;
			
 
				   }
			
 
				 }
			
 
				-.contractTitle{
			
 
				+.contractTitle {
			
 
				   display: flex;
			
 
				   justify-content: center;
			
 
				-  .el-form-item{
			
 
				+  .el-form-item {
			
 
				     display: flex;
			
 
				     justify-content: center;
			
 
				-    .el-form-item__label{
			
 
				+    .el-form-item__label {
			
 
				       display: flex;
			
 
				       align-items: center;
			
 
				     }
			
 
				-    .el-input{
			
 
				+    .el-input {
			
 
				       width: 250px;
			
 
				     }
			
 
				   }
			
@@ -551,7 +576,7 @@ export default {
 
				     width: 170px;
			
 
				     text-align: right;
			
 
				   }
			
 
				-  .input{
			
 
				+  .input {
			
 
				     width: 250px;
			
 
				     margin-right: 20px;
			
 
				   }
			
--- a/src/views/TMS/components/importedFuel/transportReserveRanEdit.vue
+++ b/src/views/TMS/components/importedFuel/transportReserveRanEdit.vue
@@ -66,7 +66,8 @@
 
				 
			
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				-import {sjTime} from "@/utils/sharedJsFile";
			
 
				+import { sjTime } from "@/utils/sharedJsFile";
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
@@ -76,7 +77,7 @@ export default {
 
				       direction: "rtl",
			
 
				       a: null,
			
 
				       third: {
			
 
				-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
			
 
				+        requestUrl: "",
			
 
				         selectionType: "radio",
			
 
				       },
			
 
				       unloadPoint: {
			
@@ -86,18 +87,43 @@ export default {
 
				       capacityId: null,
			
 
				       warehouseId: null,
			
 
				       input: null,
			
 
				-      orderType:null,
			
 
				+      orderType: null,
			
 
				     };
			
 
				   },
			
 
				+  created() {
			
 
				+    //判断是否是承运商
			
 
				+    if (getCookie("orgCode") == "chengyunshang") {
			
 
				+      this.third.requestUrl =
			
 
				+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
			
 
				+        getCookie("userId");
			
 
				+    } else {
			
 
				+      this.third.requestUrl =
			
 
				+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
			
 
				+    }
			
 
				+  },
			
 
				   mounted() {
			
 
				     this.information();
			
 
				   },
			
 
				   methods: {
			
 
				     onclick(a) {
			
 
				       if (a == 1) {
			
 
				-        this.third.requestUrl =
			
 
				-          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" + this.input;
			
 
				+        //判断是否是承运商
			
 
				+        if (getCookie("orgCode") == "chengyunshang") {
			
 
				+          this.third.requestUrl =
			
 
				+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
			
 
				+            getCookie("userId") +
			
 
				+            "&con=" +
			
 
				+            this.input;
			
 
				+        } else {
			
 
				+          this.third.requestUrl =
			
 
				+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
			
 
				+            null +
			
 
				+            "&con=" +
			
 
				+            this.input;
			
 
				+        }
			
 
				       } else if (a == 2) {
			
 
				+        this.unloadPoint.requestUrl =
			
 
				+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&con=" + this.input;
			
 
				       }
			
 
				     },
			
 
				     selectTruck() {
			
@@ -132,22 +158,22 @@ export default {
 
				     // 确认
			
 
				     onClickConfirm() {
			
 
				       let obj = {
			
 
				-          orderId:this.$route.params.orderId,
			
 
				-          capacityId:parseInt(this.capacityId),
			
 
				-          unloadPointId:this.warehouseId,
			
 
				-          orderEntryTime:sjTime(this.form1.orderEntryTime),
			
 
				-          orderType:parseInt(this.form1.orderType),
			
 
				+        orderId: this.$route.params.orderId,
			
 
				+        capacityId: parseInt(this.capacityId),
			
 
				+        unloadPointId: this.warehouseId,
			
 
				+        orderEntryTime: sjTime(this.form1.orderEntryTime),
			
 
				+        orderType: parseInt(this.form1.orderType),
			
 
				+      };
			
 
				+      this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
			
 
				+        if (res.data.code == "200") {
			
 
				+          this.$message({
			
 
				+            type: "success",
			
 
				+            message: "修改成功!",
			
 
				+          });
			
 
				+          this.$router.push("/transportReserveRan");
			
 
				         }
			
 
				-        this.axios.post("/api/v1/oms/updateOrder", obj).then((res) => {
			
 
				-          if(res.data.code == "200"){
			
 
				-            this.$message({
			
 
				-              type: "success",
			
 
				-              message: "修改成功!",
			
 
				-            });
			
 
				-            this.$router.push("/transportReserveRan");
			
 
				-            }
			
 
				-        });
			
 
				-    }
			
 
				+      });
			
 
				+    },
			
 
				   },
			
 
				 };
			
 
				 </script>
			
--- a/src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue
+++ b/src/views/TMS/components/importedFuel/truckDriverReceiveRan.vue
@@ -2,7 +2,13 @@
 
				   <!-- 燃料运输派单 -->
			
 
				   <div class="homeworkPath">
			
 
				     <div class="top">
			
 
				-      <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
			
 
				+      <el-input
			
 
				+        placeholder="请输入内容"
			
 
				+        class="input"
			
 
				+        v-model="input"
			
 
				+        clearable
			
 
				+      >
			
 
				+      </el-input>
			
 
				       <el-button type="primary" class="btn" @click="onclick">
			
 
				         <i class="el-icon-search"></i>查询
			
 
				       </el-button>
			
@@ -10,19 +16,18 @@
 
				     <el-tabs v-model="activeName">
			
 
				       <!-- 未下发 -->
			
 
				       <el-tab-pane label="已接收" name="first">
			
 
				-        <dilTable v-bind.sync="option1" ref="table">
			
 
				-        </dilTable>
			
 
				+        <dilTable v-bind.sync="option1" ref="table"> </dilTable>
			
 
				       </el-tab-pane>
			
 
				       <!-- 已下发 -->
			
 
				       <el-tab-pane label="已拒绝" name="second">
			
 
				-        <dilTable v-bind.sync="option2">
			
 
				-        </dilTable>
			
 
				+        <dilTable v-bind.sync="option2"> </dilTable>
			
 
				       </el-tab-pane>
			
 
				     </el-tabs>
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   name: "inplantTMS",
			
 
				   data() {
			
@@ -32,20 +37,44 @@ export default {
 
				       activeName: "first",
			
 
				       option1: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5"
			
 
				+        requestUrl:
			
 
				+          "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5",
			
 
				       },
			
 
				       option2: {
			
 
				         // 表格请求数据的地址
			
 
				-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6"
			
 
				-      }
			
 
				+        requestUrl:
			
 
				+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6",
			
 
				+      },
			
 
				     };
			
 
				   },
			
 
				+  created() {
			
 
				+    //判断是否是承运商
			
 
				+    if (getCookie("orgCode") == "chengyunshang") {
			
 
				+      this.option1.requestUrl =
			
 
				+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" +
			
 
				+        getCookie("userId");
			
 
				+      this.option2.requestUrl =
			
 
				+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&carrierSSOId=" +
			
 
				+        getCookie("userId");
			
 
				+    } else {
			
 
				+      this.option1.requestUrl =
			
 
				+        "/api/v1/oms/getTransportDispatch?apiId=148&fuelOrder=1&orderStatus=5&carrierSSOId=" +
			
 
				+        null;
			
 
				+      this.option2.requestUrl =
			
 
				+        "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&carrierSSOId=" +
			
 
				+        null;
			
 
				+    }
			
 
				+  },
			
 
				   methods: {
			
 
				     onclick() {
			
 
				-      if(this.activeName == "first"){
			
 
				-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" + this.input;
			
 
				-      }else{
			
 
				-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" + this.input;
			
 
				+      if (this.activeName == "first") {
			
 
				+        this.option1.requestUrl =
			
 
				+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=5&con=" +
			
 
				+          this.input;
			
 
				+      } else {
			
 
				+        this.option2.requestUrl =
			
 
				+          "/api/v1/oms/getTransportDispatch?apiId=241&fuelOrder=1&orderStatus=6&con=" +
			
 
				+          this.input;
			
 
				       }
			
 
				     },
			
 
				   },
			
@@ -53,9 +82,9 @@ export default {
 
				 </script>
			
 
				 <style lang='scss'>
			
 
				 .homeworkPath {
			
 
				-   .top {
			
 
				+  .top {
			
 
				     padding: 40px;
			
 
				-    .input{
			
 
				+    .input {
			
 
				       width: 250px;
			
 
				       margin-right: 10px;
			
 
				     }
			
--- 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,13 +117,40 @@
 
				                 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>
			
 
				       <!-- 销售公司已审批 -->
			
 
				        <el-tab-pane label="销售公司已审批" name="four">
			
 
				-        <dilTable v-bind.sync="option4">
			
 
				+        <dilTable v-bind.sync="option4" ref="table">
			
 
				           <el-table-column fixed="right" label="操作" width="130">
			
 
				             <template slot-scope="scope">
			
 
				               <el-button
			
@@ -74,13 +160,33 @@
 
				                 >新增车序号</el-button
			
 
				               >
			
 
				               <el-button
			
 
				-                @click="detailedClick(scope.row.saleOrderId)"
			
 
				+                @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-tabs>
			
@@ -114,6 +220,52 @@ export default {
 
				           "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409",
			
 
				       },
			
 
				       
			
 
				+      //记录旧的row对象 (销售公司已审批)
			
 
				+      oldRow: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
			
 
				+      oldRowCount: 1,
			
 
				+      //记录旧的row对象 (财务已审批)
			
 
				+      oldRow1: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (财务已审批)
			
 
				+      oldRowCount1: 1,
			
 
				+      //记录旧的row对象 (已上报)
			
 
				+      oldRow2: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (已上报)
			
 
				+      oldRowCount2: 1,
			
 
				+      //记录旧的row对象 (未上报)
			
 
				+      oldRow3: "",
			
 
				+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (未上报)
			
 
				+      oldRowCount3: 1,
			
 
				+      tableHead: [
			
 
				+        {
			
 
				+          prop: "materialName",
			
 
				+          label: "物资名称",
			
 
				+          width: 150,
			
 
				+        },
			
 
				+        {
			
 
				+          prop: "specificationModel",
			
 
				+          label: "规格型号",
			
 
				+          width: 150,
			
 
				+        },
			
 
				+        {
			
 
				+          prop: "materialNumber",
			
 
				+          label: "物资件数",
			
 
				+          width: 100,
			
 
				+        },
			
 
				+        {
			
 
				+          prop: "materialWeight",
			
 
				+          label: "物资重量",
			
 
				+          width: 100,
			
 
				+        },
			
 
				+      ],
			
 
				+      //(销售公司已审批)
			
 
				+      tableData: [],
			
 
				+      //(财务已审批)
			
 
				+      tableData1: [],
			
 
				+      //(已上报)
			
 
				+      tableData2: [],
			
 
				+      //(未上报)
			
 
				+      tableData3: [],
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -136,9 +288,133 @@ export default {
 
				     addClick(saleOrderId){
			
 
				       this.$router.push("/addSaleOrderArrange/" + saleOrderId);
			
 
				     },
			
 
				-    detailedClick(saleOrderId){
			
 
				-      this.$router.push("saleOrderMaterial/" + saleOrderId);
			
 
				+    // detailedClick(saleOrderId){
			
 
				+    //   this.$router.push("saleOrderMaterial/" + saleOrderId);
			
 
				+    // },
			
 
				+    // -------查看物资详情 (销售公司已审批)
			
 
				+    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;
			
 
				+      // 根据销售订单id查询物资信息
			
 
				+      this.axios
			
 
				+        .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/homepage/app.js
+++ b/src/views/homepage/app.js
@@ -48,15 +48,7 @@ export function sjTime(orderPlanInTime) {
 
				   var timestamp1 = stringTime.replace(/-/g, "/");
			
 
				   return new Date(timestamp1).getTime();
			
 
				 }
			
 
				-//验证电话号码
			
 
				-export function VerifyPhoneNumber(Phone) {
			
 
				-  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
			
 
				-  if (!myreg.test(Phone)) {
			
 
				-      return false;
			
 
				-  } else {
			
 
				-      return true;
			
 
				-  }
			
 
				-}
			
 
				+
			
 
				 export function isNumber(value) {
			
 
				   //验证是否为数字
			
 
				   var patrn = /^(-)?\d+(\.\d+)?$/;
			
--- a/src/views/homepage/components/homepage.vue
+++ b/src/views/homepage/components/homepage.vue
@@ -1,84 +1,13 @@
 
				 <template>
			
 
				-  <div>
			
 
				-    首页
			
 
				-    <el-button @click="onClick">ces1</el-button>
			
 
				-  </div>
			
 
				+  <div>首页</div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 export default {
			
 
				-  methods: {
			
 
				-    onClick() {
			
 
				-      let data = {
			
 
				-        userId: "",
			
 
				-        userCode: "A12345",
			
 
				-        userName: "A12345",
			
 
				-        qrCode: "",
			
 
				-        sex: "",
			
 
				-        age: "",
			
 
				-        cardNo: "",
			
 
				-        birthDate: "",
			
 
				-        nativePlace: "",
			
 
				-        orgCode: "yunli",
			
 
				-        orgName: "运力",
			
 
				-        dep: "",
			
 
				-        workTeam: "",
			
 
				-        profilePhoto: "",
			
 
				-        photo: "",
			
 
				-        mobile: "13487481520",
			
 
				-        qq: "",
			
 
				-        wechat: "",
			
 
				-        tel: "",
			
 
				-        email: "213213@qq.com",
			
 
				-        homeAddr: "",
			
 
				-        entryDate: "",
			
 
				-        workDate: "",
			
 
				-        political: "",
			
 
				-        title: "",
			
 
				-        degree: "",
			
 
				-        major: "",
			
 
				-        gradSchool: "",
			
 
				-        ability: "",
			
 
				-        tranHis: "",
			
 
				-        certificate: "",
			
 
				-        special: "",
			
 
				-        assessment: "",
			
 
				-        leaveStatus: "",
			
 
				-        onlineStatus: "",
			
 
				-        status: "",
			
 
				-        remark: "",
			
 
				-        expireDays: "",
			
 
				-        leave: "",
			
 
				-        address: "",
			
 
				-        ip: "",
			
 
				-        rank: "",
			
 
				-        responsibility: "",
			
 
				-        groupData: "",
			
 
				-        companyData: "",
			
 
				-        groupId: "506514577756917769",
			
 
				-        companyId: "713710108567277568",
			
 
				-        photoType: "",
			
 
				-        orgId: "922512907093282816",
			
 
				-      };
			
 
				-      this.store.dispatch("system/usersManage/addUser", data).then((res) => {
			
 
				-        console.log(res);
			
 
				-        if (res.code === "0") {
			
 
				-          if (this.qrRole.length > 0) {
			
 
				-            this.addRoleToUser(res.data.userId, res.data.userCode);
			
 
				-          }
			
 
				-          if (form.dutys.length > 0) {
			
 
				-            this.addUserDutys(res.data.userId, form.dutys);
			
 
				-          }
			
 
				-          this.$message.success("添加成功");
			
 
				-          this.$emit("on-then", "success", form);
			
 
				-        } else {
			
 
				-          this.$message.error(res.message);
			
 
				-        }
			
 
				-      });
			
 
				-    },
			
 
				-  },
			
 
				-};
			
 
				+
			
 
				+}
			
 
				 </script>
			
 
				 
			
 
				 <style>
			
 
				+
			
 
				 </style>
			
--- a/src/views/index/components/login.vue
+++ b/src/views/index/components/login.vue
@@ -115,6 +115,7 @@ export default {
 
				             .dispatch("index/login/login", form)
			
 
				             .then((res) => {
			
 
				               if (res.code === "0") {
			
 
				+                console.log(res,"res")
			
 
				                 //  登录成功
			
 
				                 //  设置缓存信息
			
 
				                 setCookie("accessToken", res.data.accessToken, cookieTime, "/");
			
@@ -124,6 +125,7 @@ export default {
 
				                   cookieTime,
			
 
				                   "/"
			
 
				                 );
			
 
				+                setCookie("orgCode", res.data.user.orgCode);
			
 
				                 setCookie("userId", res.data.user.userId);
			
 
				                 setCookie("appId", res.data.appId);
			
 
				                 setCookie("loginId", res.data.user.userId); // 为配合bms取值添加
			
--- 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
@@ -1,8 +1,9 @@
 
				 // 新增计划
			
 
				 <template>
			
 
				-  <div id="endMaintenance">
			
 
				+  <div class="addInwardPlan">
			
 
				     <page-title>新增计划</page-title>
			
 
				-  <el-form  label-width="80px">
			
 
				+<div class="form-box">
			
 
				+<el-form  class="demo-form-inline"  label-width="80px" label-position="left">
			
 
				   <el-form-item label="承运商">
			
 
				     <el-autocomplete
			
 
				       class="inline-input"
			
@@ -18,15 +19,18 @@
 
				   </template>
			
 
				     </el-autocomplete>
			
 
				   </el-form-item>
			
 
				-  <el-form-item label="车数" >
			
 
				-    <el-input   v-model="planTruckNumber" placeholder="必填" ></el-input>
			
 
				+  <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
			
 
				+  <el-form-item label="车数">
			
 
				+    <el-input   v-model="planTruckNumber" placeholder="必填" class="input"></el-input>
			
 
				   </el-form-item>
			
 
				+  </el-form>
			
 
				 </el-form>
			
 
				+</div>
			
 
				     <template>
			
 
				 			<div>		
			
 
				-						<dilTable v-bind.sync="first" @radio-change="currentRadioChange">
			
 
				-						</dilTable>
			
 
				-            </div>
			
 
				+			<dilTable v-bind.sync="first" @radio-change="currentRadioChange">
			
 
				+			</dilTable>
			
 
				+      </div>
			
 
				 		</template>
			
 
				     <div class="button-box">
			
 
				       <el-button type="primary" @click="makeSure">确认新增</el-button>
			
@@ -45,14 +49,15 @@ export default {
 
				       state2:null,
			
 
				       planTruckNumber:null,
			
 
				       carrierId:null,
			
 
				+      requirementId:null,
			
 
				       form: {},
			
 
				       first:{
			
 
				         requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
			
 
				         selectionType: "radio",
			
 
				-				mapList: [],
			
 
				+				mapList: {},
			
 
				       },
			
 
				       numberValidateForm: {
			
 
				-          planTruckNumber: ''
			
 
				+          planTruckNumber: null,
			
 
				         }
			
 
				     };
			
 
				   },
			
@@ -85,10 +90,11 @@ export default {
 
				       },
			
 
				     currentRadioChange(selection){
			
 
				         this.mapList = selection
			
 
				+        this.requirementId = selection.requirementId
			
 
				+        console.log(this.mapList)
			
 
				     },
			
 
				     // 新增
			
 
				     makeSure() {
			
 
				-      console.log(this.planTruckNumber)
			
 
				       console.log(typeof(this.planTruckNumber))  
			
 
				       if(this.carrierId == null){
			
 
				         this.$alert('请输入承运商！')
			
@@ -96,7 +102,7 @@ export default {
 
				       }else if(this.planTruckNumber == null){
			
 
				         this.$alert('请输入车数！')
			
 
				         return
			
 
				-      }else if(typeof(this.mapList.requirementId) == 'undefined'){
			
 
				+      }else if(this.requirementId== null){
			
 
				         this.$alert('请选择需要制定计划的需求！')
			
 
				         return
			
 
				       }
			
@@ -105,7 +111,6 @@ export default {
 
				         planTruckNumber: this.planTruckNumber,
			
 
				         carrierId: this.carrierId
			
 
				       };
			
 
				-      console.log(plan)  
			
 
				       this.axios
			
 
				         .post(
			
 
				           "/api/v1/ams/addTruckPlan",
			
@@ -132,39 +137,26 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss">
			
 
				-.el-form{
			
 
				-  margin-left: 30%;
			
 
				-}
			
 
				-.el-form-item{
			
 
				-  display: flex;
			
 
				+<style lang="scss" scoped>
			
 
				+.addInwardPlan{
			
 
				+.form-box{
			
 
				+  display: inline-block !important;
			
 
				+  margin-left: 38%;
			
 
				+  .el-input{
			
 
				+    width:288px
			
 
				+  }
			
 
				+  .input{
			
 
				+    margin-left: -10px;
			
 
				+  }
			
 
				+  .el-form{
			
 
				+    padding: 10px;  
			
 
				+  }
			
 
				 }
			
 
				-.form-box,
			
 
				 .button-box
			
 
				 {
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				+  margin-left: 25px !important;
			
 
				 }
			
 
				-.truckList1 {
			
 
				-  margin-left: 35%;
			
 
				-  width: 100%;
			
 
				-  .truckList {
			
 
				-    width: 96%;
			
 
				-    .el-input{
			
 
				-     width:128%
			
 
				-    }
			
 
				-    .text {
			
 
				-      display: inline-block;
			
 
				-      width: 120px;
			
 
				-      text-align: right;
			
 
				-    }
			
 
				-    .truckBtn {
			
 
				-      width: 250px;
			
 
				-    }
			
 
				-  }
			
 
				 }
			
 
				+
			
 
				+
			
 
				 </style>
			
--- a/src/views/inward/components/truckAppoint/addRequirement.vue
+++ b/src/views/inward/components/truckAppoint/addRequirement.vue
@@ -1,103 +1,139 @@
 
				 // 新增采购内转需求
			
 
				 <template>
			
 
				-  <div id="endMaintenance">
			
 
				+  <div class="addInwardRequirement">
			
 
				     <page-title>新增需求</page-title>
			
 
				-    <div>
			
 
				-      <div class="form-box f2">
			
 
				-        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				-          <el-form-item label="采购订单号">
			
 
				-            <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>
			
 
				-        <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>
			
 
				-        <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>
			
 
				-        <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>
			
 
				-        <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>
			
 
				-        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				-          <el-form-item label="装车点">
			
 
				-            <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>
			
 
				-        <el-form :inline="true" class="demo-form-inline" label-width="80px">
			
 
				-          <el-form-item label="卸车点">
			
 
				-            <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>
			
 
				-      <el-drawer
			
 
				-        :visible.sync="drawer"
			
 
				-        :direction="direction"
			
 
				-        :before-close="handleClose"
			
 
				-        size="30%"
			
 
				+    <div class="form-box f2">
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="采购订单号">
			
 
				+          <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>
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="外轮船名" class="tx">
			
 
				+          <el-input v-model="foreignShipName" disabled></el-input>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="发货单位" class="tx">
			
 
				+          <el-input v-model="supplierName" disabled></el-input>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="收货单位" class="tx">
			
 
				+          <el-input v-model="shipperName" disabled></el-input>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="物资名称" class="tx">
			
 
				+          <el-input v-model="materialName" disabled></el-input>
			
 
				+        </el-form-item>
			
 
				+      </el-form>
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				       >
			
 
				-        <el-input
			
 
				-          placeholder="请输入内容"
			
 
				-          v-model="input"
			
 
				-          style="margin-top: 10px ;width:50%"
			
 
				-          clearable
			
 
				-        >
			
 
				-        </el-input>
			
 
				-        <el-button
			
 
				-          type="primary"
			
 
				-          class="btn"
			
 
				-          @click="onclick(a)"
			
 
				-          style="margin-bottom: 15px"
			
 
				-        >
			
 
				-          <i class="el-icon-search"></i>查询
			
 
				-        </el-button>
			
 
				-        <div v-show="a == 1">
			
 
				-          <dilTable
			
 
				-            v-bind.sync="second"
			
 
				-            @radio-change="currentRadioChange1"
			
 
				-          ></dilTable>
			
 
				-        </div>
			
 
				-        <div v-show="a == 2">
			
 
				-          <dilTable
			
 
				-            v-bind.sync="second1"
			
 
				-            @radio-change="currentRadioChange2"
			
 
				-          ></dilTable>
			
 
				-        </div>
			
 
				-        <div v-show="a == 3">
			
 
				-          <dilTable
			
 
				-            v-bind.sync="second2"
			
 
				-            @radio-change="currentRadioChange3"
			
 
				-          ></dilTable>
			
 
				-        </div>
			
 
				-         <div v-show="a == 4">
			
 
				-          <dilTable
			
 
				-            v-bind.sync="second3"
			
 
				-            @radio-change="currentRadioChange4"
			
 
				-          ></dilTable>
			
 
				-        </div>
			
 
				-      </el-drawer>
			
 
				+        <el-form-item label="装车点">
			
 
				+          <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>
			
 
				+      <el-form
			
 
				+        :inline="true"
			
 
				+        class="demo-form-inline"
			
 
				+        :label-position="left"
			
 
				+        label-width="80px"
			
 
				+      >
			
 
				+        <el-form-item label="卸车点">
			
 
				+          <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>
			
 
				+    <el-drawer
			
 
				+      :visible.sync="drawer"
			
 
				+      :direction="direction"
			
 
				+      :before-close="handleClose"
			
 
				+      size="30%"
			
 
				+    >
			
 
				+      <el-input
			
 
				+        placeholder="请输入内容"
			
 
				+        v-model="input"
			
 
				+        style="margin-top: 10px ;width:50%"
			
 
				+        clearable
			
 
				+      >
			
 
				+      </el-input>
			
 
				+      <el-button
			
 
				+        type="primary"
			
 
				+        class="btn"
			
 
				+        @click="onclick(a)"
			
 
				+        style="margin-bottom: 15px"
			
 
				+      >
			
 
				+        <i class="el-icon-search"></i>查询
			
 
				+      </el-button>
			
 
				+      <div v-show="a == 1">
			
 
				+        <dilTable
			
 
				+          v-bind.sync="second"
			
 
				+          @radio-change="currentRadioChange1"
			
 
				+        ></dilTable>
			
 
				+      </div>
			
 
				+      <div v-show="a == 2">
			
 
				+        <dilTable
			
 
				+          v-bind.sync="second1"
			
 
				+          @radio-change="currentRadioChange2"
			
 
				+        ></dilTable>
			
 
				+      </div>
			
 
				+      <div v-show="a == 3">
			
 
				+        <dilTable
			
 
				+          v-bind.sync="second2"
			
 
				+          @radio-change="currentRadioChange3"
			
 
				+        ></dilTable>
			
 
				+      </div>
			
 
				+      <div v-show="a == 4">
			
 
				+        <dilTable
			
 
				+          v-bind.sync="second3"
			
 
				+          @radio-change="currentRadioChange4"
			
 
				+        ></dilTable>
			
 
				+      </div>
			
 
				+    </el-drawer>
			
 
				     <div class="box-form">
			
 
				-        <dil-form :formId="300" v-model="form"></dil-form>
			
 
				+      <dil-form :formId="300" v-model="form"></dil-form>
			
 
				     </div>
			
 
				     <div class="button-box">
			
 
				       <el-button type="primary" @click="makeSure">确认新增</el-button>
			
@@ -115,36 +151,36 @@ export default {
 
				     return {
			
 
				       purchaseOrder: null,
			
 
				       foreignShipName: null,
			
 
				-      materialName:null,
			
 
				-      shipperName:null,
			
 
				-      supplierName:null,
			
 
				+      materialName: null,
			
 
				+      shipperName: null,
			
 
				+      supplierName: null,
			
 
				       a: 1,
			
 
				       direction: "rtl",
			
 
				       input: "",
			
 
				       truckPoint: null,
			
 
				-      truckPoint1:null,
			
 
				+      truckPoint1: null,
			
 
				       drawer: false,
			
 
				       form: {},
			
 
				       second: {
			
 
				         requestUrl: "/api/v1/ams/getPurchaseIdByBatch?apiId=252",
			
 
				         selectionType: "radio",
			
 
				-        mapList1: [],
			
 
				+        mapList1: []
			
 
				       },
			
 
				       second1: {
			
 
				         requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
			
 
				         selectionType: "radio",
			
 
				-        mapList2: [],
			
 
				+        mapList2: []
			
 
				       },
			
 
				-      second2 :{
			
 
				+      second2: {
			
 
				         requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
			
 
				         selectionType: "radio",
			
 
				-        mapList3: [],
			
 
				+        mapList3: []
			
 
				       },
			
 
				-      second3 :{
			
 
				+      second3: {
			
 
				         requestUrl: "/api/v1/ams/getWareHouse?apiId=251",
			
 
				         selectionType: "radio",
			
 
				-        mapList4: [],
			
 
				-      },
			
 
				+        mapList4: []
			
 
				+      }
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -161,80 +197,85 @@ export default {
 
				         this.second.requestUrl =
			
 
				           "/api/v1/ams/getPurchaseIdByBatch?apiId=252&con=" + this.input;
			
 
				       } else {
			
 
				-        if(this.input == ""){
			
 
				+        if (this.input == "") {
			
 
				+          this.second1.requestUrl = "/api/v1/ams/getWareHouse?apiId=251";
			
 
				+        } else {
			
 
				           this.second1.requestUrl =
			
 
				-          "/api/v1/ams/getWareHouse?apiId=251"
			
 
				-        }else{
			
 
				-            this.second1.requestUrl =
			
 
				-          "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input
			
 
				-        }     
			
 
				+            "/api/v1/ams/getWareHouse?apiId=251&con=" + this.input;
			
 
				+        }
			
 
				       }
			
 
				     },
			
 
				     currentRadioChange1(selection) {
			
 
				-      this.mapList1 = selection
			
 
				-      this.purchaseOrder = this.mapList1.purchaseOrderNo
			
 
				-      this.foreignShipName = this.mapList1.resultForeignShipName
			
 
				-      this.supplierName = this.mapList1.supplierName
			
 
				-      this.shipperName = this.mapList1.shipperName
			
 
				+      this.mapList1 = selection;
			
 
				+      this.purchaseOrder = this.mapList1.purchaseOrderNo;
			
 
				+      this.foreignShipName = this.mapList1.resultForeignShipName;
			
 
				+      this.supplierName = this.mapList1.supplierName;
			
 
				+      this.shipperName = this.mapList1.shipperName;
			
 
				       this.materialName = this.mapList1.materialName;
			
 
				     },
			
 
				     currentRadioChange2(selection) {
			
 
				-      this.mapList2 = selection
			
 
				-      console.log(this.mapList2)     
			
 
				-      if(this.mapList2.companyBranchName == null){
			
 
				-          this.mapList2.companyBranchName = ''
			
 
				+      this.mapList2 = selection;
			
 
				+      console.log(this.mapList2);
			
 
				+      if (this.mapList2.companyBranchName == null) {
			
 
				+        this.mapList2.companyBranchName = "";
			
 
				       }
			
 
				-      if(this.mapList2.branchFactory == null){
			
 
				-          this.mapList2.branchFactory = ''
			
 
				+      if (this.mapList2.branchFactory == null) {
			
 
				+        this.mapList2.branchFactory = "";
			
 
				       }
			
 
				-      if(this.mapList2.wareHouseName ==null){
			
 
				-          this.mapList2.wareHouseName = ''
			
 
				+      if (this.mapList2.wareHouseName == null) {
			
 
				+        this.mapList2.wareHouseName = "";
			
 
				       }
			
 
				-      this.truckPoint= this.mapList2.companyBranchName+this.mapList2.branchFactory+this.mapList2.wareHouseName
			
 
				+      this.truckPoint =
			
 
				+        this.mapList2.companyBranchName +
			
 
				+        this.mapList2.branchFactory +
			
 
				+        this.mapList2.wareHouseName;
			
 
				     },
			
 
				     currentRadioChange3(selection) {
			
 
				-      this.mapList3 = selection
			
 
				-      console.log(selection)
			
 
				-        if(this.mapList3.companyBranchName == null){
			
 
				-          this.mapList3.companyBranchName = ''
			
 
				+      this.mapList3 = selection;
			
 
				+      console.log(selection);
			
 
				+      if (this.mapList3.companyBranchName == null) {
			
 
				+        this.mapList3.companyBranchName = "";
			
 
				       }
			
 
				-      if(this.mapList3.branchFactory == null){
			
 
				-          this.mapList3.branchFactory = ''
			
 
				+      if (this.mapList3.branchFactory == null) {
			
 
				+        this.mapList3.branchFactory = "";
			
 
				       }
			
 
				-      if(this.mapList3.wareHouseName ==null){
			
 
				-          this.mapList3.wareHouseName = ''
			
 
				+      if (this.mapList3.wareHouseName == null) {
			
 
				+        this.mapList3.wareHouseName = "";
			
 
				       }
			
 
				-      this.truckPoint1 = this.mapList3.companyBranchName+this.mapList3.branchFactory+this.mapList3.wareHouseName
			
 
				+      this.truckPoint1 =
			
 
				+        this.mapList3.companyBranchName +
			
 
				+        this.mapList3.branchFactory +
			
 
				+        this.mapList3.wareHouseName;
			
 
				     },
			
 
				     // 新增
			
 
				     makeSure() {
			
 
				-      if(this.purchaseOrder == null){
			
 
				-          this.$alert('没有选择采购订单，请点击浏览选择采购订单！')
			
 
				-          return         
			
 
				-      }else if(this.truckPoint == null){
			
 
				-          this.$alert('没有选择装车点，请点击浏览选择装车点！')
			
 
				-          return
			
 
				-      }else if(this.truckPoint1 == null){
			
 
				-          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
			
 
				+      if (this.purchaseOrder == null) {
			
 
				+        this.$alert("没有选择采购订单，请点击浏览选择采购订单！");
			
 
				+        return;
			
 
				+      } else if (this.truckPoint == null) {
			
 
				+        this.$alert("没有选择装车点，请点击浏览选择装车点！");
			
 
				+        return;
			
 
				+      } else if (this.truckPoint1 == null) {
			
 
				+        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;
			
 
				       }
			
 
				       let requiremnet = {
			
 
				         purchaseOrderId: this.mapList1.purchaseOrderId,
			
@@ -248,15 +289,15 @@ export default {
 
				         requirementWorkContent: this.form.requirementWorkContent,
			
 
				         requirementWorkEnvironment: this.form.requirementWorkEnvironment,
			
 
				         requirementWorkType: this.form.requirementWorkType,
			
 
				-        requirementUnloadUnitId:this.mapList3.wareHouseId
			
 
				+        requirementUnloadUnitId: this.mapList3.wareHouseId
			
 
				       };
			
 
				       this.axios
			
 
				         .post("/api/v1/ams/addTruckRequirement", requiremnet)
			
 
				-        .then((res) => {
			
 
				+        .then(res => {
			
 
				           if (res.data.code == 200) {
			
 
				             this.$message({
			
 
				               type: "success",
			
 
				-              message: "新增成功!",
			
 
				+              message: "新增成功!"
			
 
				             });
			
 
				             this.$router.go(-1);
			
 
				           } else {
			
@@ -267,29 +308,41 @@ export default {
 
				     // 返回
			
 
				     cancel() {
			
 
				       this.$router.go(-1);
			
 
				-    }, 
			
 
				-}};
			
 
				+    }
			
 
				+  }
			
 
				+};
			
 
				 </script>
			
 
				-
			
 
				-<style lang="scss">
			
 
				-.form-box{
			
 
				-  display: inline-block;
			
 
				+<style lang="scss" scoped>
			
 
				+.addInwardRequirement{
			
 
				+.form-box {
			
 
				+  display: inline-block !important;
			
 
				   margin-left: 38%;
			
 
				-  .el-input{
			
 
				-    width:288px
			
 
				+  .el-input {
			
 
				+    width: 288px;
			
 
				   }
			
 
				-  .el-form{
			
 
				+  .el-form {
			
 
				     padding: 10px;
			
 
				   }
			
 
				+  .tx{
			
 
				+    margin-left: -75px;
			
 
				+  }
			
 
				 }
			
 
				-.box-form{
			
 
				-  display: flex;
			
 
				-  .el-form-item{
			
 
				-  display: flex;
			
 
				+.box-form {
			
 
				+  display: inline-block !important ;
			
 
				+  padding-left: 38%;
			
 
				+  .el-form-item {
			
 
				+    display: flex;
			
 
				+    padding: 10px;
			
 
				+    .el-form-item__label {
			
 
				+      width: 80px !important;
			
 
				+    }
			
 
				+    .el-input {
			
 
				+      width: 288px;
			
 
				+    }
			
 
				   }
			
 
				 }
			
 
				-.button-box{
			
 
				-  margin-left: 38%;
			
 
				-  
			
 
				+.button-box {
			
 
				+  margin-left: 25px !important;
			
 
				+}
			
 
				 }
			
 
				 </style>
			
--- a/src/views/inward/components/truckAppoint/plan.vue
+++ b/src/views/inward/components/truckAppoint/plan.vue
@@ -168,7 +168,10 @@ export default {
 
				                   type: "success",
			
 
				                   message: "已完成该计划!",
			
 
				                 });
			
 
				-                this.$router.go(0);
			
 
				+                this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
			
 
				+                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0&test=1"
			
 
				+                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&test=1"
			
 
				+                this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&test=1"
			
 
				               } else {
			
 
				                 this.$message({
			
 
				                   message: "操作失败",
			
@@ -200,7 +203,10 @@ export default {
 
				                   type: "success",
			
 
				                   message: "删除成功!",
			
 
				                 });
			
 
				-                this.$router.go(0);
			
 
				+                this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
			
 
				+                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0&test=1"
			
 
				+                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&test=1"
			
 
				+                this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4&test=1"
			
 
				               } else {
			
 
				                 this.$message({
			
 
				                   message: "删除失败",
			
--- a/src/views/inward/components/truckAppoint/requirement.vue
+++ b/src/views/inward/components/truckAppoint/requirement.vue
@@ -15,14 +15,14 @@
 
				       >
			
 
				         <i class="el-icon-plus"></i>新增采购内转需求
			
 
				       </el-button>
			
 
				-      <el-button
			
 
				+      <!-- <el-button
			
 
				         type="primary"
			
 
				         class="btn"
			
 
				         @click="toInsert2"
			
 
				         v-if="activeName == 'first'"
			
 
				       >
			
 
				         <i class="el-icon-plus"></i>新增厂内内转需求
			
 
				-      </el-button>
			
 
				+      </el-button> -->
			
 
				       <el-button
			
 
				         type="primary"
			
 
				         class="btn"
			
--- a/src/views/inward/components/truckAppoint/updatePlan.vue
+++ b/src/views/inward/components/truckAppoint/updatePlan.vue
@@ -2,22 +2,38 @@
 
				 <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" style="margin-left: 5rem">
			
 
				-        <dil-form :formId="307" v-model="form"></dil-form>       
			
 
				-      </div>
			
 
				-    </div>
			
 
				+
			
 
				+    <div class="form-box">
			
 
				+<el-form  class="demo-form-inline"  label-width="80px" label-position="left">
			
 
				+  <el-form-item label="承运商">
			
 
				+    <el-autocomplete
			
 
				+      class="inline-input"
			
 
				+      v-model="state2"
			
 
				+      :fetch-suggestions="querySearch"
			
 
				+      placeholder="请输入承运商名称"
			
 
				+      :trigger-on-focus="false"
			
 
				+      @select="handleSelect"
			
 
				+      @input="oninput"
			
 
				+    >
			
 
				+  <template slot-scope="{ item }">
			
 
				+    <div class="name">{{ item.value }}</div>
			
 
				+  </template>
			
 
				+    </el-autocomplete>
			
 
				+  </el-form-item>
			
 
				+  <el-form  class="demo-form-inline"  label-width="80px" label-position="left">
			
 
				+  <el-form-item label="车数">
			
 
				+    <el-input   v-model="planTruckNumber" placeholder="必填" class="input"></el-input>
			
 
				+  </el-form-item>
			
 
				+  </el-form>
			
 
				+</el-form>
			
 
				+</div>
			
 
				     <template>
			
 
				 			<div>		
			
 
				 						<dilTable v-bind.sync="first" >
			
 
				 						</dilTable>
			
 
				             </div>
			
 
				 		</template>
			
 
				-    <div class="" style="margin-left:40rem">
			
 
				+    <div class="button-box">
			
 
				       <el-button type="primary" @click="makeSure">确认修改</el-button>
			
 
				       <el-button type="primary" @click="cancel">返回</el-button>
			
 
				     </div>
			
@@ -32,8 +48,15 @@ export default {
 
				   data() {
			
 
				     return {
			
 
				       form: {},
			
 
				+      restaurants: [],
			
 
				+      state2:null,
			
 
				+      planTruckNumber:null,
			
 
				+      carrierId:null,
			
 
				+      numberValidateForm: {
			
 
				+          planTruckNumber: null,
			
 
				+        },
			
 
				       first:{
			
 
				-        requestUrl:"/api/v1/ams/getTruckRequirementList?apiId=250&requirementStatus=2",
			
 
				+        requestUrl:"/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0&planId=" + this.$route.params.planId,
			
 
				       }
			
 
				     };
			
 
				   },
			
@@ -41,30 +64,50 @@ export default {
 
				       this.information();
			
 
				   },
			
 
				   methods: {
			
 
				-    information(){
			
 
				-         this.axios
			
 
				-        .post("api/v1/ams/selectInwardPlanToUpdate/" + this.$route.params.planId)
			
 
				-        .then((res) => {
			
 
				-          res.data.data.forEach((e) => {
			
 
				-            this.form= e;
			
 
				-            console.log(e);
			
 
				-            console.log(this.form1);
			
 
				-            console.log(this.$route.params.resultId);
			
 
				-          });
			
 
				-        });
			
 
				+    handleSelect(item){
			
 
				+      this.carrierId = item.carrierId
			
 
				+      item.carrierName = this.state2
			
 
				+    },
			
 
				+    oninput(){
			
 
				+      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
			
 
				+        if(res.data.code == "200"){
			
 
				+          console.log(res)
			
 
				+          this.restaurants = res.data.data
			
 
				+        }
			
 
				+      })
			
 
				     },
			
 
				+    //搜索
			
 
				+    querySearch(queryString, cb) {
			
 
				+        var restaurants = this.restaurants;
			
 
				+        console.log(this.restaurants,"this.restaurants");
			
 
				+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
			
 
				+        // 调用 callback 返回建议列表的数据
			
 
				+        console.log(results,"results");
			
 
				+        cb(results);
			
 
				+      },
			
 
				+      createFilter(queryString) {
			
 
				+        return (restaurants) => {
			
 
				+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
			
 
				+        };
			
 
				+      },
			
 
				     // 修改
			
 
				     makeSure() {
			
 
				-      console.log(this.form)
			
 
				+      if(this.carrierId == null){
			
 
				+        this.$alert('请输入承运商！')
			
 
				+        return
			
 
				+      }else if(this.planTruckNumber == null){
			
 
				+        this.$alert('请输入车数！')
			
 
				+        return
			
 
				+      }
			
 
				       let plan = {
			
 
				-        requirementId : this.mapList.requirementId,
			
 
				-        planTruckNumber: this.form.planTruckNumber,
			
 
				-        carrierId: this.form.carrierId
			
 
				+        planId : this.$route.params.planId,
			
 
				+        planTruckNumber: this.planTruckNumber,
			
 
				+        carrierId: this.carrierId
			
 
				       };
			
 
				           
			
 
				       this.axios
			
 
				         .post(
			
 
				-          "/api/v1/ams/addTruckPlan",
			
 
				+          "/api/v1/ams/updateTruckPlan",
			
 
				           plan
			
 
				         )
			
 
				         .then((res) => {
			
@@ -72,11 +115,11 @@ export default {
 
				           if (res.data.code == 200) {
			
 
				             this.$message({
			
 
				               type: "success",
			
 
				-              message: "新增成功!",
			
 
				+              message: "修改成功!",
			
 
				             });            
			
 
				             this.$router.go(-1);
			
 
				           } else {
			
 
				-            this.$message.error("新增失败！");
			
 
				+            this.$message.error("修改失败！");
			
 
				           }
			
 
				         });
			
 
				     },
			
@@ -89,4 +132,22 @@ export default {
 
				 </script>
			
 
				 
			
 
				 <style lang="scss">
			
 
				+.form-box{
			
 
				+  display: inline-block;
			
 
				+  margin-left: 38%;
			
 
				+  .el-input{
			
 
				+    width:288px
			
 
				+  }
			
 
				+  .input{
			
 
				+    margin-left: -10px;
			
 
				+  }
			
 
				+  .el-form{
			
 
				+    padding: 10px;
			
 
				+    
			
 
				+  }
			
 
				+}
			
 
				+.button-box
			
 
				+{
			
 
				+  margin-left: 45%;
			
 
				+}
			
 
				 </style>
			
--- a/src/views/inward/components/truckAppoint/updateRequirement.vue
+++ b/src/views/inward/components/truckAppoint/updateRequirement.vue
@@ -1,10 +1,9 @@
 
				 //修改需求
			
 
				 <template>
			
 
				-  <div id="endMaintenance">
			
 
				+  <div class="updateInwardRequirement">
			
 
				     <page-title>修改需求</page-title>
			
 
				-    <div>
			
 
				-<div class="form-box f2">
			
 
				-<el-form :inline="true"  class="demo-form-inline">
			
 
				+    <div class="form-box f2">
			
 
				+        <el-form :inline="true"  class="demo-form-inline" label-width="80px">
			
 
				   <el-form-item label="采购订单号">
			
 
				     <el-input v-model="purchaseOrder" disabled>  
			
 
				     </el-input>
			
@@ -13,38 +12,49 @@
 
				     <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>
			
 
				-</div>
			
 
				-<div class="form-box f4">
			
 
				-<el-form :inline="true"  class="demo-form-inline">
			
 
				+<el-form :inline="true" class="demo-form-inline" :label-position="left" label-width="80px">
			
 
				+  <el-form-item label="发货单位">
			
 
				+    <el-input v-model="supplierName" disabled> </el-input>
			
 
				+  </el-form-item>
			
 
				+</el-form>
			
 
				+<el-form :inline="true" class="demo-form-inline" :label-position="left" label-width="80px">
			
 
				+  <el-form-item label="收货单位">
			
 
				+   <el-input v-model="shipperName" disabled> </el-input>
			
 
				+  </el-form-item>        
			
 
				+</el-form>
			
 
				+<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>
			
 
				-</div>
			
 
				-<div class="form-box f5">
			
 
				-<el-form :inline="true"  class="demo-form-inline">
			
 
				-  <el-form-item label="用车地点">
			
 
				-    <el-input v-model="truckPoint" disabled>  
			
 
				-    </el-input>
			
 
				+<el-form :inline="true" class="demo-form-inline" :label-position="left" label-width="80px">
			
 
				+  <el-form-item label="装车点"> 
			
 
				+    <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-button type="primary" @click="ondrawer(2)">浏览</el-button>
			
 
				   </el-form-item>
			
 
				-</el-form>
			
 
				-</div>
			
 
				-      <div class="form-box">
			
 
				-        <dil-form :formId="300" v-model="form"></dil-form>
			
 
				-      </div>
			
 
				-<el-drawer
			
 
				+  </el-form>
			
 
				+  <el-form :inline="true" class="demo-form-inline" :label-position="left" label-width="80px">
			
 
				+  <el-form-item label="卸车点">
			
 
				+    <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"
			
 
				       :before-close="handleClose"
			
@@ -57,16 +67,16 @@
 
				      <div v-show="a==1"><dilTable v-bind.sync="second" @radio-change="currentRadioChange1" ></dilTable></div>
			
 
				       <div v-show="a==2"><dilTable v-bind.sync="second1" @radio-change="currentRadioChange2" ></dilTable></div>
			
 
				     </el-drawer>
			
 
				-    </div>
			
 
				-    <div class="button-box">
			
 
				-      <el-button type="primary" @click="makeSure">确认修改</el-button>
			
 
				-      <el-button type="primary" @click="cancel">返回</el-button>
			
 
				-    </div>
			
 
				+      <div class="button-box">
			
 
				+        <el-button type="primary" @click="makeSure">确认修改</el-button>
			
 
				+        <el-button type="primary" @click="cancel">返回</el-button>
			
 
				+      </div>
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				+import { sjTime } from "@/utils/sharedJsFile";
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
@@ -76,10 +86,13 @@ export default {
 
				       purchaseOrder:'',
			
 
				       foreignShipName:'',
			
 
				       materialName:'',
			
 
				+      shipperName:null,
			
 
				+      supplierName:null,
			
 
				       a:1,
			
 
				-       direction: "rtl",
			
 
				+      direction: "rtl",
			
 
				       input:'',
			
 
				-      truckPoint:'',
			
 
				+      truckPoint:null,
			
 
				+      truckPoint1:null,
			
 
				       drawer:false,
			
 
				       form: {},
			
 
				       second:{
			
@@ -111,6 +124,9 @@ export default {
 
				           this.materialName = list[0].materialName,
			
 
				           this.purchaseOrderId = list[0].purchaseOrderId,
			
 
				           this.requiremntUnitId = list[0].requiremntUnitId,
			
 
				+          this.truckPoint1 = list[0].unWarehouseName,
			
 
				+          this.shipperName = list[0].receiveUnitName,
			
 
				+          this.supplierName = list[0].sendUnitName,
			
 
				           console.log('--------')
			
 
				           console.log(this.foreignShipName,this.materialName,this.purchaseOrderId,this.requiremntUnitId)
			
 
				           res.data.data.forEach((e) => {
			
@@ -196,18 +212,37 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss">
			
 
				-.el-form-item{
			
 
				-  display: flex;
			
 
				+<style lang="scss" scoped>
			
 
				+.updateInwardRequirement{
			
 
				+.form-box {
			
 
				+  display: inline-block !important;
			
 
				+  margin-left: 38%;
			
 
				+  .el-input {
			
 
				+    width: 288px;
			
 
				+  }
			
 
				+  .el-form {
			
 
				+    padding: 10px;
			
 
				+  }
			
 
				+  .tx{
			
 
				+    margin-left: -75px;
			
 
				+  }
			
 
				+}
			
 
				+.box-form {
			
 
				+  display: inline-block !important;
			
 
				+  padding-left: 38%;
			
 
				+  .el-form-item {
			
 
				+    display: flex;
			
 
				+    padding: 10px;
			
 
				+    .el-form-item__label {
			
 
				+      width: 80px !important;
			
 
				+    }
			
 
				+    .el-input {
			
 
				+      width: 288px;
			
 
				+    }
			
 
				+  }
			
 
				+}
			
 
				+.button-box {
			
 
				+  margin-left: 25px !important;
			
 
				 }
			
 
				-.form-box,
			
 
				-.button-box
			
 
				-{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				 }
			
 
				 </style>
			
--- a/src/views/inward/components/truckOrder/decomposePlan.vue
+++ b/src/views/inward/components/truckOrder/decomposePlan.vue
@@ -1,13 +1,21 @@
 
				 // 分解计划
			
 
				 <template>
			
 
				-	<div id="endMaintenance">
			
 
				+	<div class="desomposePlan">
			
 
				 		<page-title>分解计划</page-title>
			
 
				-    <dilTable v-bind.sync="first" >
			
 
				+        <dilTable v-bind.sync="first" >
			
 
				 		</dilTable>
			
 
				-    <div class="lineId from">
			
 
				-      <span class="text">选择路线：</span>
			
 
				-      <el-input class="input" v-model="lineName" disabled> </el-input>
			
 
				-      <el-button type="primary" @click="drawerLine()">浏览</el-button>
			
 
				+    <div class="form-box">
			
 
				+        <el-form :inline="true" class="demo-form-inline" :label-position="left"  label-width="80px">
			
 
				+          <el-form-item label="选择路线">
			
 
				+            <el-input v-model="lineName" placeholder="必填" disabled > </el-input>
			
 
				+          </el-form-item>
			
 
				+          <el-form-item>
			
 
				+            <el-button type="primary" @click="drawerLine()">浏览</el-button>
			
 
				+          </el-form-item>
			
 
				+        </el-form>
			
 
				+    </div>
			
 
				+     <div class="box-form">
			
 
				+        <dil-form :formId="318" v-model="form"></dil-form>
			
 
				     </div>
			
 
				      <el-drawer
			
 
				       :visible.sync="linedrawer"
			
@@ -21,9 +29,6 @@
 
				       </el-button>
			
 
				    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1" ></dilTable>    
			
 
				     </el-drawer>
			
 
				-     <div class="form-box">
			
 
				-        <dil-form :formId="318" v-model="form"></dil-form>
			
 
				-    </div>
			
 
				     <el-drawer
			
 
				       :visible.sync="drawer"
			
 
				       :direction="direction"
			
@@ -103,6 +108,7 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				 export default {
			
 
				   components: {
			
@@ -110,6 +116,7 @@ export default {
 
				   },
			
 
				   data() {
			
 
				     return {
			
 
				+      userCarrierId:null,
			
 
				       lineName:null,
			
 
				       linedrawer:false,
			
 
				       tableData:[],
			
@@ -126,10 +133,10 @@ export default {
 
				       carrierId:null,
			
 
				       form: {},
			
 
				       first:{
			
 
				-       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=40&planId="+this.$route.params.planId,
			
 
				+       requestUrl: "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&planId="+this.$route.params.planId,
			
 
				       },
			
 
				       second:{
			
 
				-        requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246",
			
 
				+        requestUrl:"/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
			
 
				         selectionType: "radio",
			
 
				         mapList1:[]
			
 
				       },
			
@@ -140,21 +147,29 @@ export default {
 
				       }
			
 
				     };
			
 
				   },
			
 
				-  mounted() {
			
 
				-    this.information();
			
 
				+  created(){
			
 
				+    this.userCarrierId = getCookie("userId")
			
 
				+    this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
			
 
				+  },
			
 
				+  mounted(){
			
 
				+      this.information()
			
 
				   },
			
 
				-
			
 
				   methods: {
			
 
				     drawerCapacity(row){ 
			
 
				       this.drawer = true;
			
 
				       this.selectRow = row
			
 
				       console.log(row.purchaseOrderNo)
			
 
				+      console.log(this.second.requestUrl)
			
 
				     },
			
 
				     drawerLine(){
			
 
				       this.linedrawer = true
			
 
				     },
			
 
				     onclick(){
			
 
				-        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input
			
 
				+      if(this.input != ''){
			
 
				+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
			
 
				+      }else{
			
 
				+        this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
			
 
				+      }     
			
 
				     },
			
 
				     currentRadioChange(selection){
			
 
				       this.mapList1=selection,
			
@@ -179,7 +194,7 @@ export default {
 
				       //查看需求详情
			
 
				       this.axios
			
 
				         .post(
			
 
				-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=40&planId=" + this.$route.params.planId
			
 
				+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&planId=" + this.$route.params.planId
			
 
				         )
			
 
				         .then((res) => {
			
 
				             console.log(res)
			
@@ -258,30 +273,35 @@ export default {
 
				 };
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss">
			
 
				-.el-form-item{
			
 
				-  display: flex;
			
 
				-}
			
 
				-.form-box,
			
 
				-.button-box{
			
 
				-  display: flex;
			
 
				-  text-align: center;
			
 
				-  align-items: center;
			
 
				-  justify-content: center;
			
 
				-  margin-top: 0.3125rem;
			
 
				-  margin-bottom: 1.25rem;
			
 
				+<style lang="scss" scoped>
			
 
				+.desomposePlan{
			
 
				+  .form-box{
			
 
				+  display: inline-block !important;
			
 
				+  margin-left: 38%;
			
 
				+  .el-input{
			
 
				+    width:288px
			
 
				+  }
			
 
				+  .el-form{
			
 
				+    padding: 10px;
			
 
				+  }
			
 
				 }
			
 
				-.lineId {
			
 
				+.box-form{
			
 
				+  display: inline-block !important;
			
 
				+  padding-left: 38%;
			
 
				+  .el-form-item{
			
 
				   display: flex;
			
 
				-  justify-content: center;
			
 
				-  .text {
			
 
				-    display: inline-block;
			
 
				-    width: 170px;
			
 
				-    text-align: right;
			
 
				+  padding: 10px;
			
 
				+  .el-form-item__label{
			
 
				+    width: 80px !important;
			
 
				+  }
			
 
				+  .el-input{
			
 
				+    width:288px
			
 
				   }
			
 
				-  .input{
			
 
				-    width: 250px;
			
 
				-    margin-right: 20px;
			
 
				   }
			
 
				 }
			
 
				+.button-box{
			
 
				+ margin-left: 25px !important;
			
 
				+}
			
 
				+}
			
 
				+
			
 
				 </style>
			
--- a/src/views/inward/components/truckOrder/dispatchPlan.vue
+++ b/src/views/inward/components/truckOrder/dispatchPlan.vue
@@ -32,25 +32,32 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   data() {
			
 
				     return {
			
 
				       inputText: "",
			
 
				+      userCarrierId:'',
			
 
				       first: {
			
 
				         // first请求数据的地址
			
 
				         requestUrl:
			
 
				-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=40",
			
 
				+        "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=" + '',
			
 
				         selectionType: "select",
			
 
				         mapList: [],
			
 
				       },
			
 
				       second: {
			
 
				         // second请求数据的地址
			
 
				         requestUrl:
			
 
				-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=40",
			
 
				+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + '',
			
 
				       },
			
 
				       activeName: "first",
			
 
				     };
			
 
				   },
			
 
				+  created(){
			
 
				+      this.userCarrierId = getCookie('userId'),
			
 
				+      this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=" + this.userCarrierId
			
 
				+      this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + this.userCarrierId
			
 
				+  },
			
 
				   methods: {
			
 
				     selectionChange(selection) { 
			
 
				       this.first.mapList = selection
			
@@ -75,8 +82,8 @@ export default {
 
				                   type: "success",
			
 
				                   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=4&carrierId=40&test=1"
			
 
				+                this.first.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=3&carrierId=" + this.userCarrierId + "&test=1"
			
 
				+                this.second.requestUrl = "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=" + this.userCarrierId + "&test=1"
			
 
				                 this.activeName = 'second'
			
 
				                 this.first.mapList = []
			
 
				               } else {
			
--- a/src/views/inward/components/truckOrder/plan.vue
+++ b/src/views/inward/components/truckOrder/plan.vue
@@ -54,32 +54,38 @@
 
				   </div>
			
 
				 </template>
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   data() {
			
 
				     return {
			
 
				       inputText: "",
			
 
				+      carrierId:null,
			
 
				       first: {
			
 
				         // first请求数据的地址
			
 
				         requestUrl:
			
 
				-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=40",
			
 
				+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + ''
			
 
				       },
			
 
				       second: {
			
 
				         // second请求数据的地址
			
 
				         requestUrl:
			
 
				-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=40",
			
 
				+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + ''
			
 
				       },
			
 
				       third: {
			
 
				         // second请求数据的地址
			
 
				         requestUrl:
			
 
				-          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=40",
			
 
				+          "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + '' 
			
 
				       },
			
 
				       activeName: "first",
			
 
				     };
			
 
				   },
			
 
				+  created(){
			
 
				+      this.carrierId = getCookie('userId')
			
 
				+      this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + this.carrierId
			
 
				+      this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + this.carrierId
			
 
				+      this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + this.carrierId
			
 
				+      console.log(this.carrierId)
			
 
				+  },
			
 
				   methods: {
			
 
				-    // allReceive(){
			
 
				-
			
 
				-    // },
			
 
				     receiver(scope) {
			
 
				       this.$confirm("是否接收", "提示", {
			
 
				         confirmButtonText: "确定",
			
@@ -96,7 +102,9 @@ export default {
 
				                   type: "success",
			
 
				                   message: "接收成功!",
			
 
				                 });
			
 
				-                this.$router.go(0);
			
 
				+                this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + this.carrierId + "&test=1"
			
 
				+                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + this.carrierId + "&test=1"
			
 
				+                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + this.carrierId + "&test=1"
			
 
				               } else {
			
 
				                 this.$message({
			
 
				                   message: "接收失败",
			
@@ -136,7 +144,9 @@ export default {
 
				                   type: "success",
			
 
				                   message: "删除成功!",
			
 
				                 });
			
 
				-                this.$router.go(0);
			
 
				+                 this.first.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1&carrierId=" + this.carrierId + "&test=1"
			
 
				+                this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=" + this.carrierId + "&test=1"
			
 
				+                this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=3&carrierId=" + this.carrierId + "&test=1"
			
 
				               } 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="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>
			
 
				         </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: 150,
			
 
				+        },
			
 
				+        // {
			
 
				+        //   prop: "materialWeight",
			
 
				+        //   label: "物资重量",
			
 
				+        //   width: 100,
			
 
				+        // },
			
 
				+      ],
			
 
				+      tableData: [],
			
 
				+      tableData1: [],
			
 
				     };
			
 
				   },
			
 
				   methods: {
			
@@ -139,6 +229,7 @@ export default {
 
				     //监听模态框点击事件
			
 
				     currentRadioChange1(row) {
			
 
				       this.carrierId = row.carrierId;
			
 
				+      console.log("this.carrierId",this.carrierId)
			
 
				     },
			
 
				     //模糊查询承运商
			
 
				     onclick(){
			
@@ -183,49 +274,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
@@ -14,27 +14,73 @@
 
				     <div class="table">
			
 
				       <el-tabs v-model="activeName" @tab-click="handleClick">
			
 
				       <!-- 未抢单 -->
			
 
				-      	<el-tab-pane label="未接收" name="first">
			
 
				-						  <dilTable v-bind.sync="first">
			
 
				-             <el-table-column fixed="right" label="操作" width="50">
			
 
				+      	<el-tab-pane label="未接收" name="first" >
			
 
				+						  <dilTable v-bind.sync="first" ref="table">
			
 
				+             <el-table-column fixed="right" label="操作" width="120">
			
 
				         <template slot-scope="scope">
			
 
				           <el-button @click="Grab(scope)" type="text" size="small">
			
 
				             接收
			
 
				           </el-button>
			
 
				+          <el-button @click="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">
			
 
				-          <el-table-column fixed="right" label="操作" width="50">
			
 
				+				<dilTable v-bind.sync="second" ref="table1">
			
 
				+          <el-table-column fixed="right" label="操作" width="120">
			
 
				             <template slot-scope="scope">
			
 
				           <el-button @click="dispatch(scope)  " type="text" size="small">
			
 
				-            <!-- ,handleBtnClick1() -->
			
 
				             派单
			
 
				+          </el-button>
			
 
				+          <el-button @click="detailclick1(scope.row)" type="text" size="small">
			
 
				+            物资详情
			
 
				           </el-button>
			
 
				             </template>
			
 
				       </el-table-column>
			
 
				+
			
 
				+      <!-- 物资详情抽屉 -->
			
 
				+        <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-drawer title="司机排班信息表" :visible.sync="drawer" :direction="direction" :before-close="handleClose"
			
 
				 				:modal="false" size="30%" style="margin-top: 5.625rem;">
			
@@ -55,10 +101,12 @@
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   data(){
			
 
				     return{
			
 
				       drawer: false,
			
 
				+      ssoId:null,
			
 
				 			direction: 'rtl',
			
 
				       activeName: "first",
			
 
				       inputText:"",
			
@@ -66,29 +114,85 @@ export default {
 
				       input:"",
			
 
				       first:{
			
 
				         // first请求数据的地址
			
 
				-        requestUrl: "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0",
			
 
				+        requestUrl: "",
			
 
				       },
			
 
				       second:{
			
 
				-        requestUrl:"/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierId=73",
			
 
				+        requestUrl:"",
			
 
				       },
			
 
				       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: [],
			
 
				+      tableData1: [],
			
 
				     }
			
 
				   },
			
 
				+  created(){
			
 
				+      this.firstGetRequestUrl();
			
 
				+      this.secondGetRequestUrl();
			
 
				+  },
			
 
				   methods:{
			
 
				       handleClick(tab, event) {
			
 
				       console.log(tab, event);
			
 
				+    },
			
 
				+    firstGetRequestUrl(){
			
 
				+    if(getCookie("orgCode") == "chengyunshang"){
			
 
				+      console.log("enter",getCookie('userId'))
			
 
				+      this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId="+ getCookie('userId');
			
 
				+    }else{
			
 
				+      console.log("out",this.ssoId)
			
 
				+     this.first.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&dispatchType=0&carrierSsoId=" + this.ssoId;
			
 
				+    }
			
 
				+
			
 
				+    },
			
 
				+    secondGetRequestUrl(){
			
 
				+    if(getCookie("orgCode") == "chengyunshang"){
			
 
				+      console.log("enter",getCookie('userId'))
			
 
				+      this.second.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId="+ getCookie('userId');
			
 
				+    }else{
			
 
				+            console.log("out",this.ssoId)
			
 
				+     this.second.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierSsoId=" + this.ssoId;
			
 
				+    }
			
 
				+
			
 
				     },
			
 
				     onclick1(){
			
 
				-       if(this.activeName == "first"){
			
 
				-        this.option1.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&con=" + this.input;
			
 
				-      }else if
			
 
				+       if(this.activeName == "first"){
			
 
				+         this.option1.requestUrl = "/api/v1/ams/getPCDispatchSaleOrderList?apiId=242&con=" + this.input;
			
 
				+      }else if
			
 
				         (this.activeName == "second"){
			
 
				-        this.option2.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierId=1&con=" + this.input;
			
 
				-      }
			
 
				+        this.option2.requestUrl = "/api/v1/ams/selectDispatchSaleOrderList?apiId=233&carrierId=1&con=" + this.input;
			
 
				+    }
			
 
				     },
			
 
				     dispatch(scope){
			
 
				       this.dispatchId = scope.row.dispatchId
			
@@ -148,8 +252,14 @@ export default {
 
				         center: true,
			
 
				       })
			
 
				         .then(() => {
			
 
				+          var carrierSsoId = '';
			
 
				+          if(getCookie("orgCode") == "chengyunshang"){
			
 
				+            carrierSsoId =  getCookie('userId');
			
 
				+          }else{
			
 
				+            carrierSsoId = null;
			
 
				+          }
			
 
				           this.axios
			
 
				-            .post("/api/v1/ams/lockDispatchSaleOrder?dispatchId="+ scope.row.dispatchId+"&carrierId=" + 73)
			
 
				+            .post("/api/v1/ams/lockDispatchSaleOrder?dispatchId="+ scope.row.dispatchId+"&carrierSsoId=" + carrierSsoId)
			
 
				             .then((res) => {
			
 
				               if (res.data.code == 200) {
			
 
				                 this.$message({
			
@@ -172,6 +282,72 @@ 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;
			
 
				+        });
			
 
				+    },
			
 
				+
			
 
				+    // -------查看物资详情(已接收)
			
 
				+    detailclick1(row) {
			
 
				+      // 记录重复点击次数
			
 
				+      if (this.oldRow1 === row) {
			
 
				+        this.oldRowCount1 += 1;
			
 
				+      }
			
 
				+      // 切换当前详情表
			
 
				+      this.$refs.table1.toggleRowExpansion(row);
			
 
				+      // 打开前关闭上一个详情表
			
 
				+      if (this.oldRow1 != "") {
			
 
				+        if (this.oldRow1 != row) {
			
 
				+          if (this.oldRowCount1 % 2 === 1) {
			
 
				+            this.$refs.table1.toggleRowExpansion(this.oldRow);
			
 
				+          } else {
			
 
				+            this.oldRowCount1 = 1;
			
 
				+          }
			
 
				+        } else {
			
 
				+          this.oldRow1 = null;
			
 
				+          return;
			
 
				+        }
			
 
				+      }
			
 
				+      // 重置上一个点击对象
			
 
				+      this.oldRow1 = row;
			
 
				+      // 根据销售订单物资中间表id查询物资信息
			
 
				+      this.axios
			
 
				+        .post("/api/v1/ams/getDispatchMaterialList?dispatchId="+row.dispatchId)
			
 
				+        .then((res) => {
			
 
				+          this.tableData1 = res.data.data;
			
 
				+        });
			
 
				+    },
			
 
				+
			
 
				   }
			
 
				 }
			
 
				 </script>
			
--- a/src/views/sale/components/transport_appointment/openDistributionSection.vue
+++ b/src/views/sale/components/transport_appointment/openDistributionSection.vue
@@ -64,6 +64,7 @@
 
				 <script>
			
 
				 import PageTitle from "@/components/Page/Title";
			
 
				 import { sjTime,isNumber,isIntegerNumber } from '@/utils/sharedJsFile'
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 export default {
			
 
				   components: { PageTitle },
			
 
				   data() {
			
@@ -79,7 +80,7 @@ export default {
 
				       direction: "rtl",
			
 
				       input: "",
			
 
				       third: {
			
 
				-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
			
 
				+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId="+ getCookie('userId'),
			
 
				         selectionType: "radio",
			
 
				         mapList3: [],
			
 
				       },
			
--- 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/sale/components/transport_order/receiveOrder.vue
+++ b/src/views/sale/components/transport_order/receiveOrder.vue
@@ -10,17 +10,98 @@
 
				 		</div>
			
 
				 		<template>
			
 
				 			<div>
			
 
				-				<el-tabs v-model="activeName" @tab-click="handleClick">
			
 
				+				<el-tabs v-model="activeName">
			
 
				+					<!-- 已接收 -->
			
 
				 					<el-tab-pane label="已接收" name="first">
			
 
				-						<dilTable v-bind.sync="first" >
			
 
				+						<dilTable v-bind.sync="first" ref="table">
			
 
				+							<el-table-column fixed="right" label="操作" width="50">
			
 
				+								<template slot-scope="scope">
			
 
				+								<el-button @click="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="50">
			
 
				+								<template slot-scope="scope">
			
 
				+								<el-button @click="detailclick1(scope.row)" type="text" size="small">
			
 
				+									物资详情
			
 
				+								</el-button>
			
 
				+								</template>
			
 
				+							</el-table-column>
			
 
				+							 <!-- 物资详情抽屉 -->
			
 
				+							<el-table-column type="expand" width="1">
			
 
				+							<template slot-scope="props">
			
 
				+								<el-form label-position="center" inline class="demo-table-expand">
			
 
				+								<div v-if="false">{{ props }}</div>
			
 
				+								<div>
			
 
				+									<el-table :data="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>
			
 
				+					<!-- 未接收 -->
			
 
				 					<el-tab-pane label="未接收" name="third">
			
 
				-						<dilTable v-bind.sync="third">
			
 
				+						<dilTable v-bind.sync="third" ref="table2">
			
 
				+							<el-table-column fixed="right" label="操作" width="50">
			
 
				+								<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-tabs>
			
@@ -30,37 +111,168 @@
 
				 
			
 
				 </template>
			
 
				 <script>
			
 
				+import { getCookie } from "@/utils/util.js";
			
 
				 	export default {
			
 
				 		data() {
			
 
				 			return {
			
 
				 				inputText: "",
			
 
				 				first: {
			
 
				 					// first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
			
 
				-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierId=73",
			
 
				+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId'),
			
 
				 				},
			
 
				 				second: {
			
 
				 					// second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
			
 
				-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierId=73",
			
 
				+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierSsoId="+ getCookie('userId'),
			
 
				 				},
			
 
				 				third: {
			
 
				 					// second请求数据的地址
			
 
				-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=73",
			
 
				+					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId'),
			
 
				 				},
			
 
				 				activeName: "first",
			
 
				+				//记录旧的row对象(已接收)
			
 
				+				oldRow: "",
			
 
				+				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
			
 
				+				oldRowCount: 1,
			
 
				+				//记录旧的row对象(已拒绝)
			
 
				+				oldRow1: "",
			
 
				+				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
			
 
				+				oldRowCount1: 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: [],
			
 
				+				tableData2: [],
			
 
				 			}
			
 
				 		},
			
 
				 		methods: {
			
 
				 		 onClick(){
			
 
				 			  if(this.activeName == "first"){
			
 
				-              this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierId=1&con=" + this.input;
			
 
				+              this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
			
 
				              }else if (this.activeName == "second") {
			
 
				-			          this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierId=1&con=" + this.input;
			
 
				+			          this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
			
 
				 		     } else {
			
 
				-			   this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierId=1&con=" + this.input;
			
 
				+			   this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
			
 
				 		  }
			
 
				         
			
 
				       
			
 
				-		 }
			
 
				+		 },
			
 
				+		// -------查看物资详情(已接收)
			
 
				+		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;
			
 
				+		// 根据销售订单物资中间表id查询物资信息
			
 
				+		this.axios
			
 
				+			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
			
 
				+			.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/oms/getOrderMaterialList?orderId=" +row.orderId)
			
 
				+			.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/oms/getOrderMaterialList?orderId=" +row.orderId)
			
 
				+			.then((res) => {
			
 
				+			this.tableData2 = res.data.data;
			
 
				+			});
			
 
				+		},
			
 
				+
			
 
				 		 }
			
 
				 	}
			
 
				 </script>