合并冲突

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-// let devModules = ['all'];
-let devModules = ['index','appoint','sale','TMS'];
+let devModules = ['all'];
+// let devModules = ['index','appoint','sale','TMS'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

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

src/components/main.vue

@@ -74,7 +74,7 @@
     >
       <div id="menuDrag" v-if="menuType === '2'" class="menuDrag"></div>
       <el-menu
-        :default-active="menuData.length > 1 ? '1' : '0-0'"
+        :default-active="defaultActiveIndex"
         :collapse="menuType === '1'"
         class="el-menu-vertical-demo icore-menu icore-menu-level1"
         v-for="(item, index) in menuData"
@@ -270,7 +270,7 @@
             <span
               class="ifCompany el-dropdown-link"
               v-if="companys.length === 1"
-              >{{ companyName }}1</span
+              >{{ companyName }}</span
             >
             <el-dropdown trigger="click" @command="selectComPany" v-else>
               <span class="el-dropdown-link">
@@ -638,7 +638,7 @@
       </div>
     </el-dialog>
   </div>
-</template>
+</template> 
 
 <script>
 import element_css_json_import from "../assets/json/element_css.js";
@@ -650,7 +650,8 @@ import { checkCharLength } from "@/utils/validator.js";
 import store from "@/store/index.js";
 //  字典数据
 import dataDictionary from "@/store/dataDictionary.js";
-import defaultVue from "./default.vue";
+// import defaultVue from "./defaultVue.vue";
+import defaultVue from '@/views/homepage/components/homepage.vue'
 import { proPath } from "@/config/config.js";
 import draggable from "vuedraggable";
 export default {
@@ -864,6 +865,7 @@ export default {
       styleControll: false,
       dutyId: "",
       appId: '',
+      defaultActiveIndex: '' 
     };
   },
   created() {
@@ -984,6 +986,10 @@ export default {
         });
       }
     },
+    selectedMenu: function(menuId){
+      var currentMenu = this.getMenuIndexByMenuId(this.menuData,  null, menuId);
+      currentMenu && window.top.localStorage.setItem("currentMenuIndex", currentMenu.menuIndex);
+    }
   },
   mounted() {
     let that = this;
@@ -1538,7 +1544,10 @@ export default {
           this.init(token);
         }
         // 打开设为主页的菜单
-        that.openMainPage();
+        // that.openMainPage();
+
+        // 自动打开上一次访问页面
+        that.autoOpenLatestPage();
       }
 
       if (routerFlag > 0 || routerFlagP > 0) {
@@ -1744,6 +1753,7 @@ export default {
               menuLabel: "首页",
             },
           ];
+          window.top.localStorage.setItem("currentMenuIndex","");
         }
       }
       that.tabsData = temp;
@@ -1790,6 +1800,9 @@ export default {
         });
       }
       //   console.log('目录', that.selectedMenu, that.tabsData)
+      // 左侧菜单点击切换的时候需要重新加载页面
+      that.menuTabIndex = that.getTabIndex(menuData.menuId);
+      $("#menuTabId iframe").eq(that.menuTabIndex).length && $("#menuTabId iframe").eq(that.menuTabIndex)[0].contentWindow.location.reload(true);
     },
     //  是否合部都不是菜单就不用显示
     allNoMenu(items) {
@@ -2401,6 +2414,41 @@ export default {
       }
       return list;
     },
+    getMenuIndexByMenuId(tree, index, menuId) {
+      if (!!tree && tree.length !== 0) {
+        for (let i = 0; i < tree.length; i++) {
+          let menuIndex = index ? (index + "-" + i.toString()) : i.toString();
+          if (tree[i].menuId == menuId){
+            tree[i]["menuIndex"] = menuIndex;
+            return tree[i];
+          } 
+
+            if (
+              tree[i].hasOwnProperty("children") &&
+              tree[i].children !== null &&
+              tree[i].children.length > 0
+            ) {
+              var result = this.getMenuIndexByMenuId(tree[i].children, menuIndex, menuId);
+              if(result){
+                return result;
+              }
+            }
+        }
+      }
+    },
+    autoOpenLatestPage() {
+      var that = this;
+      var currentMenuIndex = window.top.localStorage.getItem("currentMenuIndex");
+      let menuList = window.top.document.getElementsByClassName("el-menu-item");
+      for (let i = 0; i < menuList.length; i++) {
+        if(menuList[i].__vue__.index === currentMenuIndex){
+            setTimeout(function(){
+                that.defaultActiveIndex = currentMenuIndex;
+                menuList[i].click();
+            }, 20);
+        }
+      }
+    },
     // 打开设为主页菜单页面
     openMainPage() {
       this.mainPageList = this.getMainPage(this.menuData);

src/js/QueueStartList.js

@@ -0,0 +1,14 @@
+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;
+}

src/js/sharedJsFile.js

@@ -0,0 +1,47 @@
+ //把时间戳改为正常可读的时间
+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;
+    }
+  }

src/views/RMS/app.js

@@ -15,6 +15,7 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 
@@ -28,6 +29,54 @@ const apolloProvider = new VueApollo({
     defaultClient: apollo
 })
 
+ //把时间戳改为正常可读的时间
+ export function renderTime(date) {
+  if(date !== null){
+      let dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
+  }
+  return null;
+}
+//把毫秒数转换分
+export function getDuration(my_time) { 
+  if(my_time !== null){
+      return Math.floor(my_time / 1000 / 60);
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, "/");
+  return new Date(timestamp1).getTime();
+}
+//验证电话号码
+export function VerifyPhoneNumber(Phone) {
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  if (!myreg.test(Phone)) {
+      return false;
+  } else {
+      return true;
+  }
+}
+export function isNumber(value) {
+  //验证是否为数字
+  var patrn = /^(-)?\d+(\.\d+)?$/;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function isIntegerNumber(value) {
+  //验证是否为整数
+  var patrn = /^\+?[1-9][0-9]*$/g;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+
 /* eslint-disable no-new */
 new Vue({
   el: '#app',

src/views/RMS/components/addCapacity.vue

@@ -72,6 +72,32 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addCarDriver.vue

@@ -6,7 +6,19 @@
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="311" v-model="form1" ref="from1"></dil-form>
     </div>
-   <!-- <el-upload
+    <div class="inputBox">
+    <span class="text">所属承运商</span>
+      <el-autocomplete
+        v-model="state"
+        @input="onInput"
+        :fetch-suggestions="querySearch"
+        placeholder="请输入内容"
+        :trigger-on-focus="false"
+        @select="handleSelect"
+      ></el-autocomplete>
+      </div>
+    <div class="photoBox">
+   <el-upload
       class="upload-demo"
       action="https://jsonplaceholder.typicode.com/posts/"
       :on-preview="handlePreview"
@@ -17,16 +29,20 @@
       :on-exceed="handleExceed"
       :file-list="fileList"
     >
+      <div>驾驶证
       <el-button size="small" type="primary">点击上传</el-button>
       <div slot="tip" class="el-upload__tip">
-        只能上传jpg/png文件，且不超过500kb
       </div>
-    </el-upload> -->
+      </div>
+    </el-upload> 
+    </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
   </div>
+  
+    
 </template>
 
 <script>
@@ -36,13 +52,52 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      restaurants: [],
       form1: {},
       value: undefined,
       fileList: [],
+      carrierIds:"",
+      state: "",
+      sex: "男",
     };
   },
-  mounted() {},
+  mounted() {
+     this.form1.driverSex = this.sex;	
+},
   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
+            })
+          });
+        }
+        
+      });
+    },
+    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)
+    },
+   
+
     handleRemove(file, fileList) {
       console.log(file, fileList);
     },
@@ -61,6 +116,7 @@ export default {
     },
     makeSure() {
       console.log(this.form1);
+      let reg = new RegExp(/^[0-9]*$/);
       let RmsCarDriver = {
         driverName: this.form1.driverName,
         driverSex: this.form1.driverSex,
@@ -68,20 +124,30 @@ export default {
         driverIdentityCard: this.form1.driverIdentityCard,
         driverPhone: this.form1.driverPhone,
         transportTypeId: this.form1.transportTypeId,
-        carrierId: this.form1.carrierId,
+   //     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,
+
       };
-    if(
+    if (
+        reg.test(RmsCarDriver.driverAge) == false ||
+        reg.test(RmsCarDriver.driverPhone) == false
+      )
+        this.$message.error("输入的格式不正确");
+      else  if(
         RmsCarDriver.driverName==null ||
         RmsCarDriver.driverSex==null ||
         RmsCarDriver.driverAge==null ||
         RmsCarDriver.driverIdentityCard==null ||
         RmsCarDriver.driverPhone==null ||
         RmsCarDriver.transportTypeId==null ||
-        RmsCarDriver.carrierId==null 
+        RmsCarDriver.carrierIds==null 
+     //   RmsCarDriver.carrierId==null 
     )this.$message.error("存在空值！");
      else
       this.axios
@@ -107,6 +173,51 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
-</style>
+<style lang='scss'>
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.inputBox{
+     display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.1000rem;
+  margin-bottom: 0.25rem;
+  margin-left: -12.5rem;
+}
+.photoBox{
+   display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.1000rem;
+  margin-bottom: 0.25rem;
+  margin-left: -18rem;
+}
+.form-box{
+  display:flex;
+  justify-content: center;
+  .el-form-item{
+    display:flex;
+    justify-content: center;
+    .el-form-item__label{
+      display:flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width:250px;
+        }
+      }
+    }
+  }
+  
+}
+</style>

src/views/RMS/components/addCarrier.vue

@@ -6,6 +6,90 @@
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="330" v-model="form1"></dil-form>
       </div>
+    <!-- <el-upload
+      class="upload-demo"
+      action="https://jsonplaceholder.typicode.com/posts/"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :before-remove="beforeRemove"
+      multiple
+      :limit="1"
+      :on-exceed="handleExceed"
+      :file-list="fileList"
+    >
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件，且不超过500kb
+      </div>
+    </el-upload>
+    <el-upload
+      class="upload-demo"
+      action="https://jsonplaceholder.typicode.com/posts/"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :before-remove="beforeRemove"
+      multiple
+      :limit="1"
+      :on-exceed="handleExceed"
+      :file-list="fileList"
+    >
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件，且不超过500kb
+      </div>
+    </el-upload>
+    <el-upload
+      class="upload-demo"
+      action="https://jsonplaceholder.typicode.com/posts/"
+      :on-preview="handlePreview"
+      :on-remove="handleRemove"
+      :before-remove="beforeRemove"
+      multiple
+      :limit="1"
+      :on-exceed="handleExceed"
+      :file-list="fileList"
+    >
+      <el-button size="small" type="primary">点击上传</el-button>
+      <div slot="tip" class="el-upload__tip">
+        只能上传jpg/png文件，且不超过500kb
+      </div>
+    </el-upload> -->
+
+    <div class="form-box f1">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+    <el-form-item>
+    <el-button type="primary" @click="drawer = true">添加中标区域信息</el-button>
+  </el-form-item>
+    </el-form>
+    </div>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+          <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
+              
+</el-drawer>
+      <dilTable v-bind.sync="option1">
+      <el-table-column fixed="right" label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            size="mini"
+            @click="deleteclick(scope)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </dilTable>
+
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -15,21 +99,37 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
       value: undefined,
+      drawer: false,
       carrierType:{},
-      carrierTransportType:{}
+      carrierTransportType:{},
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
+        selectionType: "radio",
+         mapList:[],
+         registerDate:"",
+         mapValue:""
+      },
     };
   },
   methods: {
-    onClick(){},
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
+    },
+    currentRadioChange(selection){
+      this.mapList=selection, 
+      console.log(this.mapList) 
+      this.bidArea=this.mapList.bidArea
+     
+    },
      makeSure() {
-      console.log(this.form1)
+      let reg=new RegExp(/^[0-9]*$/);
       let RmsCarrier={
         carrierName:this.form1.carrierName,
         carrierTransportCertificate:this.form1.carrierTransportCertificate,
@@ -38,7 +138,7 @@ export default {
         carrierAbbreviation:this.form1.carrierAbbreviation,
         carrierAddress:this.form1.carrierAddress,
         registerNo:this.form1.registerNo,
-        carrierBidAreaId:this.form1.carrierBidAreaId,
+        carrierBidAreaId:this.mapList.bidAreaId,
         carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
         registerCapital:this.form1.registerCapital,
         businessScope:this.form1.businessScope,
@@ -46,7 +146,6 @@ export default {
         companyStatusDesc:this.form1.companyStatusDesc,
         companyTypeDesc:this.form1.companyTypeDesc,
         operationPeriod:this.form1.operationPeriod,
-        registerDate: sjTime(this.form1.registerDate),
         registerOrganization:this.form1.registerOrganization,
         registerAptitudes:this.form1.registerAptitudes,
         contactsName:this.form1.contactsName,
@@ -54,57 +153,93 @@ export default {
         carrierType:this.form1.carrierType,
         carrierTransportType:this.form1.carrierTransportType
       };
+      let registerDate={
+        registerDate: this.form1.registerDate,
+      };
+      let mapValue={
+        RmsCarrier:RmsCarrier,
+        registerDate:registerDate
+      };
       if(
-        RmsCarrier.carrierName ==null ||
-       // RmsCarrier.carrierTransportCertificate ==null ||
-       // RmsCarrier.carrierBusinessLicense ==null ||
-       // RmsCarrier.carrierBusinessAblelicense ==null ||
-        RmsCarrier.carrierAbbreviation ==null ||
-        RmsCarrier.carrierAddress ==null ||
-        RmsCarrier.registerNo ==null ||
-        RmsCarrier.carrierBidAreaId ==null || 
-        RmsCarrier.carrierLegalRepresentative ==null ||
-        RmsCarrier.registerCapital ==null ||
-        RmsCarrier.businessScope ==null ||
-        RmsCarrier.annualDate ==null ||
-        RmsCarrier.companyStatusDesc ==null ||
-        RmsCarrier.companyTypeDesc ==null ||
-        RmsCarrier.operationPeriod ==null ||
-        RmsCarrier.registerDate ==null ||
-        RmsCarrier.registerOrganization ==null ||
-        RmsCarrier.registerAptitudes ==null ||
-        RmsCarrier.contactsName ==null ||
-        RmsCarrier.carrierContactNumber ==null ||
-        RmsCarrier.carrierType ==null ||
-        RmsCarrier.carrierTransportType ==null 
-      )this.$message.error("存在空值！");
-      else
-      this.axios
-        .post(
-          "/api/v1/rms/insertCarrier",
-           RmsCarrier
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
-          }
-          this.$refs['table'].resetField();
-        });
+        reg.test(RmsCarrier.carrierContactNumber)==false
+      )this.$message.error("输入的格式不正确");
+       else if(
+          RmsCarrier.carrierName ==null ||
+        // RmsCarrier.carrierTransportCertificate ==null ||
+        // RmsCarrier.carrierBusinessLicense ==null ||
+        // RmsCarrier.carrierBusinessAblelicense ==null ||
+          RmsCarrier.carrierAbbreviation ==null ||
+          RmsCarrier.carrierAddress ==null ||
+          RmsCarrier.registerNo ==null ||
+          RmsCarrier.carrierBidAreaId ==null || 
+          RmsCarrier.carrierLegalRepresentative ==null ||
+          RmsCarrier.registerCapital ==null ||
+          RmsCarrier.businessScope ==null ||
+          RmsCarrier.annualDate ==null ||
+          RmsCarrier.companyStatusDesc ==null ||
+          RmsCarrier.companyTypeDesc ==null ||
+          RmsCarrier.operationPeriod ==null ||
+          registerDate.registerDate ==null ||
+          RmsCarrier.registerOrganization ==null ||
+          RmsCarrier.registerAptitudes ==null ||
+          RmsCarrier.contactsName ==null ||
+          RmsCarrier.carrierContactNumber ==null ||
+          RmsCarrier.carrierType ==null ||
+          RmsCarrier.carrierTransportType ==null 
+        )this.$message.error("存在空值！");
+        else
+         this.axios
+          .post(
+            "/api/v1/rms/insertCarrier",
+            mapValue
+          )
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              // this.$refs.table.refreshData();
+              this.$router.go(-1);
+            } else {
+              this.$message.error("新增失败,可能存在重复！");
+            }
+            this.$refs['table'].resetField();
+          });
+      },
+      // // 取消
+      cancel() {
+        this.$router.go(-1);
+      },
     },
-    // // 取消
-    cancel() {
-      this.$router.go(-1);
-    },
-  },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addGatepost.vue

@@ -84,14 +84,14 @@ export default {
 <style lang='scss' scoped>
 
 </style>
-<style lang='scss' scoped>
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
-}
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
 .btn-left {
   margin-left: 470px;
@@ -145,4 +145,23 @@ export default {
   margin-top: -2.5rem;
   margin-left: 10.5rem;
 }
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addMaterial.vue

@@ -5,16 +5,19 @@
     <el-divider content-position="left">物资信息</el-divider>
      <div class="form-box" style="margin-right: 10rem">
         <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
+
       </div>
         <div class="form-box f1">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
-  <el-form-item label="物资种类">
+  <div class="disableBox">
+  <el-form-item>
     <el-input v-model="materialTypeName" disabled>  
     </el-input>
   </el-form-item>
   <el-form-item>
-    <el-button type="primary" @click="drawer = true">浏览</el-button>
+    <el-button type="primary" @click="drawer = true">物资种类</el-button>
   </el-form-item>
+  </div>
     </el-form>
     </div>
     <el-drawer
@@ -119,14 +122,23 @@ export default {
       }
 };
 </script>
-<style lang='scss' scoped>
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
+.disableBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 3rem;
+  margin-bottom: 1.25rem;
+  margin-left: -23rem;
 }
 .btn-left {
   margin-left: 470px;
@@ -179,4 +191,23 @@ export default {
   margin-top: -2.5rem;
   margin-left: 25rem;
 }
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addNotice.vue

@@ -68,5 +68,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/addOilPrice.vue

@@ -65,6 +65,32 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
-</style>
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/RMS/components/addPersonnel.vue

@@ -35,6 +35,7 @@ export default {
         personnelPost: this.form1.personnelPost,
         personnelWorkshopid: this.form1.personnelWorkshopid,
         personnelShifts: this.form1.personnelShifts,
+        personnelTeam:this.form1.personnelTeam,
         departmentId: this.form1.shipperId
       };
       if(
@@ -43,7 +44,8 @@ export default {
         RmsPersonnel.personnelPost ==null ||
         RmsPersonnel.personnelWorkshopid==null ||
         RmsPersonnel.personnelShifts==null ||
-        RmsPersonnel.departmentId==null 
+        RmsPersonnel.departmentId==null ||
+        RmsPersonnel.personnelTeam==null
       )this.$message.error("存在空值！");
       else
       
@@ -73,6 +75,32 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addPier.vue

@@ -62,15 +62,24 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box,
-.button-box{
+<style lang='scss' >
+.form-box{
   display: flex;
-  text-align: center;
-  align-items: center;
   justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
 }
-
 </style>

src/views/RMS/components/addPort.vue

@@ -64,8 +64,7 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box,
+<style lang='scss' >
 .button-box{
   display: flex;
   text-align: center;
@@ -74,4 +73,23 @@ export default {
   margin-top: 0.3125rem;
   margin-bottom: 1.25rem;
 }
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addPortStorageYard.vue

@@ -15,61 +15,64 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 export default {
-  components: { PageTitle },
-  data() {
-    return {
-      form1: {},
-      value: undefined,
-    };
-  },
-  mounted() {},
-  methods: {
-     makeSure() {
-        console.log(this.form1)
-    //   let RmsCapacity = {
-          
-    //   };
-       let RmsCapacity=this.form1;
-      console.log(RmsCapacity)
-      if (
-        RmsCapacity.warehouseName==null||
-        RmsCapacity.portId==null
-      ) this.$message.error("存在空值！");
-      else 
-      this.axios
-        .post(
-          "/api/v1/rms/insertPortYard",
-           RmsCapacity
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
-          }
-          this.$refs['table'].resetField();
-        });
-    },
-    // 取消
-    cancel() {
-      this.$router.go(-1);
-    },
-  },
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+        console.log(this.form1)
+    //   let RmsCapacity = {
+          
+    //   };
+       let RmsCapacity=this.form1;
+      console.log(RmsCapacity)
+      if (
+        RmsCapacity.warehouseName==null||
+        RmsCapacity.portId==null
+      ) this.$message.error("存在空值！");
+      else 
+      this.axios
+        .post(
+          "/api/v1/rms/insertPortYard",
+           RmsCapacity
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>
+.el-input{
+    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;
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    margin-top: 0.3125rem;
+    margin-bottom: 1.25rem;
 }
 </style>

src/views/RMS/components/addRawWarehouse.vue

@@ -30,8 +30,13 @@ export default {
      makeSure() {
        console.log(this.from1)
        let RmsWarehouse = {
-         warehouseName:this.form1.warehouseName, 
-       }
+         warehouseName:this.form1.warehouseName,
+         shipperId:this.form1.shipperId 
+       };
+       if(
+         RmsWarehouse.warehouseName==null ||
+         RmsWarehouse.shipperId==null
+       )this.$message.error("存在空值！");
     //  console.log(this.RmsWarehouse)
       this.axios
         .post(
@@ -58,6 +63,32 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addRmsShipper.vue

@@ -65,6 +65,32 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addSupplier.vue

@@ -69,6 +69,32 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/addTruckCalculate.vue

@@ -11,14 +11,17 @@
     <el-form :inline="true" :model="formInline" class="demo-form-inline">     
     </el-form>
   </div>
-    <el-input
+  <div class="inputBox">
+  <el-input :inline="true"
         placeholder="请输入内容"
         v-model="inputText"
         clearable>
     </el-input>
-          <el-button type="primary" class="btn" @click="onclick">
-            <i class="el-icon-search"></i>物资列表查询
-          </el-button> 
+    <el-button type="primary" class="btn" @click="onclick" :inline="true">
+        <i class="el-icon-search"></i>物资列表查询
+    </el-button> 
+  </div>
+    
           <div> <dilTable v-bind.sync="options" @selection-change="selectionChange"></dilTable></div>
 
     <div class="button-box">
@@ -111,14 +114,22 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
+<style lang='scss' >
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
-.button-box {
-  padding: 20px 30px;
-  margin-left: 460px;
+.inputBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+   margin-top: 2rem;
+  width: 400px;
 }
 .btn-left {
   margin-left: 470px;
@@ -171,4 +182,23 @@ export default {
   margin-top: -2.5rem;
   margin-left: 25rem;
 }
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
 </style>

src/views/RMS/components/capacity.vue

@@ -1,6 +1,6 @@
 //资源管理运力
 <template>
-  <div class="capacity">
+  <div class="steel_inbound">
     <div class="sache">
       <el-input
         placeholder="请输入内容"
@@ -98,14 +98,14 @@ export default {
   }
 
 </script>
-
 <style lang="scss" scode>
-.capacity{
+.steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/carDriver.vue

@@ -1,6 +1,6 @@
 //资源管理司机
 <template>
-  <div class="carDriver">
+  <div class="steel_inbound">
     <div class="sache">
       <el-input
         placeholder="请输入内容"
@@ -101,14 +101,14 @@ export default {
 }
 
 </script>
-
 <style lang="scss" scode>
-.carDriver{
+.steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/carrier.vue

@@ -103,10 +103,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/consignee.vue

@@ -0,0 +1,47 @@
+<template>
+  <!-- 客户收货信息页面 -->
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <dilTable v-bind.sync="option">
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/rms/getConsigneeList?apiId=407",
+      },
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/rms/getConsigneeList?apiId=407&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+  }
+</style>

src/views/RMS/components/editCapacity.vue

@@ -72,7 +72,14 @@ console.log(this.$route.params)
          capacityVip:this.form1.capacityVip,
          capacityBlacklist:this.form1.capacityBlacklist,
          carrierId:this.form1.carrierId,
-       }  
+       };if(
+         RmsCapacity.capacityNumber==null ||
+         RmsCapacity.capacityCorlor==null ||
+         RmsCapacity.capacityOwneris==null ||
+         RmsCapacity.capacityVip==null ||
+         RmsCapacity.capacityBlacklist==null ||
+         RmsCapacity.carrierId==null
+       )this.$message.error("存在空值！");  
         console.log( this.$route.params.capacityId);
         this.axios
           .post(
@@ -89,6 +96,14 @@ console.log(this.$route.params)
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editCarDriver.vue

@@ -72,7 +72,16 @@ export default {
        driverLicence:this.form1.driverLicence,
        driverLicence:this.form1.driverLicence,
        driverLicence:this.form1.driverLicence,
-      }
+      };
+      if(
+        RmsCarDriver.driverName==null ||
+        RmsCarDriver.driverSex==null ||
+        RmsCarDriver.driverAge==null ||
+        RmsCarDriver.driverIdentityCard==null ||
+        RmsCarDriver.driverPhone==null ||
+        RmsCarDriver.transportTypeId==null ||
+        RmsCarDriver.carrierId==null 
+    )this.$message.error("存在空值！");
         this.axios
           .post(
             "/api/v1/rms/updateCarDriver",
@@ -87,6 +96,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editCarrier.vue

@@ -13,6 +13,28 @@
       </div>
     </div>
 
+    <div class="form-box f1">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+    <el-form-item>
+    <el-button type="primary" @click="drawer = true">添加中标区域信息</el-button>
+  </el-form-item>
+    </el-form>
+    </div>
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      :before-close="handleClose">
+        <el-input
+            placeholder="请输入内容"
+            v-model="inputText"
+            clearable>
+          </el-input>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+          <div><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>   
+    </el-drawer>
+
     <div class="button-box">
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
       <el-button @click="onClickCancel">返回</el-button>
@@ -28,6 +50,17 @@ export default {
   data() {
     return {
       form1: {},
+      registerDate:"",
+      mapValue:"",
+      drawer: false,
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCarrierBidAreaList?apiId=406",
+        selectionType: "radio",
+         mapList:[],
+         registerDate:"",
+         mapValue:""
+      },
     };
   },
  
@@ -36,6 +69,15 @@ export default {
     this.information();
   },
   methods: {
+    onclick(){
+      this.options.requestUrl="/api/v1/rms/getCarrierBidAreaList?apiId=406&con=" +this.inputText;
+    },
+    currentRadioChange(selection){
+      this.mapList=selection, 
+      console.log(this.mapList) 
+      this.bidArea=this.mapList.bidArea
+     
+    },
     information() {
       //编辑
       this.axios
@@ -60,7 +102,7 @@ export default {
     // 确认
     onClickConfirm() {  
        let RmsCarrier={
-        carrierId:this.from1.carrierId,
+        carrierId:this.$route.params.carrierId,
         carrierName:this.form1.carrierName,
         carrierTransportCertificate:this.form1.carrierTransportCertificate,
         carrierBusinessLicense:this.form1.carrierBusinessLicense,
@@ -68,7 +110,7 @@ export default {
         carrierAbbreviation:this.form1.carrierAbbreviation,
         carrierAddress:this.form1.carrierAddress,
         registerNo:this.form1.registerNo,
-        carrierBidAreaId:this.form1.carrierBidArea,
+        carrierBidAreaId:this.mapList.bidAreaId,
         carrierLegalRepresentative:this.form1.carrierLegalRepresentative,
         registerCapital:this.form1.registerCapital,
         businessScope:this.form1.businessScope,
@@ -76,7 +118,6 @@ export default {
         companyStatusDesc:this.form1.companyStatusDesc,
         companyTypeDesc:this.form1.companyTypeDesc,
         operationPeriod:this.form1.operationPeriod,
-        registerDate: sjTime(this.form1.registerDate),
         registerOrganization:this.form1.registerOrganization,
         registerAptitudes:this.form1.registerAptitudes,
         contactsName:this.form1.contactsName,
@@ -84,10 +125,41 @@ export default {
         carrierType:this.form1.carrierType,
         carrierTransportType:this.form1.carrierTransportType
       };
+       let registerDate={
+        registerDate: this.form1.registerDate,
+      };
+      let mapValue={
+        RmsCarrier:RmsCarrier,
+        registerDate:registerDate
+      };
+       if(
+        RmsCarrier.carrierName ==null ||
+       // RmsCarrier.carrierTransportCertificate ==null ||
+       // RmsCarrier.carrierBusinessLicense ==null ||
+       // RmsCarrier.carrierBusinessAblelicense ==null ||
+        RmsCarrier.carrierAbbreviation ==null ||
+        RmsCarrier.carrierAddress ==null ||
+        RmsCarrier.registerNo ==null ||
+        RmsCarrier.carrierBidAreaId ==null || 
+        RmsCarrier.carrierLegalRepresentative ==null ||
+        RmsCarrier.registerCapital ==null ||
+        RmsCarrier.businessScope ==null ||
+        RmsCarrier.annualDate ==null ||
+        RmsCarrier.companyStatusDesc ==null ||
+        RmsCarrier.companyTypeDesc ==null ||
+        RmsCarrier.operationPeriod ==null ||
+        registerDate.registerDate ==null ||
+        RmsCarrier.registerOrganization ==null ||
+        RmsCarrier.registerAptitudes ==null ||
+        RmsCarrier.contactsName ==null ||
+        RmsCarrier.carrierContactNumber ==null ||
+        RmsCarrier.carrierType ==null ||
+        RmsCarrier.carrierTransportType ==null 
+      )this.$message.error("存在空值！");
         this.axios
           .post(
             "/api/v1/rms/updateCarrier",
-            RmsCarrier
+            mapValue
           )
           .then((res) => {
             if (res.data.code == "200") {
@@ -98,6 +170,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editGatepost.vue

@@ -2,23 +2,26 @@
   <!-- 门岗规则信息页面 -->
   <div class="homeworkPath">
     <page-title>门岗规则信息</page-title>
-    <div class="form box">
+    <div>
       <el-form>
     <el-form-item>
-    <label class="el-form-item__label" style="width: auto;">门岗名称</label>
+    <div class="form1">
+    <label class="el-form-item__label" style="width: 100px">门岗名称</label>
+
          <el-input
         placeholder=""
         v-model="gatepostName"
         :disabled="true">
       </el-input>
+      </div>
       </el-form-item>
       </el-form>
     </div>
-    <div class="form">
+    <div class="form-box">
       <dil-form :formId="358" v-model="form"></dil-form>
     </div>
     <!-- 时间点 -->
-    <div class="form-box f1" >
+    <div class="timeBox" >
         门岗开门时间
         <el-time-select
           v-model="rulesGatepostStartTime"
@@ -31,7 +34,7 @@
           >
         </el-time-select>
     </div>
-    <div class="form-box f1">
+    <div class="timeBox">
       门岗关门时间
       <el-time-select
       v-model="rulesGatepostEndTime"
@@ -44,7 +47,7 @@
     </el-time-select>
     </div>
     <!-- 原料模态窗口显示 -->
-    <div class="form-box f1">
+    <div class="drawerBox">
       <el-form :inline="true"  class="demo-form-inline">
         
         <el-form-item>
@@ -234,19 +237,55 @@ export default {
       color: #606266;
     }
   }
+  .form1{
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    margin-left: 34rem;
+    width: 300px;
+  }
   .form {
-    margin-top: 1.25rem;
+   display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+   margin-top: 4rem;
+  margin-left: 35rem;
+  width: 300px;
+  }
+}
+.form-box{
+  display: flex;
+  justify-content: center;
+   margin-top: 1rem;
+  margin-left: -4rem;
+  .el-form-item{
     display: flex;
     justify-content: center;
-    align-items: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
   }
 }
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
+.timeBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 1rem;
+  margin-left: -4rem;
 }
-.f1{
-  margin-top: -2.5rem;
+.drawerBox{
+  margin-top: 2.5rem;
   margin-left: 40rem;
 }
 .btn2{

src/views/RMS/components/editMaterial.vue

@@ -70,6 +70,15 @@ export default {
         unitOfMeasureId:this.form1.unitOfMeasureId,
         materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
       };
+         if(
+        RmsMaterial.materialCode==null ||
+        RmsMaterial.materialName==null ||
+        RmsMaterial.materialSpecification==null ||
+        RmsMaterial.materialModel==null ||
+        RmsMaterial.materialTypeId==null ||
+        RmsMaterial.unitOfMeasureId==null ||
+        RmsMaterial.materialTheoreticalWeight==null 
+      )this.$message.error("存在空值！");
         this.axios
           .post(
             "/api/v1/rms/updateMaterial",
@@ -89,5 +98,13 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editNotice.vue

@@ -20,13 +20,8 @@
   </div>
 </template>
 
-
-
-
 <script>
 
-
-
 import PageTitle from "@/components/Page/Title";
 
 export default {
@@ -71,8 +66,12 @@ export default {
         insertTime:this.form1.insertTime,
         insertUsername:this.form1.insertUsername,
         noticeContent:this.form1.noticeContent,
-
       };
+       if(
+        DilNotice.noticeTitle ==null ||
+        DilNotice.insertUsername ==null ||
+        DilNotice.noticeContent ==null
+      )this.$message.error("存在空值！");
       this.axios
         .post(
           "/api/v1/rms/updateNotice",
@@ -87,21 +86,19 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
-
-</style>
-
-<style>
-
-.el-textarea__inner{
-/*  width: 300px !important;*/
-  min-height:250px !important;
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
-
-
 </style>
 
 
 
 
+

src/views/RMS/components/editOilPrice.vue

@@ -65,8 +65,12 @@ export default {
         priceDate:this.form1.priceDate,
         priceValue:this.form1.priceValue,
         priceOilName:this.form1.priceOilName,
-
       };
+      if(
+        RmsOilPrice.priceOilName ==null ||
+        RmsOilPrice.priceDate ==null ||
+         RmsOilPrice.priceValue ==null
+      )this.$message.error("存在空值！");
       this.axios
         .post(
           "/api/v1/rms/updateOilPrice",
@@ -81,6 +85,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editPersonnel.vue

@@ -66,7 +66,15 @@ export default {
          personnelShifts: this.form1.personnelShifts,
          shipperId: this.form1.shipperId,
          personnelTeam: this.form1.personnelTeam,
-       }  
+       }; 
+         if(
+        RmsPersonnel.personnelJobNumber ==null ||
+        RmsPersonnel.personnelName ==null ||
+        RmsPersonnel.personnelPost ==null ||
+        RmsPersonnel.personnelWorkshopid==null ||
+        RmsPersonnel.personnelShifts==null ||
+        RmsPersonnel.departmentId==null 
+      )this.$message.error("存在空值！"); 
         this.axios
           .post(
             "/api/v1/rms/updatePersonnel",
@@ -82,6 +90,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editRawWarehouse.vue

@@ -59,7 +59,10 @@ export default {
        let RmsWarehouse={
       warehouseId:this.$route.params.warehouseId,
       warehouseName:this.form1.warehouseName
-    }
+    };
+    if(
+         warehouseName==null
+       )this.$message.error("存在空值！");
    console.log(RmsWarehouse)
         this.axios
           .post(
@@ -75,6 +78,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editRmsShipper.vue

@@ -65,6 +65,10 @@ export default {
         shipperName: this.form1.shipperName,
         shipperAbbreviation: this.form1.shipperAbbreviation
       };
+      if(
+        RmsShipper.shipperName==null ||
+        RmsShipper.shipperAbbreviation ==null 
+      )this.$message.error("存在空值！");
         this.axios
           .post(
             "/api/v1/rms/updateShipper",
@@ -79,6 +83,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editSupplier.vue

@@ -69,6 +69,13 @@ export default {
         supplierContactsName: this.form1.supplierContactsName,
         supplierContactNumber: this.form1.supplierContactNumber
       };
+       if(
+        RmsSupplier.supplierName==null ||
+        RmsSupplier.supplierAddress==null ||
+        RmsSupplier.supplierRegisterDate==null ||
+        RmsSupplier.supplierContactsName==null ||
+        RmsSupplier.supplierContactNumber==null 
+      )this.$message.error("存在空值！");
         this.axios
           .post(
             "/api/v1/rms/updateSupplier",
@@ -83,6 +90,14 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/RMS/components/editTruckCalculate.vue

@@ -11,10 +11,8 @@
           <dil-form :formId="354" v-model="form1"></dil-form>
         </div>
       </div>
-        <div class="form-box f1">
+        <div class="materialBox">
           <el-form :inline="true" :model="formInline" class="demo-form-inline">
-    </el-input>
-  </el-form-item>
   <el-form-item>
     <el-button type="primary" @click="drawer = true">增加物资</el-button>
   </el-form-item>
@@ -24,6 +22,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose">
+      <div class="inputBox">
         <el-input
             placeholder="请输入内容"
             v-model="inputText"
@@ -32,6 +31,7 @@
           <el-button type="primary" class="btn" @click="onclick">
             <i class="el-icon-search"></i>查询
           </el-button>
+        </div>
             <div><dilTable v-bind.sync="option2" @radio-change="currentRadioChange" ></dilTable></div>
               <div class="button-box">
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -131,7 +131,11 @@ export default {
          truckCalculateLongitude:this.form1.truckCalculateLongitude,
          truckCalculateLatitude:this.form1.truckCalculateLatitude,
          calculateType:this.form1.calculateType,
-       }
+       };
+         if(
+        rmsTruckCalculate.truckCalculateNumber == null ||
+        rmsTruckCalculate.calculateType ==null
+         )this.$message.error("存在空值！");
     
         this.axios
           .post(
@@ -206,10 +210,39 @@ makeSure() {
   },
 };
 </script>
-<style lang='scss' scoped>
-.form-box {
-  padding: 20px 30px;
-  margin-left: 330px;
+<style lang='scss'>
+.form-box{
+  display: flex;
+  justify-content: center;
+  .el-form-item{
+    display: flex;
+    justify-content: center;
+    .el-form-item__label{
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content{
+      .el-input{
+        .el-input__inner{
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+.inputBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  width: 400px;
+}
+.inputBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  width: 400px;
 }
 .button-box {
   padding: 20px 30px;
@@ -250,20 +283,12 @@ makeSure() {
   cursor: default;
   color: #2c3e50;
 }
-.f1{
-  margin-top: -2.5rem;
-  margin-left: 22.3rem;
-}
-.f11{
-  margin-top: -3rem;
-  // margin-left: 29rem;
-}
-.f2{
-  margin-top: -2.5rem;
-  margin-left: 20.7rem;
-}
-.f3{
-  margin-top: -2.5rem;
-  margin-left: 25rem;
+.materialBox{
+   display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
 </style>

src/views/RMS/components/gatepost.vue

@@ -99,14 +99,14 @@ export default {
 }
 
 </script>
-
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/getNoticeById.vue

@@ -76,11 +76,3 @@ export default {
 </style>
 
 
-<!--<el-input id="FormGroup_1639361270400"
-          type="textarea"
-          placeholder="请输入内容"
-          v-model="textarea"
-
->
-</el-input>-->
-

src/views/RMS/components/material.vue

@@ -103,10 +103,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/notice.vue

@@ -1,6 +1,6 @@
 //公告管理
 <template>
-  <div class="notice">
+  <div class="steel_inbound">
     <div class="sache">
       <el-input
         placeholder="请输入内容"
@@ -127,12 +127,13 @@ export default {
 </script>
 
 <style lang="scss" scode>
-.notice{
+.steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/oilPrice.vue

@@ -1,6 +1,6 @@
 //资源管理油价管理
 <template>
-  <div class="oilPrice">
+  <div class="steel_inbound">
     <div class="sache">
       <el-input
         placeholder="请输入内容"
@@ -104,12 +104,13 @@ export default {
 </script>
 
 <style lang="scss" scode>
-.oilPrice{
+.steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/personnel.vue

@@ -104,10 +104,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
-</style>
+</style>

src/views/RMS/components/rawMaterialManufacturer.vue

@@ -99,10 +99,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/rawWarehouse.vue

@@ -102,10 +102,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/rmsShipper.vue

@@ -103,10 +103,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/supplier.vue

@@ -103,10 +103,11 @@ export default {
 <style lang="scss" scode>
 .steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/components/transitRoute.vue

@@ -1,6 +1,6 @@
 // 运输路线
 <template>
-  <div class="transitRoute">
+  <div class="steel_inbound">
     <div class="top">
       <!-- 框计算 -->
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
@@ -128,4 +128,16 @@ export default {
     padding-left: 60px;
   }
 }
+</style>
+
+<style lang="scss" scode>
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+  }
 </style>

src/views/RMS/components/truckCalculate.vue

@@ -1,6 +1,6 @@
 //资源管理汽车衡
 <template>
-  <div class="truckCalculate">
+  <div class="steel_inbound">
     <div class="sache">
       <el-input
         placeholder="请输入内容"
@@ -98,12 +98,13 @@ export default {
 </script>
 
 <style lang="scss" scode>
-.truckCalculate{
+.steel_inbound{
   .sache{
-    height: 80px;
-    display: flex;
-    align-items: center;
-    padding-left: 30px;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/RMS/router/index.js

@@ -23,7 +23,7 @@ import addTruckCalculate from '../components/addTruckCalculate.vue'
 import capacity from '../components/capacity.vue'
 import carDriver from '../components/carDriver.vue'
 import carrier from '../components/carrier.vue'
-import addPidetailsTruckCalculateer from '../components/detailsTruckCalculate.vue'
+
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
 import editCarrier from '../components/editCarrier.vue'
@@ -52,6 +52,7 @@ import supplier from '../components/supplier.vue'
 import transitRoute from '../components/transitRoute.vue'
 import transitRouteAdd from '../components/transitRouteAdd.vue'
 import truckCalculate from '../components/truckCalculate.vue'
+import consignee from '../components/consignee.vue'
 Vue.use(Router)
 const constantRouterMap = [
 	{
@@ -79,7 +80,6 @@ const constantRouterMap = [
 		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
 		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
 		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},
-		{path: 'addPidetailsTruckCalculateer', name: 'addPidetailsTruckCalculateer', meta: {code: 'xtpzgl-yhgl'}, component: addPidetailsTruckCalculateer},
 		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
@@ -108,6 +108,7 @@ const constantRouterMap = [
 		{path: 'transitRoute', name: 'transitRoute', meta: {code: 'xtpzgl-yhgl'}, component: transitRoute},
 		{path: 'transitRouteAdd/:addup', name: 'transitRouteAdd', meta: {code: 'xtpzgl-yhgl'}, component: transitRouteAdd},
 		{path: 'truckCalculate', name: 'truckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: truckCalculate},
+		{path: 'consignee', name: 'consignee', meta: {code: 'xtpzgl-yhgl'}, component: consignee}
 	  ]
 	}
   ];

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -3,9 +3,6 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="main">
-      <el-divider content-position="left">新增运输预约</el-divider>
-    </div>
     <div class="forwardingUnit from">
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
@@ -119,6 +116,13 @@
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
+              <!-- 装卸货优先级 -->
+               <template v-if="item.prop == 'materialPriority'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.materialPriority"
+                ></el-input>
+              </template>
             </template>
             <template v-else>
               <span>{{ scope.row[item.prop] }}</span>
@@ -214,6 +218,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+
 export default {
   components: { PageTitle },
   data() {
@@ -237,9 +242,9 @@ export default {
       lineId: null,
       // 件数与重量的开关
       value: false,
-    //   物资模态框开关
+      //物资模态框开关
       table: false,
-      // 物资表格表头
+      //物资表格表头
       tableTop: [
         {
           prop: "materialCode",
@@ -261,6 +266,11 @@ export default {
           label: "件数",
           slot: true,
         },
+          {
+          prop: "materialPriority",
+          label: "装卸货优先级",
+          slot: true,
+        },
       ],
       // 收货单位ID
       receiveId:null,
@@ -350,6 +360,7 @@ export default {
     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
         }
       })
@@ -382,6 +393,7 @@ export default {
           Specification: e.materialSpecification+e.materialModel,
           orderMaterialWeight: null,        
           materialId: e.materialId,
+          materialPriority:e.materialPriority,
         };
         this.tableData.push(addmap);
         this.selectionList1 = [];
@@ -478,10 +490,10 @@ export default {
           mapList: this.tableData,
         };
         console.log(amsOrder);
-        debugger
+      
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
-            this.$router.push("/sporadicMaterial/transportAppoint");
+            this.$router.go(-1)
           }
         });
       }
@@ -509,10 +521,13 @@ export default {
 }
 .lineId {
   .text {
-    display: inline-block;
+    display: flex;
     width: 10rem;
     text-align: right;
   }
+  .el-input{
+    width: 20%;
+  }
 }
 .material {
   .text {
@@ -523,10 +538,13 @@ export default {
 }
 .orderType{
   .text{
-    display: inline-block;
+    display: flex;
     width: 5.625rem;
     text-align: right;
   }
+  .el-select{
+  width: 100%;
+}
 }
 .switch {
   width: 100%;
@@ -539,8 +557,10 @@ export default {
 .forwardingUnit {
   .text {
     display: inline-block;
-    width: 10rem;
-    text-align: right;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    width: 20%;
   }
 }
 .truckList1 {
@@ -557,6 +577,10 @@ export default {
     }
   }
 }
+.el-input{
+  width: 20%;
+}
+
 .button_box {
   display: flex;
   justify-content: center;

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/transportAppoint.vue

@@ -4,21 +4,34 @@
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" @click="insertClick" >
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="insertClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
-       <el-button type="primary" @click="sendClick()" v-if="this.activeName == 'first'">
+      <el-button
+        type="primary"
+        @click="sendClick()"
+        v-if="this.activeName == 'first'"
+      >
         <i class="el-icon-bottom"></i>下发
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-         <!-- 未下发 -->
+      <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
-        <dilTable v-bind.sync="option1" ref="table" @selection-change="selectionChange">
-          <el-table-column fixed="right" align="center" label="操作" width="120">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
             <template slot-scope="scope">
               <!-- <el-button @click="updateClick(scope.row.orderId)" type="text" size="small">
                 修改
@@ -32,8 +45,7 @@
       </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>
@@ -49,83 +61,94 @@ export default {
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12",
+        requestUrl:
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12",
         // 控制显示多选列
         selectionType: "select",
       },
-       option2: {
+      option2: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12",
+        requestUrl:
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12",
       },
-      selection:[],
+      selection: [],
     };
   },
   methods: {
     //获取选中的订单
-    selectionChange(selection){
-        this.maplist = selection
+    selectionChange(selection) {
+      this.maplist = selection;
     },
     onclick() {
-      if(this.activeName == "first"){
-        this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&con=" + this.input;
-      }else{
-        this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&con=" + this.input;
-      }
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&con=" +
+          this.input;
+      } else {
+        this.option2.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12&con=" +
+          this.input;
+      }
     },
     handleClick(tab, event) {
       console.log(tab, event);
-    },
-     // 下发
+    }, // 下发
+    // 下发
     sendClick() {
-      console.log(this.maplist)
-         this.axios
-            .post(
-              "/api/v1/ams/issueSporadicOrders" + this.maplist
-            )
-            .then(() => {
-              this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12"
-            })
-            .then(() => {
-             this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-        })
+      console.log(this.maplist);
+      this.axios
+        .post("/api/v1/ams/issueSporadicOrders", this.maplist)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.option1.requestUrl =
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12&test=1";
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+          }
+        });
     },
     // 删除
     deleteClick(scope) {
-         console.log(scope.row.sporadicOrderId);
-         this.axios
-            .post(
-               "/api/v1/ams/deleteSporadicOrders?sporadicOrderId="+scope.row.sporadicOrderId
-            )
+      console.log(scope.row.sporadicOrderId);
+      this.axios
+        .post(
+          "/api/v1/ams/deleteSporadicOrders?sporadicOrderId=" +
+            scope.row.sporadicOrderId
+        )
         .then((res) => {
-          if(res.data.code == '200'){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12"
+          if (res.data.code == "200") {
+            this.option1.requestUrl =
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12";
             this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          
-          }  
-        })
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
     },
     //新增
     insertClick() {
-      this.$router.push("/sporadicMaterial/addTransportAppoint");
+      this.$router.push("addSporadicTransportAppoint");
     },
     //修改
     updateClick(orderId) {
-      this.$router.push("/importedIngredients/transportReserveFuEdit/" + orderId);
+      this.$router.push(
+        "/importedIngredients/transportReserveFuEdit/" + orderId
+      );
     },
-
   },
 };
 </script>
 <style lang='scss' scoped>
-   .homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
   }
 }
 </style>

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -336,6 +336,7 @@ export default {
 </script>
 
 <style lang="scss">
+
 .transportOrder {
   .transportOrder_top {
     width: 100%;
@@ -343,6 +344,9 @@ export default {
     display: flex;
     align-items: center;
     padding-left: 50px;
+    .el-input{
+  width: 20%;
+}
   }
   .drawer_top {
     width: 100%;

src/views/TMS/components/importedFuel/transportReserveFuAdd.vue

@@ -16,7 +16,6 @@
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-
     <div class="contractTitle from">
       <dil-form :formId="219" v-model="form1"></dil-form>
     </div>

src/views/TMS/components/importedFuel/transportReserveRan.vue

@@ -87,7 +87,7 @@ export default {
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&fuelOrder=1",
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1",
       },
     };
   },
@@ -99,7 +99,7 @@ export default {
           this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&fuelOrder=1&con=" +
+          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&fuelOrder=1&con=" +
           this.input;
       }
     },

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -461,8 +461,7 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" >
+<style lang="scss">
 .contractDetails {
   width: 100%;
 }

src/views/TMS/components/importedFuel/transportReserveRanEdit.vue

@@ -2,39 +2,120 @@
   <!-- 修改运输预约页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div class="main">
-      <span class="text">修改运输预约</span>
-      <span class="a"></span>
-    </div>
     <div class="contractTitle">
-      <div class="form-box">
-        <div class="form-one">
-          <dil-form :formId="220" v-model="form1"></dil-form>
+      <div class="form-one">
+        <dil-form :formId="220" v-model="form1"> </dil-form>
+      </div>
+      <div class="btn">
+        <div class="btn1">
+          <el-button type="primary" @click="selectTruck">浏览</el-button>
+        </div>
+        <div class="btn1">
+          <el-button type="primary" @click="selectUnloadingPoint"
+            >浏览</el-button
+          >
         </div>
       </div>
-    </div>  
- 
-    <div class="button-box">
+    </div>
+
+    <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
     </div>
+
+    <el-drawer
+      :visible.sync="drawer"
+      :direction="direction"
+      size="40%"
+      :wrapperClosable="true"
+      :close-on-press-escape="false"
+      :destroy-on-close="false"
+      :show-close="false"
+      :withHeader="true"
+      modal
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem; width: 200px"
+        clearable
+      ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick(a)"
+        style="margin-bottom: 0.9375rem"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <div v-show="a == 1">
+        <dilTable
+          v-bind.sync="third"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import {sjTime} from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+      drawer: false,
+      direction: "rtl",
+      a: null,
+      third: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        selectionType: "radio",
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+      },
+      capacityId: null,
+      warehouseId: null,
+      input: null,
+      orderType:null,
+    };
+  },
   mounted() {
     this.information();
   },
   methods: {
+    onclick(a) {
+      if (a == 1) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" + this.input;
+      } else if (a == 2) {
+      }
+    },
+    selectTruck() {
+      this.a = 1;
+      this.drawer = true;
+    },
+    selectUnloadingPoint() {
+      this.a = 2;
+      this.drawer = true;
+    },
+    currentRadioChange(row) {
+      this.form1.capacityNumber = row.capacityNumber;
+      this.capacityId = row.capacityId;
+    },
+    currentRadioChange2(row) {
+      this.form1.warehouseName = row.warehouseName;
+      this.warehouseId = row.warehouseId;
+    },
     information() {
       this.axios
         .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
@@ -44,40 +125,64 @@ export default {
           });
         });
     },
-     // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
-     // 确认
+    // 确认
     onClickConfirm() {
       let obj = {
-        orderId: this.$route.params.orderId,
-        materialId: this.form1.materialId,
-        orderEntryTime: sjTime(this.form1.orderEntryTime),
-        unloadPointId: this.form1.unloadPointId,
-        orderType: this.form1.orderType
-      };
-
-      if (
-        obj.orderId==null||
-        obj.materialId==null||
-        obj.unloadPointId==null||
-        obj.orderEntryTime==null
-      ) this.$message.error("存在空值！");
-      else
-      this.axios
-        .post("/api/v1/oms/updateOrder", obj)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
+          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");
+            }
         });
-    },
+    }
   },
 };
 </script>
-<style lang="scss" scoped>
-// @import "@/styles/appoint/contract/ContractInsert.scss";
+<style lang="scss">
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  margin: 20px;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+      font-size: 14px;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+  .btn {
+    margin-left: 20px;
+    padding-top: 105px;
+    .btn1 {
+      margin-bottom: 15px;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-button {
+    width: 80px;
+    margin: 10px;
+  }
+}
 </style>

src/views/homepage/app.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta content="工业互联网平台" name="keywords">
+    <meta content="工业互联网平台" name="description">
+    <title>工业互联网平台</title>
+    <link href="../static/css/common.css" rel="stylesheet"/>
+    <link href="../static/img/favicon.ico" rel="shortcut icon"/>
+    <script src="../static/lib/jquery/jquery.min.js" type="text/javascript"></script>
+    <script src="../static/lib/jquery/jquery.PrintArea.js" type="text/javascript"></script>
+    <script src="../static/lib/qrcode.min.js" type="text/javascript"></script>
+    <script src='../static/lib/XLSX/xlsx.core.min.js' type='text/javascript'></script>
+    <script src="../static/js/common.js" type="text/javascript"></script>
+     
+  </head>
+  <body>
+    <div id="app"></div>
+  </body>
+</html>

src/views/homepage/app.js

@@ -0,0 +1,86 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import Vue from 'vue';
+import App from '@/components/App.vue';
+// include
+import '@/config/include.js';
+
+// 通用store
+import store from '@/store/index.js';
+
+// router
+import router from './router/index.js';
+
+import VueApollo from 'vue-apollo'
+
+import apollo from '@/config/apolloConfig.js'
+
+// 关闭生产模式下给出的提示
+Vue.config.productionTip = false;
+
+Vue.use(VueApollo)
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+
+ //把时间戳改为正常可读的时间
+ export function renderTime(date) {
+  if(date !== null){
+      let dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, " ").replace(/\.[\d]{3}Z/, "");
+  }
+  return null;
+}
+//把毫秒数转换分
+export function getDuration(my_time) { 
+  if(my_time !== null){
+      return Math.floor(my_time / 1000 / 60);
+  }
+  return null;
+}
+export function sjTime(orderPlanInTime) {
+  var stringTime = renderTime(orderPlanInTime);
+  var timestamp1 = stringTime.replace(/-/g, "/");
+  return new Date(timestamp1).getTime();
+}
+//验证电话号码
+export function VerifyPhoneNumber(Phone) {
+  var myreg=/^(13[0-9]|14[5|7]|15[0|1|2|3|4|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$/;
+  if (!myreg.test(Phone)) {
+      return false;
+  } else {
+      return true;
+  }
+}
+export function isNumber(value) {
+  //验证是否为数字
+  var patrn = /^(-)?\d+(\.\d+)?$/;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+export function isIntegerNumber(value) {
+  //验证是否为整数
+  var patrn = /^\+?[1-9][0-9]*$/g;
+  if (patrn.exec(value) == null || value == "") {
+    return false;
+  } else {
+    return true;
+  }
+}
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

src/views/homepage/components/homepage.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>首页
+      
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>

src/views/homepage/router/index.js

@@ -0,0 +1,33 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+import homepage from '../components/homepage.vue'
+Vue.use(Router)
+
+const constantRouterMap = [
+  {
+    path: '/',
+    name: 'main',
+    meta: {title: '首页', code: 'xtpzgl'},
+    component: main,
+    redirect: {name: 'cargoResult'},
+    children: [
+      {path: 'homepage', name: 'homepage', meta: {code: 'xtpzgl-jggl'}, component: homepage},
+    ]
+  }
+];
+
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

src/views/inward/app.js

@@ -19,6 +19,14 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
+import 'xe-utils' 
+
+import VXETable from 'vxe-table'
+import 'vxe-table/lib/style.css'
+Vue.use(VXETable)
+Vue.prototype.$XModal = VXETable.modal
+
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

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

@@ -2,12 +2,8 @@
 <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">
+      <div class="form-box">
         <dil-form :formId="305" v-model="form"></dil-form>       
       </div>
     </div>
@@ -17,7 +13,7 @@
 						</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>
@@ -26,7 +22,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -52,7 +47,7 @@ export default {
         carrierId: this.form.carrierId
       };
           
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/addTruckPlan",
           plan
@@ -79,4 +74,14 @@ export default {
 </script>
 
 <style lang="scss">
+.form-box,
+.button-box
+{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

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

@@ -61,7 +61,7 @@
           </el-form-item>
         </el-form>
       </div>
-      <div class="form-box" style="margin-left: 16rem">
+      <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
       <el-drawer
@@ -111,7 +111,7 @@
         </div>
       </el-drawer>
     </div>
-    <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>
@@ -213,7 +213,7 @@ export default {
         requirementPlatformId: this.mapList4.wareHouseId
       };
       console.log(requiremnet);
-      this.$axios
+      this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then((res) => {
           if (res.data.code == 200) {
@@ -236,4 +236,17 @@ 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>

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

@@ -115,7 +115,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/receiveRequirement/" + scope.row.requirementId)
             .then((res) => {
               this.$router.go(0);
@@ -124,6 +124,7 @@ export default {
                   type: "success",
                   message: "接收成功!",
                 });
+                this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&test=1"
               } else {
                 this.$message({
                   message: "接收失败",
@@ -157,7 +158,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/finishTruckPlan/" + scope.row.planId)
             .then((res) => {
               if (res.data.code == "200") {
@@ -189,7 +190,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/deleteTruckPlan/" + scope.row.planId)
             .then((res) => {
               if (res.data.code == 200) {
@@ -222,7 +223,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/downTruckPlan", this.second.mapList)
             .then((res) => {
               if (res.data.code == 200) {
@@ -250,12 +251,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound {
-  .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

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

@@ -151,7 +151,7 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-              
+              this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&test=1"
               } else {
                 this.$message({
                   message: "下发失败",

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

@@ -42,7 +42,7 @@ export default {
   },
   methods: {
     information(){
-         this.$axios
+         this.axios
         .post("api/v1/ams/selectInwardPlanToUpdate/" + this.$route.params.planId)
         .then((res) => {
           res.data.data.forEach((e) => {
@@ -62,7 +62,7 @@ export default {
         carrierId: this.form.carrierId
       };
           
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/addTruckPlan",
           plan

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

@@ -45,7 +45,7 @@
   </el-form-item>
 </el-form>
 </div>
-      <div class="form-box" style="margin-left: 16rem">
+      <div class="form-box">
         <dil-form :formId="300" v-model="form"></dil-form>
       </div>
 <el-drawer
@@ -62,7 +62,7 @@
       <div v-show="a==2"><dilTable v-bind.sync="second1" @radio-change="currentRadioChange2" ></dilTable></div>
     </el-drawer>
     </div>
-    <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>
@@ -71,7 +71,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -105,7 +104,7 @@ export default {
   methods: {
        information() {
       //编辑
-      this.$axios
+      this.axios
         .post("/api/v1/ams/selectRequirement/" + this.$route.params.requirementId)
         .then((res) => {
           console.log(res.data.data)
@@ -176,7 +175,7 @@ export default {
         requirementWorkType:this.form.requirementWorkType,
       };
       console.log(requiremnet)
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/updateTruckRequirement",
           requiremnet
@@ -203,4 +202,17 @@ 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>

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

@@ -2,34 +2,40 @@
 <template>
 	<div id="endMaintenance">
 		<page-title>分解计划</page-title>
-    <div class="main">
-			<span class="text">待分解的计划</span>
-			<span class="a"></span>
-		</div>
     <dilTable v-bind.sync="first" >
 		</dilTable>
-    <div class="main">
-			<span class="text">选择线路</span>
-			<span class="a"></span>
-		</div>
-    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1">
-		</dilTable>
-		<div class="main">
-			<span class="text">分解</span>
-			<span class="a"></span>
-		</div>
+    <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>
+     <el-drawer
+      :visible.sync="linedrawer"
+      :direction="direction"
+      :before-close="handleClose"
+      size="40%"
+    >
+      <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()"  style="margin-bottom:15px">
+        <i class="el-icon-search"></i>查询
+      </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"
       :before-close="handleClose"
       size="30%"
     >
-      <el-input placeholder="请输入内容" v-model="input"  style="margin-top:10px;margin-left:20px" clearable> </el-input>
+      <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()"  style="margin-bottom:15px">
         <i class="el-icon-search"></i>查询
       </el-button>
-     <dilTable v-bind.sync="second" @radio-change="currentRadioChange" ></dilTable>    
-</el-drawer>
+   <dilTable v-bind.sync="second" @radio-change="currentRadioChange" ></dilTable>    
+    </el-drawer>
 		<div style="margin-left:0.625rem">
 			<vxe-toolbar>
 				<template #buttons>
@@ -43,11 +49,6 @@
 			@edit-closed="editClosedEvent"
       @edit-actived="editActivedEvent">
 			<vxe-table-column type="seq" width="60" title="序号"></vxe-table-column>
-			<vxe-table-column field="purchaseOrderNo" title="采购订单号" >
-        <template #edit="{ row }">
-              <vxe-input v-model="row.purchaseOrderNo" type="text" disabled></vxe-input>
-        </template>
-			</vxe-table-column>
 			<vxe-table-column field="planNo" title="运输计划号">
           <template #edit="{ row }">
               <vxe-input v-model="row.planNo" type="text" disabled></vxe-input>
@@ -66,14 +67,14 @@
       <vxe-input v-model="row.materialName" type="text" disabled></vxe-input>
       </template>
 			</vxe-table-column>
-			<vxe-table-column field="materialWeight" title="物资重量"
+			<vxe-table-column field="materialWeight" title="物资重量" width="100"
 				:edit-render="{}"
 				>
        <template #edit="{ row }">
       <vxe-input v-model="row.materialWeight" type="text"></vxe-input>
       </template>  
 			</vxe-table-column>
-      <vxe-table-column field="materialNumber" title="物资数量"
+      <vxe-table-column field="materialNumber" title="物资数量" width="100"
 				:edit-render="{}"
 				>
        <template #edit="{ row }">
@@ -94,14 +95,7 @@
             </template>
           </vxe-column>
 		</vxe-table>
-    	<div class="main">
-			<span class="text">选择订单类型</span>
-			<span class="a"></span>
-		</div>
-    <div class="form-box" style="margin-left: 16rem">
-        <dil-form :formId="318" v-model="form"></dil-form>
-      </div>
-		<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>
@@ -116,6 +110,8 @@ export default {
   },
   data() {
     return {
+      lineName:null,
+      linedrawer:false,
       tableData:[],
       direction: "rtl",
       input:'',
@@ -154,6 +150,9 @@ export default {
       this.selectRow = row
       console.log(row.purchaseOrderNo)
     },
+    drawerLine(){
+      this.linedrawer = true
+    },
     onclick(){
         this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input
     },
@@ -163,6 +162,7 @@ export default {
     },
     currentRadioChange1(selection){
       this.mapList0=selection
+      this.lineName = this.mapList0.lineName
       console.log(this.mapList0.lineId)
     },
    handleClose(done){
@@ -177,12 +177,12 @@ export default {
     },
     information() {
       //查看需求详情
-      this.$axios
+      this.axios
         .post(
           "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=2&carrierId=1&planId=" + this.$route.params.planId
         )
         .then((res) => {
-          console.log(res)
+            console.log(res)
             const planRow = res.data.data.list
             this.purchaseOrderNo = planRow[0].purchaseOrderNo,
             this.requirementNo = planRow[0].requirementNumber,
@@ -223,7 +223,7 @@ export default {
           mapList:this.$refs.xTable.getInsertRecords()
       };
       console.log(BmsTrainFreight)
-      this.$axios
+      this.axios
         .post("/api/v1/oms/addInwardOrder", BmsTrainFreight)
         .then((res) => {
           if (res.data.code == 200) {
@@ -241,11 +241,35 @@ export default {
     // 返回
     cancel() {
       console.log(this.sumNum(this.$refs.xTable.getInsertRecords(), 'materialWeight'))
-      // this.$router.go(-1);
     },
   },
 };
 </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;
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input{
+    width: 250px;
+    margin-right: 20px;
+  }
+}
 </style>

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

@@ -67,7 +67,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/oms/apportionInwardOrder", this.first.mapList)
             .then((res) => {
               if (res.data.code == 200) {
@@ -99,7 +99,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
             )
@@ -129,12 +129,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound {
-  .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

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

@@ -88,8 +88,8 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
-            .post("/api/v1/ams//receiveInwardPlan/" + scope.row.planId)
+          this.axios
+            .post("/api/v1/ams/receiveInwardPlan/" + scope.row.planId)
             .then((res) => {
               if (res.data.code == 200) {
                 this.$message({
@@ -126,7 +126,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/bms/deleteTrainSettlement/" + scope.row.requirementId
             )
@@ -161,7 +161,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/ams/addFixedAmsDispatchSaleOrder",
               this.first.mapList
@@ -172,7 +172,7 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-                this.$router.go(0);
+                this.first.requestUrl = ""
               } else {
                 this.$message({
                   message: "下发失败",
@@ -192,12 +192,13 @@ export default {
 };
 </script>
 <style lang="scss">
-.steel_inbound {
-  .sache {
-    height: 5rem;
-    display: flex;
-    align-items: center;
-    padding-left: 1.875rem;
+.steel_inbound{
+  .sache{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
   }
-}
 </style>

src/views/statisticalReport/app.js

@@ -15,6 +15,11 @@ import VueApollo from 'vue-apollo'
 
 import apollo from '@/config/apolloConfig.js'
 
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -0,0 +1,44 @@
+// 采购燃料新区汽运监控
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=7",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -0,0 +1,44 @@
+// 采购燃料老区汽运监控
+<template>
+  <div class="purchasFuelOldMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=6",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelOldMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

src/views/statisticalReport/components/purchaseAccessoriesMonitor.vue

@@ -0,0 +1,44 @@
+// 采购辅料汽运监控
+<template>
+  <div class="purchaseAccessoriesMonitor">
+    <div class="frameCalculation">
+      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      option: {
+        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=5",
+      },
+      input: "",
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchaseAccessoriesMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+  }
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -6,9 +6,10 @@ import routerBefore from '@/config/routerBefore.js'
 // 主要
 import main from '@/components/main.vue'
 // 系统配置管理
-import columnItem from '../components/columnItem.vue'
-import Ship_dynamic_table from '../components/Ship_dynamic_table.vue'
-import tableItem from '../components/tableItem.vue'
+import ShipDynamicTable from '../components/Ship_dynamic_table.vue'
+import purchaseAccessoriesMonitor from '../components/purchaseAccessoriesMonitor.vue'
+import purchasFuelOldMonitor from '../components/purchasFuelMonitor/purchasFuelOldMonitor.vue'
+import purchasFuelNewMonitor from '../components/purchasFuelMonitor/purchasFuelNewMonitor.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -19,9 +20,10 @@ const constantRouterMap = [
     component: main,
     redirect: {name: 'cargoResult'},
     children: [
-      {path: 'columnItem', name: 'columnItem', meta: {code: 'xtpzgl-jggl'}, component: columnItem},
-      {path: 'Ship_dynamic_table', name: 'Ship_dynamic_table', meta: {code: 'xtpzgl-yhgl'}, component: Ship_dynamic_table},
-      {path: 'tableItem', name: 'tableItem', meta: {code: 'xtpzgl-yhgl'}, component: tableItem},
+      {path: 'ShipDynamicTable', name: 'ShipDynamicTable', meta: {code: 'xtpzgl-yhgl'}, component: ShipDynamicTable},
+      {path: 'purchaseAccessoriesMonitor', name: 'purchaseAccessoriesMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchaseAccessoriesMonitor},
+      {path: 'purchasFuelOldMonitor', name: 'purchasFuelOldMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelOldMonitor},
+      {path: 'purchasFuelNewMonitor', name: 'purchasFuelNewMonitor', meta: {code: 'xtpzgl-yhgl'}, component: purchasFuelNewMonitor},
     ]
   }
 ];

文件目录.md

@@ -10,8 +10,8 @@
   * `config` 配置请求拦截器，同一处理报错方式。
   * `lib` 全局的公用组件存放位置。
   * `store` 是一个全局的共享数据库存储区域，就相当于是一个数据仓库。
-  * `tool` 自己编写的全局js工具文件夹。
-  * ``
+  * `utils` 自己编写的全局js工具文件夹。
+  * `views` 
 * `static` 静态html页面的css/js/img存放地，请勿轻易进行更改。
 * `test` 初始测试目录，本地测试类文件。
 * `.editorconfig` 定义和维护一致的编码样式。