上传RMS人员管理

build/utils.js

@@ -15,23 +15,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index', 'sales', '  ', 'standard', 'qualityControl', 'produce', 'workshop',
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
-// let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
-// let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-// let devModules = ['all'];
-// let devModules = ['index','TMS','RMS']
-// let devModules = ['index','SporadicManage','TMS']
-// let devModules = ['index','SporadicManage'];
-// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
-// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
- //let devModules = ['all'];
-// let devModules = ['index','RMS']
-//let devModules = ['index','SporadicManage','TMS']
-// let devModules = ['index','SporadicManage'];
-// let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
-// let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
-// let devModules = ['index','inward','SporadicManage']
-// let devModules = ['all'];
-let devModules = ['index','appoint','sale','systemConfig','RMS']
+// let devModules = ['index','RMS','systemConfig','TMS']
+let devModules = ['all'];
+// let devModules = ['index','inward','appoint','sale']
 
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

config/index.js

@@ -56,14 +56,14 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://192.168.1.114:8080",
+    target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://192.168.1.114:8080",
+    target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

src/config/apolloConfig.js

@@ -73,7 +73,6 @@ const defaultOptions = {
         errorPolicy: 'all'
     }
 }
-
 const fragmentMatcher = new IntrospectionFragmentMatcher({
     introspectionQueryResultData: {
         __schema: {

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

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/enFactory.vue

@@ -27,7 +27,7 @@ export default {
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=13&con=" + this.input;
     },
   },
 };

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=398&orderType=13&con=" + this.input;
     },
   },
 };

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=388&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=388&orderType=13&con=" + this.input;
     },
   },
 };

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=392&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=392&orderType=13&con=" + this.input;
     },
   },
 };

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

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

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>

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

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
 
 
 // 关闭生产模式下给出的提示

src/views/inward/components/truckAppoint/addPlan.vue

@@ -2,7 +2,8 @@
 <template>
   <div id="endMaintenance">
     <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",
@@ -133,38 +138,23 @@ export default {
 </script>
 
 <style lang="scss">
-.el-form{
-  margin-left: 30%;
-}
-.el-form-item{
-  display: flex;
+.form-box{
+  display: inline-block;
+  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;
-}
-.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;
-    }
-  }
+  margin-left: 45%;
 }
+
 </style>

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 ;
+  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: 45%;
+}
 }
 </style>

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: "删除失败",

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"

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>

src/views/inward/components/truckAppoint/updateRequirement.vue

@@ -4,7 +4,7 @@
     <page-title>修改需求</page-title>
     <div>
 <div class="form-box f2">
-<el-form :inline="true"  class="demo-form-inline">
+<el-form :inline="true"  class="demo-form-inline" label-width="80px">
   <el-form-item label="采购订单号">
     <el-input v-model="purchaseOrder" disabled>  
     </el-input>
@@ -13,33 +13,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="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="发货单位">
+    <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>
+  </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>
@@ -67,6 +83,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -76,10 +93,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 +131,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) => {
@@ -200,14 +223,21 @@ export default {
 .el-form-item{
   display: flex;
 }
-.form-box,
+.form-box{
+  display: inline-block;
+  margin-left: 38%;
+  .el-input{
+    width:288px
+  }
+  .el-form{
+    padding: 10px;
+   .el-form-item__label{
+    width: 80px !important;
+  }
+  }
+}
 .button-box
 {
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+  margin-left: 48%;
 }
 </style>

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -4,10 +4,18 @@
 		<page-title>分解计划</page-title>
     <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)
@@ -259,29 +274,32 @@ export default {
 </script>
 
 <style lang="scss">
-.el-form-item{
+.form-box{
   display: flex;
+  margin-left: 38%;
+  .el-input{
+    width:288px
+  }
+  .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;
-}
-.lineId {
+
+.box-form{
+  display: inline-block;
+  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;
   }
-  .input{
-    width: 250px;
-    margin-right: 20px;
+  .el-input{
+    width:288px
   }
+  }
+}
+.button-box{
+ margin-left: 45%;
 }
 </style>

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 {

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: "删除失败",