Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -19,7 +19,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
 // let devModules = ['all'];
-let devModules = ['index','RMS'];
+// let devModules = ['index','inward','TMS','RMS']
+let devModules = ['index','SporadicManage','TMS']
+// let devModules = ['index','SporadicManage'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -56,21 +56,21 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
-  // "/api/v1": {
-  //   target: "http://192.168.1.108:8080",
+  // "/views/api/v1": {
+  //   target: "http://172.16.33.166:8080",
   //   ws: true,
   //   pathRewrite: {
-  //     "^/api/v1": "/api/v1"
+  //     "^/views/api/v1": "/api/v1"
   //   }
   // },
   "/views/api/v1": {
-    target: "http://localhost: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/editGatepost.vue

@@ -7,6 +7,7 @@
     <el-form-item>
     <div class="form1">
     <label class="el-form-item__label" style="width: 100px">门岗名称</label>
+
          <el-input
         placeholder=""
         v-model="gatepostName"

src/views/RMS/components/editTruckCalculate.vue

@@ -237,6 +237,13 @@ makeSure() {
   justify-content: center;
   width: 400px;
 }
+.inputBox{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  width: 400px;
+}
 .button-box {
   padding: 20px 30px;
   margin-left: 460px;

src/views/SporadicManage/app.html

@@ -0,0 +1,21 @@
+<!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="工业互联网平台 iCore-ICP" name="keywords">
+    <meta content="工业互联网平台 iCore-ICP" name="description">
+    <title>加载中... - 工业互联网平台 iCore-ICP</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/SporadicManage/app.js

@@ -0,0 +1,39 @@
+// 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;
+
+// 注册表格的全局组件
+import DilCommonUI from "@/components/DilCommonUI";
+Vue.use(DilCommonUI);
+
+Vue.use(VueApollo)
+
+const apolloProvider = new VueApollo({
+    defaultClient: apollo
+})
+/* eslint-disable no-new */
+new Vue({
+  el: '#app',
+  router,
+  store,
+  components: { App },
+  provide: apolloProvider.provide(),
+  template: '<App/>'
+});

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

@@ -0,0 +1,41 @@
+//进厂
+<template>
+  <!-- 零星物资进厂作业页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/grossWeight.vue

@@ -0,0 +1,41 @@
+//计毛
+<template>
+  <!-- 零星物资计毛作业页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/outFactory.vue

@@ -0,0 +1,41 @@
+//出厂
+<template>
+  <!-- 零星物资出厂作业页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=388&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/tareWeight.vue

@@ -0,0 +1,41 @@
+//计皮
+<template>
+  <!-- 零星物资计皮作业页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option">      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/sporadicMaterial/sporadicEnfactory/unload.vue

@@ -0,0 +1,41 @@
+//卸货
+<template>
+  <!-- 零星物资卸货卸货实绩页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

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

@@ -0,0 +1 @@
+//进厂

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

@@ -0,0 +1 @@
+//毛重

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

@@ -0,0 +1 @@
+//装货

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

@@ -0,0 +1 @@
+//出厂

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

@@ -0,0 +1 @@
+//计皮

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

@@ -0,0 +1,591 @@
+//新增运输预约
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+    <div class="forwardingUnit from">
+      <span class="text">发货单位：</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">收货单位：</span>
+      <el-input v-model="receiveName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">卸货点：</span>
+      <el-input v-model="unloadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+    <div class="orderType from">
+      <span class="text">流向：</span>
+      <el-select v-model="orderType" placeholder="请选择">
+        <el-option
+          v-for="item in orderTypeList"
+          :key="item.value"
+          :label="item.label" 
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="lineId from">
+      <span class="text">选择路线：</span>
+      <el-input v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择承运商：</span>
+       <el-autocomplete
+      class="inline-input"
+      v-model="state2"
+      :fetch-suggestions="querySearch"
+      placeholder="请输入承运商名称"
+      :trigger-on-focus="false"
+      @select="handleSelect"
+      @input="oninput"
+    >
+  <template slot-scope="{ item }">
+    <div class="name">{{ item.value }}</div>
+  </template>
+    </el-autocomplete>
+      </div>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择物资：</span>
+        <el-button type="primary" @click=" table = true" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+      <div class="switch" v-if="tableData.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="重量"
+          inactive-text="件数"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="重量" inactive-text="件数">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <!-- 物资表格 -->
+    <div class="truckListTable">
+    <div class="selectionTable">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.label !== '件数'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                ></el-input>
+              </template>
+              <!-- 物资重量 -->
+               <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  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>
+            </template>
+          </template>
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click.native.prevent="deleteRow(scope.$index, tableData)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    </div>
+    <!-- 物资模态框 -->
+    <el-drawer
+      title="选择物资信息"
+      :visible.sync="table"
+      direction="rtl"
+      size="35%"
+      :show-close="false"
+    >
+      <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 @click="open">取消</el-button>
+      <el-button type="primary" @click="makeSure1">确定</el-button>
+      <div class="tablecls">
+        <!-- 查询所有的物资 -->
+        <dilTable v-bind.sync="materialOptions" @selection-change="selectionChange">
+        </dilTable>
+      </div>
+    </el-drawer>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        style="margin-top: 0.625rem; margin-left: 1.25rem"
+        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="receiveOptions"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+        ></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+        ></dilTable>
+      </div>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="makeSure">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      receiveName:'',
+      state2:null,
+      restaurants: [],
+       orderTypeList:[
+        {
+          value:12,
+          label:'进厂'
+        },{
+          value:13,
+          label:'出厂'
+        }
+      ],
+      orderType:12,
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //物资模态框开关
+      table: false,
+      //物资表格表头
+      tableTop: [
+        {
+          prop: "materialCode",
+          label: "物资编码",
+          width: "160",
+        },
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: "140",
+        },
+        {
+          prop: "Specification",
+          label: "规格型号",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        },
+          {
+          prop: "materialPriority",
+          label: "装卸货优先级",
+          slot: true,
+        },
+      ],
+      // 收货单位ID
+      receiveId:null,
+      //承运商ID
+      carrierId:null,
+      //物资表格数据
+      tableData: [],
+      selectionList1: [],
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      //订单类别
+      orderType:12,
+      a: 1,
+      direction: "rtl",
+      input: "",
+      //物资模态框
+      materialOptions:{
+          requestUrl:
+            "/api/v1/uc/selectAllMaterialName?apiId=395",
+           selectionType: "select",
+      },
+      secend: {
+        requestUrl:
+          "/api/v1/uc/querySupplierByLike?apiId=247",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      receiveOptions:{
+        requestUrl:
+          "/api/v1/uc/queryConsigneeByLike?apiId=396",
+          selectionType:"radio",
+      },
+      third:{
+        requestUrl:
+        "/api/v1/uc/getCarrierMesByLike?apiId=244",
+        selectionType:"radio",
+        carriermapList:[]
+      },
+      unloadPoint: {
+        requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
+        selectionType: "radio",
+        unloadMapList:[]
+      },
+      line: {
+        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        selectionType: "radio",
+      },
+      row: {},
+    };
+  },
+  watch: {
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      }
+    },
+  },
+  methods: {
+    handleSelect(item){
+      this.carrierId = item.carrierId
+      item.carrierName = this.state2
+    },
+    oninput(){
+      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
+        if(res.data.code == "200"){
+          console.log(res)
+          this.restaurants = res.data.data
+        }
+      })
+    },
+    //搜索
+    querySearch(queryString, cb) {
+        var restaurants = this.restaurants;
+        console.log(this.restaurants,"this.restaurants");
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log(results,"results");
+        cb(results);
+      },
+      createFilter(queryString) {
+        return (restaurants) => {
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
+    //删除行
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // 返回主界面
+    makeSure1() {
+      console.log(this.selectionList1)     
+      this.selectionList1.forEach((e) => {
+        var addmap = {
+          materialCode: e.materialCode,
+          materialName: e.materialName,
+          Specification: e.materialSpecification+e.materialModel,
+          orderMaterialWeight: null,        
+          materialId: e.materialId,
+          materialPriority:e.materialPriority,
+        };
+        this.tableData.push(addmap);
+        this.selectionList1 = [];
+        this.table = false;
+      }); 
+    },
+    //取消模态框多选
+    open() {
+      if (this.selectionList1.length != 0) {
+        this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.selectionList1 = [];
+            this.table = false;
+          })
+          .catch(() => {});
+      } else {
+        this.table = false;
+      }
+    },
+    onClick(index) {
+      this.tableData.splice(index, 1);
+    },
+      // 返回选中的物资信息
+    selectionChange(selection) {
+      this.selectionList1 = [];
+      this.selectionList1 = selection;
+    },
+    onclick(a) {
+      if (a == 1) {
+        this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input;
+      } else if (a == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId +
+          "&index=" +
+          this.input;
+      } else if (a == 3) {
+        this.third.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
+          this.input;
+      } else if (a == 4) {
+        this.third.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.input;
+      } else if (a == 5) {
+        this.option.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+      }
+    },
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/importedFuel/transportReserveRan");
+    },
+    currentRadioChange1(selection) {
+      console.log(selection);
+      this.receiveName = selection.consigneeCompanyName;
+      this.receiveId = selection.consigneeId;
+    },
+    currentRadioChange2(selection) {
+      this.supplierName = selection.supplierName;
+      this.supplierId = selection.supplierId;
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange3(selection) {
+      this.carriermapList = [];
+      this.carriermapList = selection;
+    },
+    // 确认
+    makeSure() {
+      console.log(this.tableData)
+        let amsOrder = {
+          supplierId:this.supplierId,
+          unloadPointId:this.unloadPointId,
+          lineId:this.lineId,
+          orderType:this.orderType,
+          carrierId: this.carrierId,
+          receiveId: this.receiveId,
+          mapList: this.tableData,
+        };
+        console.log(amsOrder);
+      
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
+          if (res.data.code == "200") {
+            this.$router.go(-1)
+          }
+        });
+      }
+    },
+};
+</script>
+
+<style lang="scss" >
+.contractDetails {
+  width: 100%;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+.remark {
+  .text {
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.lineId {
+  .text {
+    display: flex;
+    width: 10rem;
+    text-align: right;
+  }
+  .el-input{
+    width: 20%;
+  }
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.orderType{
+  .text{
+    display: flex;
+    width: 5.625rem;
+    text-align: right;
+  }
+  .el-select{
+  width: 100%;
+}
+}
+.switch {
+  width: 100%;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 6.875rem;
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    width: 20%;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.el-input{
+  width: 20%;
+}
+
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 6.25rem;
+}
+</style>

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

@@ -0,0 +1 @@
+//编辑运输预约

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

@@ -0,0 +1,154 @@
+//运输预约展现
+<template>
+  <!-- 零星物资运输预约 -->
+  <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">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <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"
+          >
+            <template slot-scope="scope">
+              <!-- <el-button @click="updateClick(scope.row.orderId)" type="text" size="small">
+                修改
+              </el-button> -->
+              <el-button @click="deleteClick(scope)" type="text" size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12",
+        // 控制显示多选列
+        selectionType: "select",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=12",
+      },
+      selection: [],
+    };
+  },
+  methods: {
+    //获取选中的订单
+    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;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }, // 下发
+    // 下发
+    sendClick() {
+      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
+        )
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.option1.requestUrl =
+              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12";
+            this.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("addSporadicTransportAppoint");
+    },
+    //修改
+    updateClick(orderId) {
+      this.$router.push(
+        "/importedIngredients/transportReserveFuEdit/" + orderId
+      );
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .el-input {
+      width: 250px;
+      margin-right: 20px;
+    }
+  }
+}
+</style>

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

@@ -0,0 +1 @@
+//新增运输派单

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

@@ -0,0 +1,359 @@
+//运输派单
+<template>
+  <div class="transportOrder">
+    <div class="transportOrder_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="Issue" v-if="activeName == 'option'">
+        <i class="el-icon-download"></i>下发
+      </el-button>
+    </div>
+    <div class="transportOrder_bottom">
+      <el-tabs v-model="activeName">
+        <!-- 未下发 -->
+        <el-tab-pane label="未下发" name="option">
+          <dilTable
+            v-bind.sync="option"
+            ref="table"
+            @selection-change="selectionChange"
+          >
+            <el-table-column fixed="right" label="操作" width="150">
+              <template slot-scope="scope">
+                <el-button @click="detailclick(scope.row)" type="text">
+                  物资详情
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="addTruck(scope.row, 1)"
+                  v-if="!scope.row.capacityNumber"
+                >
+                  添加运力
+                </el-button>
+                <el-button type="text" @click="addTruck(scope.row, 2)" v-else>
+                  修改
+                </el-button>
+              </template>
+            </el-table-column>
+            <!-- 物资详情 -->
+            <el-table-column type="expand" width="1">
+              <template slot-scope="props">
+                <el-form
+                  label-position="center"
+                  inline
+                  class="demo-table-expand"
+                >
+                  <div v-if="false">{{ props }}</div>
+                  <div>
+                    <el-table :data="tableData">
+                      <el-table-column
+                        v-for="(item, i) in tableHead"
+                        :key="i"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :width="item.width"
+                      ></el-table-column>
+                    </el-table>
+                  </div>
+                </el-form>
+              </template>
+            </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+        <!-- 已下发 -->
+        <el-tab-pane label="已下发" name="first">
+          <dilTable v-bind.sync="first"></dilTable>
+        </el-tab-pane>
+        <!-- 已接收 -->
+        <el-tab-pane label="已接收" name="Received">
+          <dilTable v-bind.sync="Received"></dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <el-dialog
+      title="请选择车辆"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      width="30%"
+      show-close
+      modal
+      lock-scroll
+    >
+      <el-input placeholder="请输入内容" v-model="capacityNumber" disabled>
+      </el-input>
+      <el-button type="primary" @click="onDrawer">浏 览</el-button>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="determine">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <el-drawer
+      title="请选择车辆信息"
+      :visible.sync="drawer"
+      :direction="direction"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      :wrapperClosable="false"
+      modal
+      show-close
+    >
+      <div class="drawer_top">
+        <el-input placeholder="请输入内容" v-model="inputText" clearable>
+        </el-input>
+        <el-button type="primary" class="btn" @click="inputClick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_bottom">
+        <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange"
+        ></dilTable>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      //模态窗的框计算
+      inputText: null,
+      //是否弹出对话框
+      dialogVisible: false,
+      //输入框的值
+      input: "",
+      //选项卡的当前选中的值
+      activeName: "option",
+      //未下发的表格
+      option: {
+        requestUrl:
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3",
+        selectionType: "select",
+      },
+      //已下发的表格
+      first: {
+        requestUrl:
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4",
+      },
+      //车辆信息的表格
+      truck: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        // 控制显示当选列
+        selectionType: "radio",
+      },
+      Received:{
+        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5",
+      },
+      //物资信息的数据
+      tableData: [],
+      //物资信息的表头
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 200,
+        },
+        {
+          prop: "materialModel",
+          label: "规格型号",
+          width: 200,
+        },
+        {
+          prop: "weightNum",
+          label: "物资数量",
+          width: 200,
+        },
+      ],
+      //当前选中的订单id
+      selectOrderId: null,
+      //选中的车辆号
+      capacityNumber: "",
+      //选中的运力id
+      capacityId: null,
+      //是否关闭模态框
+      drawer: false,
+      //模态框从右往左打开
+      direction: "rtl",
+      //多选的选中的订单id
+      selectionList: [],
+      //区别点击的是添加运力，还是修改
+      index: null,
+    };
+  },
+  methods: {
+    //下发
+    Issue() {
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择订单！",
+          type: "warning",
+        });
+      } else {
+        this.selectionList.forEach((e) => {
+          if (!e.capacityNumber) {
+            this.$message({
+              message: "订单号为: " + e.orderNumber + "没有车牌号！",
+              type: "warning",
+            });
+          } else {
+            this.axios.post("/api/v1/oms/dispatchOrder",{mapList:this.selectionList}).then((res) => {
+              if (res.data.code == "200") {
+                this.$message({
+                  message: "下发成功",
+                  type: "success",
+                });
+                this.option.requestUrl =
+                  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&i=" +
+                  new Date();
+                  this.first.requestUrl =
+                  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&i=" +
+                  new Date();
+              }
+            });
+          }
+        });
+      }
+    },
+    //对话框点击确定，执行增加车牌号
+    determine() {
+      this.axios
+        .post("/api/v1/oms/updateOmstruckOrder", {
+          orderId: this.selectOrderId,
+          capacityId: this.capacityId,
+        })
+        .then((res) => {
+          if (res.data.code == "200") {
+            if (this.index == 1) {
+              this.$message({
+                message: "添加成功！",
+                type: "success",
+              });
+            } else if (this.index == 2) {
+              this.$message({
+                message: "修改成功！",
+                type: "success",
+              });
+            }
+            this.dialogVisible = false;
+            this.option.requestUrl =
+              "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&i=" +
+              new Date();
+          }
+        });
+    },
+    //多选的选中的数据
+    selectionChange(selection) {
+      this.selectionList = [];
+      selection.forEach((element) => {
+        this.selectionList.push({
+          orderId: element.orderId,
+          capacityNumber: element.capacityNumber,
+          orderNumber: element.orderNumber,
+        });
+      });
+    },
+    //模态窗的框计算
+    inputClick() {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&con=" +
+        this.inputText;
+    },
+    //单选按钮选中的值
+    currentRadioChange(row) {
+      this.capacityId = row.capacityId;
+      this.capacityNumber = row.capacityNumber;
+    },
+    //打开模态窗口
+    onDrawer() {
+      this.drawer = true;
+    },
+    //弹出消息窗口
+    addTruck(row, index) {
+      this.index = index;
+      if (index == 1) {
+        this.selectOrderId = row.orderId;
+        this.dialogVisible = true;
+      } else if (index == 2) {
+        this.selectOrderId = row.orderId;
+        this.capacityNumber = row.capacityNumber;
+        this.dialogVisible = true;
+      }
+    },
+    // 查看物资详情
+    detailclick(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      this.materialDetails(row.orderId);
+    },
+    //框计算
+    onclick() {
+      if (this.activeName == "option") {
+        this.option.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" +
+          this.input;
+      } else {
+        this.first.requestUrl = "con=" + this.input;
+      }
+    },
+    //查看当前订单的物资信息
+    materialDetails(orderId) {
+      this.axios
+        .post("/api/v1/uc/getOrderMaterialMesByOrderId/" + orderId)
+        .then((res) => {
+          if (res.data.code == "200") {
+            this.tableData = res.data.data;
+          }
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+
+.transportOrder {
+  .transportOrder_top {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-input{
+  width: 20%;
+}
+  }
+  .drawer_top {
+    width: 100%;
+    height: 50px;
+    padding-left: 20px;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

src/views/importedIngredients/components/transportReserveFuAdd.vue → src/views/SporadicManage/components/steelReturn/transportAppoint/addSteelReturnTransportAppoint.vue

@@ -1,27 +1,20 @@
+//新增运输预约
 <template>
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-
     <div class="main">
       <el-divider content-position="left">新增运输预约</el-divider>
     </div>
-
-    <div class="material from">
-      <span class="text">物资：</span>
-      <el-input v-model="materialName" disabled> </el-input>
-      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
-    </div>
-
     <div class="forwardingUnit from">
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-    <div class="remark from">
-      <span class="text">船名：</span>
-      <el-input v-model="remark" @blur="onBlur"> </el-input>
-      <span class="span"></span>
+    <div class="forwardingUnit from">
+      <span class="text">收货单位：</span>
+      <el-input v-model="receiveName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
     <div class="forwardingUnit from">
       <span class="text">卸货点：</span>
@@ -33,19 +26,33 @@
       <el-input v-model="lineName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
     </div>
-    <div class="contractTitle from">
-      <dil-form :formId="219" v-model="form1"></dil-form>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择承运商：</span>
+       <el-autocomplete
+      class="inline-input"
+      v-model="state2"
+      :fetch-suggestions="querySearch"
+      placeholder="请输入承运商名称"
+      :trigger-on-focus="false"
+      @select="handleSelect"
+      @input="oninput"
+    >
+  <template slot-scope="{ item }">
+    <div class="name">{{ item.value }}</div>
+  </template>
+    </el-autocomplete>
+      </div>
     </div>
     <div class="truckList1">
       <div class="truckList from">
-        <span class="text">选择车辆：</span>
-        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+        <span class="text">选择物资：</span>
+        <el-button type="primary" @click=" table = true" class="truckBtn"
           >浏览</el-button
         >
       </div>
     </div>
-    <!-- 车辆表格 -->
-    <div class="switch" v-if="selectionList.length > 0">
+      <div class="switch" v-if="tableData.length > 0">
       <el-tooltip placement="top">
         <div slot="content">下面表格已有数据，不能进行更改！！！</div>
         <el-switch
@@ -64,15 +71,15 @@
         </el-switch>
       </el-tooltip>
     </div>
+    <!-- 物资表格 -->
     <div class="truckListTable">
+    <div class="selectionTable">
       <el-table
-        :data="selectionList"
+        :data="tableData"
         border
         style="width: 100%"
         highlight-current-row
       >
-        <el-table-column type="index" width="50" label="序号" align="center">
-        </el-table-column>
         <el-table-column
           v-for="(item, i) in tableTop"
           :key="i"
@@ -81,21 +88,21 @@
           align="center"
           show-overflow-tooltip
         >
-          <template slot="scope" v-if="item.th_name !== '件数'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.th_name !== '重量'">
+          <template slot="scope" v-if="item.label !== '件数'">
             <span>{{ item.label }}</span>
           </template>
           <!-- 插入输入框 -->
           <template slot-scope="scope">
             <template v-if="item.slot">
+              <!-- 物资件数 -->
               <template v-if="item.prop == 'orderMaterialNumber'">
                 <el-input
+                  class="textinput"
                   v-model.number="scope.row.orderMaterialNumber"
                 ></el-input>
               </template>
-              <template v-if="item.prop == 'orderMaterialWeight'">
+              <!-- 物资重量 -->
+               <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
@@ -106,16 +113,40 @@
             </template>
           </template>
         </el-table-column>
-
+        <!-- 操作列 -->
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="onClick(scope.$index)"
-              >删除</el-button
-            >
+            <el-button
+              @click.native.prevent="deleteRow(scope.$index, tableData)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
+    </div>
+    <!-- 物资模态框 -->
+    <el-drawer
+      title="选择物资信息"
+      :visible.sync="table"
+      direction="rtl"
+      size="35%"
+      :show-close="false"
+    >
+      <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 @click="open">取消</el-button>
+      <el-button type="primary" @click="makeSure1">确定</el-button>
+      <div class="tablecls">
+        <!-- 查询所有的物资 -->
+        <dilTable v-bind.sync="materialOptions" @selection-change="selectionChange">
+        </dilTable>
+      </div>
+    </el-drawer>
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
       <el-input
@@ -132,9 +163,9 @@
       >
         <i class="el-icon-search"></i>查询
       </el-button>
-      <div v-show="a == 1">
+       <div v-show="a == 1">
         <dilTable
-          v-bind.sync="frist"
+          v-bind.sync="receiveOptions"
           @radio-change="currentRadioChange1"
         ></dilTable>
       </div>
@@ -165,7 +196,7 @@
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+      <el-button type="primary" @click="makeSure">确认</el-button>
     </div>
   </div>
 </template>
@@ -175,24 +206,33 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      receiveName:'',
+      state2:null,
+      restaurants: [],
+      orderType:12,
       // 线路名称
       lineName: "",
       //线路id
       lineId: null,
       // 件数与重量的开关
       value: false,
-      //船名
-      remark: null,
-      // 车辆表格表头
+    //   物资模态框开关
+      table: false,
+      // 物资表格表头
       tableTop: [
         {
-          prop: "capacityNumber",
-          label: "车牌号",
+          prop: "materialCode",
+          label: "物资编码",
+          width: "160",
+        },
+        {
+          prop: "materialName",
+          label: "物资名称",
           width: "140",
         },
         {
-          prop: "carrierName",
-          label: "承运商",
+          prop: "Specification",
+          label: "规格型号",
           width: "140",
         },
         {
@@ -201,12 +241,13 @@ export default {
           slot: true,
         },
       ],
-      //车辆表格数据
-      selectionList: [],
-      // 表单
-      form1: {},
-      //采购订单id
-      purchaseOrderId: "",
+      // 收货单位ID
+      receiveId:null,
+      //承运商ID
+      carrierId:null,
+      //物资表格数据
+      tableData: [],
+      selectionList1: [],
       //物资名称
       materialName: "",
       //发货单位名称
@@ -224,30 +265,39 @@ export default {
       a: 1,
       direction: "rtl",
       input: "",
-      frist: {
-        requestUrl: "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050",
-        selectionType: "radio",
-        mapList1: [],
+      //物资模态框
+      materialOptions:{
+          requestUrl:
+            "/api/v1/uc/queryMaterialByLike?apiId=395&startNum=" + '0801',
+           selectionType: "select",
       },
       secend: {
         requestUrl:
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=",
+          "/api/v1/uc/querySupplierByLike?apiId=247",
         selectionType: "radio",
         mapList2: [],
       },
-      third: {
-        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
-        selectionType: "select",
-        mapList3: [],
+      receiveOptions:{
+        requestUrl:
+          "/api/v1/uc/queryConsigneeByLike?apiId=396",
+          selectionType:"radio",
+      },
+      third:{
+        requestUrl:
+        "/api/v1/uc/getCarrierMesByLike?apiId=244",
+        selectionType:"radio",
+        carriermapList:[]
       },
       unloadPoint: {
         requestUrl: "/api/v1/uc/getUnloadingMesByLike?apiId=374",
         selectionType: "radio",
+        unloadMapList:[]
       },
       line: {
         requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
         selectionType: "radio",
       },
+      row: {},
     };
   },
   watch: {
@@ -270,42 +320,76 @@ export default {
     },
   },
   methods: {
-    onClick(index) {
-      this.selectionList.splice(index, 1);
+    handleSelect(item){
+      this.carrierId = item.carrierId
+      item.carrierName = this.state2
     },
-    onBlur() {
-      this.getPurchaseOrderNo();
+    oninput(){
+      this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+this.state2).then((res)=>{
+        if(res.data.code == "200"){
+          this.restaurants = res.data.data
+        }
+      })
     },
-    getPurchaseOrderNo() {
-      let map = {
-        materialId: this.materialId,
-        supplierId: this.supplierId,
-      };
-      if (this.remark) {
-        map.remark = this.remark;
-      }
-      console.log(this.map);
-      if (this.materialId && this.supplierId) {
-        this.$axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
-          console.log(res);
-          if (res.data.code == "200") {
-            if (res.data.data == null) {
-              this.$message({
-                message: "没有匹配的采购订单号!",
-                type: "warning",
-              });
-              this.form1 = [];
-            } else {
-              this.remark = res.data.data.remark;
-              this.purchaseOrderId = res.data.data.purchaseOrderId;
-              this.form1 = { purchaseOrderNo: res.data.data.purchaseOrderNo };
-            }
-          } else {
-            this.$message.error("请求失败");
-          }
-        });
+    //搜索
+    querySearch(queryString, cb) {
+        var restaurants = this.restaurants;
+        console.log(this.restaurants,"this.restaurants");
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log(results,"results");
+        cb(results);
+      },
+      createFilter(queryString) {
+        return (restaurants) => {
+          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+      },
+    //删除行
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    // 返回主界面
+    makeSure1() {
+      console.log(this.selectionList1)     
+      this.selectionList1.forEach((e) => {
+        var addmap = {
+          materialCode: e.materialCode,
+          materialName: e.materialName,
+          Specification: e.materialSpecification+e.materialModel,
+          orderMaterialWeight: null,        
+          materialId: e.materialId,
+        };
+        this.tableData.push(addmap);
+        this.selectionList1 = [];
+        this.table = false;
+      }); 
+    },
+    //取消模态框多选
+    open() {
+      if (this.selectionList1.length != 0) {
+        this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.selectionList1 = [];
+            this.table = false;
+          })
+          .catch(() => {});
+      } else {
+        this.table = false;
       }
     },
+    onClick(index) {
+      this.tableData.splice(index, 1);
+    },
+      // 返回选中的物资信息
+    selectionChange(selection) {
+      this.selectionList1 = [];
+      this.selectionList1 = selection;
+    },
     onclick(a) {
       if (a == 1) {
         this.frist.requestUrl =
@@ -332,26 +416,19 @@ export default {
     ondrawer(num) {
       this.drawer = true;
       this.a = num;
-      if (num == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
-          this.materialId;
-      }
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/importedIngredients/transportReserveFu");
+      this.$router.push("/importedFuel/transportReserveRan");
     },
     currentRadioChange1(selection) {
-      this.input = null;
-      this.materialName = selection.materialName;
-      this.materialId = selection.materialId;
-      this.getPurchaseOrderNo();
+      console.log(selection);
+      this.receiveName = selection.consigneeCompanyName;
+      this.receiveId = selection.consigneeId;
     },
     currentRadioChange2(selection) {
       this.supplierName = selection.supplierName;
       this.supplierId = selection.supplierId;
-      this.getPurchaseOrderNo();
     },
     currentRadioChange4(selection) {
       this.unloadPointId = selection.warehouseId;
@@ -362,120 +439,30 @@ export default {
       this.lineId = selection.lineId;
     },
     currentRadioChange3(selection) {
-      this.selectionList = [];
-      this.selectionList = selection;
+      this.carriermapList = [];
+      this.carriermapList = selection;
     },
     // 确认
-    onClickConfirm() {
-      var state = 0;
-      if (
-        this.materialId &&
-        this.supplierId &&
-        this.form1.purchaseOrderId &&
-        this.unloadPointId &&
-        sjTime(this.form1.orderEntryTime) &&
-        this.lineId
-      ) {
-        state = 1;
-      } else {
-        if (!this.materialId) {
-          this.$message({
-            message: "请选择物资!",
-            type: "warning",
-          });
-        } else if (!this.supplierId) {
-          this.$message({
-            message: "请选择发货单位!",
-            type: "warning",
-          });
-        } else if (!this.purchaseOrderId) {
-          this.$message({
-            message: "没有匹配的采购订单号!",
-            type: "warning",
-          });
-        } else if (!this.unloadPointId) {
-          this.$message({
-            message: "请选择卸货地点!",
-            type: "warning",
-          });
-        } else if (!this.lineId) {
-          this.$message({
-            message: "请选择运输路线!",
-            type: "warning",
-          });
-        } else if (!sjTime(this.form1.orderEntryTime)) {
-          this.$message({
-            message: "请选择预估进厂时间!",
-            type: "warning",
-          });
-        }
-      }
-      if (this.selectionList.length == 0) {
-        this.$message({
-          message: "请选择车辆!",
-          type: "warning",
-        });
-        state = 0;
-      } else {
-        this.selectionList.forEach((e) => {
-          if (e.orderMaterialNumber || e.orderMaterialWeight) {
-            if (
-              isNumber(e.orderMaterialNumber) ||
-              isNumber(e.orderMaterialWeight)
-            ) {
-              if (
-                isIntegerNumber(e.orderMaterialNumber) ||
-                isIntegerNumber(e.orderMaterialWeight)
-              ) {
-                state = 1;
-              } else {
-                this.$message({
-                  message: "件数(重量)只能是整数!",
-                  type: "warning",
-                });
-                state = 0;
-              }
-            } else {
-              this.$message({
-                message: "件数(重量)只能是数字!",
-                type: "warning",
-              });
-              state = 0;
-            }
-          } else {
-            this.$message({
-              message: "件数(重量)不能为空!",
-              type: "warning",
-            });
-            state = 0;
-          }
-        });
-      }
-
-      if (state == 1) {
-        let map = {
-          materialId: this.materialId,
-          supplierId: this.supplierId,
-          purchaseOrderId: this.purchaseOrderId,
-          unloadPointId: this.unloadPointId,
-          orderEntryTime: sjTime(this.form1.orderEntryTime),
-          driverCapacityIdList: this.selectionList,
-          orderType: 5,
-          lineId: this.lineId,
+    makeSure() {
+      console.log(this.tableData)
+        let amsOrder = {
+          supplierId:this.supplierId,
+          unloadPointId:this.unloadPointId,
+          lineId:this.lineId,
+          orderType:12,
+          carrierId: this.carrierId,
+          receiveId: this.receiveId,
+          mapList: this.tableData,
         };
-        console.log(map, map);
-        this.$axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+        console.log(amsOrder);
+        debugger
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
-            this.$message({
-              message: "添加成功!",
-              type: "success",
-            });
-            this.$router.push("/importedIngredients/transportReserveFu");
+            this.$router.push("/steelReturn/steelTransportAppoint");
           }
         });
       }
     },
-  },
 };
 </script>
 
@@ -511,6 +498,13 @@ export default {
     text-align: right;
   }
 }
+.orderType{
+  .text{
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
 .switch {
   width: 100%;
   height: 2.5rem;

src/views/SporadicManage/components/steelReturn/transportAppoint/editTransportAppoint.vue

@@ -0,0 +1 @@
+//编辑运输预约

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

@@ -0,0 +1,168 @@
+//运输预约展现
+<template>
+  <!-- 钢材退货运输预约 -->
+  <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" >
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+       <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">
+            <template slot-scope="scope">
+              <el-button @click="sendClick(1,scope.row.orderId)"  type="text" size="small">
+                下发
+              </el-button>
+              <el-button @click="updateClick(scope.row.orderId)" type="text" size="small">
+                修改
+              </el-button>
+              <el-button @click="deleteClick(scope.row.orderId, scope.row.capacityNumber)" type="text" size="small">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2">
+           <el-table-column fixed="right" align="center" label="操作" width="120">
+            <template slot-scope="scope">
+              <el-button @click="CloseClick(scope.row.orderId)"  type="text" size="small">
+               关闭
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12",
+        // 控制显示多选列
+        selectionType: "select",
+        maplist:[]
+      },
+       option2: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=14",
+      },
+      selection:[],
+    };
+  },
+  methods: {
+    //获取选中的订单
+    selectionChange(selection){
+      this.selection = [];
+      this.maplist = selection
+      
+    },
+    onclick() {
+      if(this.activeName == "first"){
+        this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=14&con=" + this.input;
+      }else{
+        this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=14&con=" + this.input;
+      }
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+     // 下发
+    sendClick() {
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+         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.arr[0].text_prop);
+   
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+    // 删除
+    deleteClick(row) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+         this.axios
+            .post(
+               "/api/v1/ams/deleteSporadicOrders",row
+            )
+        .then((res) => {
+          if(res.data.code == '200'){
+            this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12"
+          }  
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/steelReturn/addTransportAppoint");
+    },
+    //修改
+    updateClick(orderId) {
+      this.$router.push("/importedIngredients/transportReserveFuEdit/" + orderId);
+    },
+
+  },
+};
+</script>
+<style lang='scss' scoped>
+   .homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/importedIngredients/components/truckEnfactoryFuResult.vue → src/views/SporadicManage/components/steelReturn/transportExcute/enFactory.vue

@@ -1,5 +1,6 @@
+//进厂
 <template>
-  <!-- 辅料进厂作业页面 -->
+  <!-- 钢材进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
@@ -52,18 +53,6 @@ export default {
     insertClick() {
       this.$router.push("/tmsTruck/truckLoadResultAdd/");
     },
-    // deleteclick(scope) {
-    //   let pathId = scope;
-    //   this.$axios
-    //     .post("/api/v1/tms/operationPath/operationPathDelete?pathId=" + pathId)
-    //     .then((res) => {
-    //       this.$message({
-    //         message: "删除成功",
-    //         type: "success",
-    //       });
-    //       this.$router.go(0);
-    //     });
-    // },
     deleteClick(resultId) {
       
       this.$confirm("是否删除", "提示", {

src/views/importedIngredients/components/truckJiPiFuResult.vue → src/views/SporadicManage/components/steelReturn/transportExcute/grossWeight.vue

@@ -1,5 +1,6 @@
+//计毛
 <template>
-  <!-- 辅料计皮实绩页面 -->
+  <!-- 钢材退货计毛实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>

src/views/importedIngredients/components/truckLeaveFactoryFuResult.vue → src/views/SporadicManage/components/steelReturn/transportExcute/outFactory.vue

@@ -1,5 +1,6 @@
+//出厂
 <template>
-  <!-- 辅料出厂作业页面 -->
+  <!-- 钢材退货出厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>

src/views/SporadicManage/components/steelReturn/transportExcute/tareWeight.vue

@@ -0,0 +1,46 @@
+//计皮
+<template>
+  <!-- 钢材退货计皮实绩页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option">
+      
+    </dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      //一览表格框计算文本
+      input: "",
+      //一览表格数据
+      option: {
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5",
+      },
+    };
+  },
+  methods: {
+    //一览表格框计算
+    onclick() {
+      this.option.requestUrl =
+        "/api/v1/tms/getAllJiPiResult?apiId=146&orderType=5&con=" + this.input;
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/steelReturn/transportExcute/unload.vue

@@ -0,0 +1,41 @@
+//卸货
+<template>
+  <!-- 卸货实绩页面 -->
+  <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>
+    </div>
+    <dilTable v-bind.sync="option"></dilTable>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "homeworkPath",
+  data() {
+    return {
+      restaurants: [],
+      input: "",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=6",
+      },
+    };
+  },
+  methods: {
+    onclick() {
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=6&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/steelReturn/transportOrder/addTransportOrder.vue

@@ -0,0 +1 @@
+//新增运输派单

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

@@ -0,0 +1 @@
+//运输派单

src/views/SporadicManage/router/index.js

@@ -0,0 +1,103 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+import routerBefore from '@/config/routerBefore.js'
+
+// 主要
+import main from '@/components/main.vue'
+// 系统配置管理
+//零星物资运输预约
+import sporadicTransportAppoint from '../components/sporadicMaterial/transportAppoint/transportAppoint.vue'
+import addSporadicTransportAppoint from '../components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue'
+import editSporadicTransportAppoint from '../components/sporadicMaterial/transportAppoint/editTransportAppoint.vue'
+//零星物资运输派单
+import sporadicTransportOrder from '../components/sporadicMaterial/transportOrder/transportOrder.vue'
+import addSporadicTransportOrder from '../components/sporadicMaterial/transportOrder/addTransportOrder.vue'
+import editSporadicTransportOrder from '../components/sporadicMaterial/transportOrder/editTransportOrder.vue'
+//零星物资进厂
+import sporadicENenfactory from '../components/sporadicMaterial/sporadicEnfactory/enFactory.vue'
+import sporadicENgrossWeight from '../components/sporadicMaterial/sporadicEnfactory/grossWeight.vue'
+import sporadicENoutFactory from '../components/sporadicMaterial/sporadicEnfactory/outFactory.vue'
+import sporadicENtareWeight from '../components/sporadicMaterial/sporadicEnfactory/tareWeight.vue'
+import sporadicENunload from '../components/sporadicMaterial/sporadicEnfactory/unload.vue'
+//零星物资出厂
+import sporadicOUTenfactory from '../components/sporadicMaterial/sporadicOutfactory/enFactory.vue'
+import sporadicOUTgrossWeight from '../components/sporadicMaterial/sporadicOutfactory/grossWeight.vue'
+import sporadicOUToutFactory from '../components/sporadicMaterial/sporadicOutfactory/outFactory.vue'
+import sporadicOUTtareWeight from '../components/sporadicMaterial/sporadicOutfactory/tareWeight.vue'
+import sporadicOUTload from '../components/sporadicMaterial/sporadicOutfactory/load.vue'
+
+
+//钢材退货运输预约
+import steelReturnTransportAppoint from '../components/steelReturn/transportAppoint/transportAppoint.vue'
+import addSteelReturnTransportAppoint from '../components/steelReturn/transportAppoint/addSteelReturnTransportAppoint'
+import editSteelReturnTransportAppoint from '../components/steelReturn/transportAppoint/editTransportAppoint.vue'
+//钢材退货运输派单
+import steelReturnTransportOrder from '../components/steelReturn/transportOrder/transportOrder.vue'
+import addSteelReturnTransportOrder from '../components/steelReturn/transportOrder/addTransportOrder.vue'
+import editSteelReturnTransportOrder from '../components/steelReturn/transportOrder/editTransportOrder.vue'
+//钢材退货运输执行
+import steelReturnEnfactory from '../components/steelReturn/transportExcute/enFactory.vue'
+import steelReturnGrossWeight from '../components/steelReturn/transportExcute/grossWeight.vue'
+import steelReturnOutFactory from '../components/steelReturn/transportExcute/outFactory.vue'
+import steelReturnTareWeight from '../components/steelReturn/transportExcute/tareWeight.vue'
+import steelReturnUnload from '../components/steelReturn/transportExcute/unload.vue'
+
+
+Vue.use(Router)
+const constantRouterMap = [
+  {
+    path: '/',
+    name: 'main',
+    meta: {title: '首页', code: 'xtpzgl'},
+    component: main,
+    redirect: {name: 'addSporadicTransportAppoint'},
+    children: [
+      //零星物资运输预约
+      {path:'addSporadicTransportAppoint',name:'addSporadicTransportAppoint',meta:{code:'xtpzgl-jggl'},component:addSporadicTransportAppoint},
+      {path:'sporadicTransportAppoint',name:'sporadicTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:sporadicTransportAppoint},
+      {path: 'editSporadicTransportAppoint', name: 'editSporadicTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportAppoint},
+      //零星物资运输订单
+      {path:'addSporadicTransportOrder',name:'addSporadicTransportOrder',meta:{code:'xtpzgl-jggl'},component:addSporadicTransportOrder},
+      {path:'sporadicTransportOrder',name:'sporadicTransportOrder',meta:{code:'xtpzgl-yhgl'},component:sporadicTransportOrder},
+      {path: 'editSporadicTransportOrder', name: 'editSporadicTransportOrder', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportOrder},
+      //零星物资进厂
+      {path:'sporadicENenfactory',name:'sporadicENenfactory',meta:{code:'xtpzgl-yhgl'},component:sporadicENenfactory},
+      {path:'sporadicENgrossWeight',name:'sporadicENgrossWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicENgrossWeight},
+      {path:'sporadicENoutFactory',name:'sporadicENoutFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicENoutFactory},
+      {path:'sporadicENtareWeight',name:'sporadicENtareWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicENtareWeight},
+      {path:'sporadicENunload',name:'sporadicENunload',meta:{code:'xtpzgl-yhgl'},component:sporadicENunload},
+      //零星物资出厂
+      {path:'sporadicOUTenfactory',name:'sporadicOUTenfactory',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTenfactory},
+      {path:'sporadicOUTgrossWeight',name:'sporadicOUTgrossWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTgrossWeight},
+      {path:'sporadicOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicOUToutFactory},
+      {path:'sporadicOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTtareWeight},
+      {path:'sporadicOUTload',name:'sporadicOUTload',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTload},
+
+      //钢材退货运输预约
+      {path:'addSteelReturnTransportAppoint',name:'addSteelReturnTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:addSteelReturnTransportAppoint},
+      {path:'steelReturnTransportAppoint',name:'steelReturnTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:steelReturnTransportAppoint},
+      {path: 'editSteelReturnTransportAppoint', name: 'editSteelReturnTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSteelReturnTransportAppoint},
+      //钢材退货运输订单
+      {path:'addSteelReturnTransportOrder',name:'addSteelReturnTransportOrder',meta:{code:'xtpzgl-jggl'},component:addSteelReturnTransportOrder},
+      {path:'steelReturnTransportOrder',name:'steelReturnTransportOrder',meta:{code:'xtpzgl-yhgl'},component:steelReturnTransportOrder},
+      {path: 'editSteelReturnTransportOrder', name: 'editSteelReturnTransportOrder', meta: {code: 'xtpzgl-yhgl'}, component: editSteelReturnTransportOrder},
+      //钢材退货进厂
+      {path:'steelReturnEnfactory',name:'steelReturnEnfactory',meta:{code:'xtpzgl-yhgl'},component:steelReturnEnfactory},
+      {path:'steelReturnGrossWeight',name:'steelReturnGrossWeight',meta:{code:'xtpzgl-yhgl'},component:steelReturnGrossWeight},
+      {path:'steelReturnOutFactory',name:'steelReturnOutFactory',meta:{code:'xtpzgl-yhgl'},component:steelReturnOutFactory},
+      {path:'steelReturnTareWeight',name:'steelReturnTareWeight',meta:{code:'xtpzgl-yhgl'},component:steelReturnTareWeight},
+      {path:'steelReturnUnload',name:'steelReturnUnload',meta:{code:'xtpzgl-yhgl'},component:steelReturnUnload}
+    ]    
+  }
+];
+
+const router = new Router({
+  routes: constantRouterMap
+})
+//  before
+routerBefore(router, constantRouterMap);
+
+export default router;
+//  constantRouterMap
+export const routes = constantRouterMap;

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

@@ -12,10 +12,10 @@
       <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="insertClick">
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button type="primary" @click="issue">
+      <el-button type="primary" class="btn" @click="issue" v-if="activeName == 'first'">
         <i class="el-icon-plus"></i>下发
       </el-button>
     </div>
@@ -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;
       }
     },
@@ -192,10 +192,13 @@ export default {
 <style lang='scss' scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 40px;
     .input {
-      width: 12.5rem;
-      margin-right: 1.25rem;
+      width: 250px;
+      margin-right: 20px;
+    }
+    .btn{
+      margin-right: 10px;
     }
   }
 }

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

@@ -78,6 +78,7 @@
             <template v-if="item.slot">
               <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
+                style="width:250px"
                   v-model.number="scope.row.orderMaterialWeight"
                 ></el-input>
               </template>
@@ -98,21 +99,22 @@
       </el-table>
     </div>
     <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
-      <el-input
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div style="margin-bottom: 10px;">
+        <el-input
         placeholder="请输入内容"
         v-model="input"
-        style="margin-top: 10px; margin-left: 20px;width:160px"
+        style="margin-top: 10px;margin-right: 10px;width:250px;"
         clearable
       ></el-input>
       <el-button
         type="primary"
         class="btn"
         @click="onclick(a)"
-        style="margin-bottom: 15px"
       >
         <i class="el-icon-search"></i>查询
       </el-button>
+      </div>
       <div v-show="a == 1">
         <dilTable
           v-bind.sync="frist"
@@ -244,6 +246,13 @@ export default {
       },
     };
   },
+  watch:{
+    drawer(val){
+      if(!val){
+        this.input = null;
+      }
+    }
+  },
   methods: {
     onClick(index) {
       this.selectionList.splice(index, 1);
@@ -452,8 +461,7 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" >
+<style lang="scss">
 .contractDetails {
   width: 100%;
 }
@@ -493,6 +501,7 @@ export default {
 .material {
   display: flex;
   justify-content: center;
+  margin-top: 20px;
   .text {
     display: inline-block;
     width: 170px;

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/TMS/components/importedFuel/truckDriverReceiveRan.vue

@@ -51,12 +51,13 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
    .top {
-    padding: 1.25rem 1.875rem;
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -1,5 +1,4 @@
 <template>
-  <!-- 辅料进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
@@ -69,12 +68,13 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -1,5 +1,4 @@
 <template>
-  <!-- 辅料进厂作业页面 -->
   <div class="homeworkPath">
     <div class="top">
       <el-input placeholder="请输入内容" class="input" v-model="input" clearable> </el-input>
@@ -69,12 +68,13 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -34,12 +34,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -36,10 +36,11 @@ export default {
 </script>
 <style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -35,12 +35,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -35,12 +35,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -35,12 +35,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -34,12 +34,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -47,12 +47,13 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -45,12 +45,13 @@ export default {
   },
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -33,12 +33,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -36,10 +36,11 @@ export default {
 </script>
 <style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -32,12 +32,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

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

@@ -34,12 +34,13 @@ export default {
    }
 };
 </script>
-<style lang='scss' scoped>
+<style lang='scss'>
 .homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
+   .top {
+    padding: 40px;
     .input{
-      width: 12.5rem;
+      width: 250px;
+      margin-right: 10px;
     }
   }
 }

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -6,30 +6,25 @@
     <div class="form-box" style="margin-right: 10rem">
       <dil-form :formId="284" v-model="form1" ref="from1"></dil-form>
     </div>
-    <div class="select">
+    <div class="select from">
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item label="是否自提">
           <el-select v-model="values" placeholder="请选择">
-            <el-option
-              v-for="item in options"
-              :key="item.values"
-              :label="item.label"
-              :value="item.values"
-            >
+            <el-option v-for="item in options" :key="item.values" :label="item.label" :value="item.values">
             </el-option>
           </el-select>
         </el-form-item>
       </el-form>
     </div>
-    <div class="table_form">
+
+    <div class="table_form from">
       <div class="materialId">
         <span class="text"> 物资： </span>
-        <el-button type="primary" class="btn" @click="table = true"
-          >浏览</el-button
-        >
+        <el-button type="primary" class="btn" @click="table = true">浏览</el-button>
       </div>
     </div>
-    <div class="selectionTable">
+
+    <div class="selectionTable from">
       <el-table
         :data="selectionList"
         border
@@ -128,6 +123,7 @@
         </el-table-column>
       </el-table>
     </div>
+
     <el-drawer
       :visible.sync="drawer"
       :direction="direction"
@@ -161,8 +157,9 @@
       size="50%"
       :show-close="false"
     >
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input
-      ><el-button type="primary" class="btn" @click="onclick">
+      <el-input placeholder="请输入内容" v-model="input"  
+      style="margin-top: 10px; margin-left: 20px;width:160px" clearable> </el-input
+      ><el-button type="primary" class="btn" @click="onclick" style="margin-left: 4px;">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button @click="open">取消</el-button>
@@ -423,15 +420,33 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
-
+.addSalePlan{
+  width: 100%;
+}
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 .select {
-  margin-left: 33.9rem;
+  margin-left: -10rem;
 }
 .demo-form-inline {
   margin-left: 2rem;
 }
 .table_form {
-  margin-left: 12rem;
+  margin-left: -16rem;
 }
 .textinput {
   width: 50px;

src/views/appoint/components/saleContract/addTransportPrice.vue

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

src/views/appoint/components/saleContract/addTruckNoDetail.vue

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

src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -383,8 +383,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
 .table_form {
-  margin-left: 4.5rem;
+  margin-left: -16rem;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
 }
-
 </style>

src/views/appoint/components/saleContract/editSaleOrderDetail.vue

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

src/views/appoint/components/saleContract/editTransportPrice.vue

@@ -93,4 +93,23 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.table_form {
+  margin-left: -16rem;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/appoint/components/saleContract/editTruckNoDetail.vue

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

src/views/appoint/components/saleContract/editaddress.vue

@@ -77,5 +77,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
 </style>

src/views/appoint/components/saleContract/saleOrder.vue

@@ -7,7 +7,7 @@
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-button type="primary" @click="btnclick(0)">
-        <i class="el-icon-plus"></i>新增
+        <i class="el-icon-plus"></i>钢材订单新增
       </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -204,7 +204,11 @@ export default {
 <style lang='scss' scoped>
 .salePlan {
   .top {
-    padding: 1.25rem 1.875rem;
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/appoint/components/saleContract/saleOrderDetail.vue

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

src/views/appoint/components/saleContract/saleOrderDetailApproved.vue

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

src/views/appoint/components/saleContract/transportPrice.vue

@@ -116,8 +116,12 @@ export default {
 </script>
 <style lang='scss' scoped>
 .salePlan {
-  .top {
-    padding: 1.25rem 1.875rem;
+  .top{
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
   }
 }
 </style>

src/views/importedIngredients/app.html → src/views/homepage/app.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html style="overflow: hidden;">
+<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>首页 - 工业互联网平台 iCore-ICP</title>
+    <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>
@@ -14,9 +14,9 @@
     <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>
-    <!-- test set app -->
   </body>
 </html>

src/views/importedIngredients/app.js → src/views/homepage/app.js

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

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/importedIngredients/components/transportReserveFu.vue

@@ -1,262 +0,0 @@
-<template>
-  <!-- 采购辅料运输预约 -->
-  <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"
-        v-privilege="activeMenu + 'RESERVEFUADD'"
-      >
-        <i class="el-icon-plus"></i>新增
-      </el-button>
-      <el-button
-        type="primary"
-        @click="sendClick(0)"
-        v-privilege="activeMenu + 'SEND'"
-      >
-        <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"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click="sendClick(1, scope.row.orderId)"
-                type="text"
-                size="small"
-                v-privilege="activeMenu + 'SEND'"
-              >
-                下发
-              </el-button>
-              <el-button
-                @click="updateClick(scope.row.orderId)"
-                type="text"
-                size="small"
-                v-privilege="activeMenu + 'UPATE'"
-              >
-                修改
-              </el-button>
-              <el-button
-                @click="
-                  deleteClick(scope.row.orderId, scope.row.capacityNumber)
-                "
-                type="text"
-                size="small"
-                v-privilege="activeMenu + 'DELETE'"
-              >
-                删除
-              </el-button>
-            </template>
-          </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2">
-          <el-table-column
-            fixed="right"
-            align="center"
-            label="操作"
-            width="120"
-          >
-            <template slot-scope="scope">
-              <el-button
-                @click="CloseClick(scope.row.orderId)"
-                type="text"
-                size="small"
-              >
-                关闭
-              </el-button>
-            </template>
-          </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "inplantTMS",
-  data() {
-    return {
-      activeMenu: "",
-      input: "",
-      Time: "",
-      activeName: "first",
-      option1: {
-        // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5",
-        // 控制显示多选列
-        selectionType: "select",
-      },
-      option2: {
-        // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5",
-      },
-      selection: [],
-    };
-  },
-  methods: {
-    //获取选中的订单
-    selectionChange(selection) {
-      this.selection = [];
-      selection.forEach((e) => {
-        this.selection.push({ orderId: e.orderId });
-      });
-    },
-    onclick() {
-      if (this.activeName == "first") {
-        this.option1.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&con=" +
-          this.input;
-      } else {
-        this.option2.requestUrl =
-          "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=4&orderType=5&con=" +
-          this.input;
-      }
-    },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    // 下发
-    CloseClick(orderId) {
-      this.$confirm("是否关闭", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      });
-      this.axios
-        .post("/api/v1/oms/CloseOrder", {
-          orderId: orderId,
-        })
-        .then(() => {
-          this.$router.go(0);
-        })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "关闭成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消关闭!",
-          });
-        });
-    },
-
-    //关闭
-
-    sendClick(index, orderId) {
-      this.$confirm("是否下发", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          let orderList = [];
-          if (index == 0) {
-            if (this.selection.length > 0) {
-              orderList = this.selection;
-            } else {
-              this.$message({
-                type: "warning",
-                message: "请选择要下发的订单!",
-              });
-            }
-          } else if (index == 1) {
-            orderList.push({ orderId: orderId });
-          }
-          this.axios
-            .post("/api/v1/oms/dispatchOrder", {
-              mapList: orderList,
-            })
-            .then(() => {
-              this.option1.requestUrl =
-                "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=5&i=0";
-            });
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消下发!",
-          });
-        });
-    },
-    // 删除
-    deleteClick(orderId, capacityNumber) {
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-          this.axios
-            .post("/api/v1/oms/deleteOrder", {
-              orderId: orderId,
-              capacityNumber: capacityNumber,
-            })
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!",
-          });
-        });
-    },
-    //新增
-    insertClick() {
-      this.$router.push("/importedIngredients/transportReserveFuAdd/");
-    },
-    //修改
-    updateClick(orderId) {
-      this.$router.push(
-        "/importedIngredients/transportReserveFuEdit/" + orderId
-      );
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

src/views/importedIngredients/components/transportReserveFuEdit.vue

@@ -1,98 +0,0 @@
-<template>
-  <!-- 修改运输预约页面 -->
-  <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="258" v-model="form1"></dil-form>
-          <div>
-            <div v-if="form1.orderMaterialNumber">
-              <span>物资件数：</span>
-              <el-input placeholder="请输入内容" v-model="orderMaterialNumber" clearable>
-              </el-input>
-            </div>
-             <div v-if="form1.orderMaterialWeight">
-              <span>物资重量：</span>
-              <el-input placeholder="请输入内容" v-model="orderMaterialWeight" clearable>
-              </el-input>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import PageTitle from "@/components/Page/Title";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      form1: {},
-      orderMaterialNumber:'',
-      orderMaterialWeight:'',
-    };
-  },
-  mounted() {
-    this.information();
-  },
-  methods: {
-    information() {
-      this.$axios
-        .post("/api/v1/oms/selectOrderByOrderId/" + this.$route.params.orderId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-            if(e.orderMaterialNumber){
-              this.orderMaterialNumber = e.orderMaterialNumber;
-            }else if(e.orderMaterialWeight){
-              this.orderMaterialWeight = e.orderMaterialWeight;
-            }
-          });
-        });
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    // 确认
-    onClickConfirm() {
-      let obj = {
-        orderId: this.$route.params.orderId,
-        orderMaterialNumber: this.form1.orderMaterialNumber,
-        orderEntryTime: sjTime(this.form1.orderEntryTime),
-        unloadPointId: this.form1.unloadPointId,
-        orderType: 5,
-      };
-
-      if (
-        obj.orderId == null ||
-        obj.orderMaterialNumber == null ||
-        obj.orderEntryTime == null ||
-        obj.unloadPointId == null
-      )
-        this.$message.error("存在空值！");
-      else
-        this.$axios.post("/api/v1/oms/updateOrder", obj).then(() => {
-          this.$message({
-            type: "success",
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>  

src/views/importedIngredients/components/truckDriverReceiveFu.vue

@@ -1,113 +0,0 @@
-<template>
-  <!-- 运输派单 -->
-  <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>
-    </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 未接收 -->
-      	<el-tab-pane label="未接收" name="third">
-						<dilTable v-bind.sync="option0">
-              <el-table-column fixed="right" label="操作" width="50">
-        <template slot-scope="scope">
-          <el-button @click="closeOrder(scope.row.orderId)" type="text" size="small">
-            关闭
-          </el-button>
-        </template>
-      </el-table-column>
-						</dilTable>
-					</el-tab-pane>
-      <!-- 未下发 -->
-      <el-tab-pane label="已接收" name="first">
-        <dilTable v-bind.sync="option1" ref="table">
-        </dilTable>
-      </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已拒绝" name="second">
-        <dilTable v-bind.sync="option2">
-        </dilTable>
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "inplantTMS",
-  data() {
-    return {
-      input: "",
-      Time: "",
-      activeName: "first",
-       option0: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4"
-      },
-      option1: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5"
-      },
-      option2: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6"
-      }
-    };
-  },
-  methods: {
-    closeOrder(orderId) {
-      this.$confirm("是否关闭", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true,
-      })
-        .then(() => {
-           this.$axios
-            .post(
-              "/api/v1/oms/closeOmstruckOrde?orderId="+orderId
-            )
-            .then((res) => {
-           if(res.data.code == '200')
-              // if(res.data.code)
-              this.$router.go(0);
-            });
-          this.$message({
-            type: "success",
-            message: "下发成功!",
-          });
-          // console.log(this.arr[0].text_prop);
-         
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消关闭!",
-          });
-        });
-    },
-    onclick() {
-       if(this.activeName == "first"){
-        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=5&con=" + this.input;
-      }else if(this.activeName == "second"){
-        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=6&con=" + this.input;
-      }else
-      {
-        this.option0.requestUrl="/api/v1/oms/getTransportDispatch?apiId=148&orderType=5&orderStatus=4&con="+this.input;
-      }
-    },
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-   .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

src/views/importedIngredients/components/truckJiMaoFuResult.vue

@@ -1,187 +0,0 @@
-<template>
-  <!-- 辅料计毛实绩页面 -->
-  <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>
-    </div>
-    <dilTable v-bind.sync="option">
-      <el-table-column fixed="right" align="center" label="操作" width="120">
-        <template slot-scope="scope">
-          <el-button
-            @click="sendClick(scope.row.orderId)"
-            type="text"
-            size="small"
-            v-if="scope.row.orderStatus == 5"
-          >
-            退货
-          </el-button>
-          <el-button  
-            type="text"
-            size="small"
-            disabled
-            v-else
-          >
-            退货
-          </el-button>
-        </template>
-      </el-table-column>
-    </dilTable>
-
-    <el-dialog
-      title="提示"
-      :visible.sync="dialogVisible"
-      width="30%"
-      :before-close="handleClose"
-      :modal="true"
-      :close-on-click-modal="false"
-    >
-      <div class="text">
-        <span>请选择退货路线</span>
-      </div>
-      <el-input placeholder="请输入内容" v-model="lineName" disabled>
-      </el-input>
-      <el-button type="primary" @click="onLine">浏览</el-button>
-      <div class="returnResult">
-        <span>退货原因：</span>
-      </div>
-      <el-input placeholder="请输入内容" v-model="returnResult">
-      </el-input>
-      
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="outOrder">确 定</el-button>
-      </span>
-    </el-dialog>
-
-    <!-- 模态窗口 -->
-    <el-drawer :visible.sync="drawer" size="50%">
-      <el-input
-        placeholder="请输入内容"
-        v-model="calculationText"
-        style="margin-top: 0.625rem; margin-left: 1.25rem"
-        clearable
-      ></el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="calculation"
-        style="margin-bottom: 0.9375rem"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div>
-        <!-- 模态框——表格 -->
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      returnResult:'',
-      //路线名称
-      lineName: "",
-      //路线id
-      lineId: null,
-      //模态框框计算文本
-      calculationText: "",
-      //是否需要打开模态窗口
-      drawer: false,
-      //是否打开弹窗
-      dialogVisible: false,
-      //订单id
-      orderId: null,
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5",
-      },
-      //模态框表格数据
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4",
-        selectionType: "radio",
-      },
-    };
-  },
-  methods: {
-    //模态框单选触发事件
-    currentRadioChange(selection) {
-      this.lineName = selection.lineName;
-      this.lineId = selection.lineId;
-    },
-    //模态框框计算
-    calculation() {
-      this.option.requestUrl =
-        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=4&con=" +
-        this.calculationText;
-    },
-    //弹窗浏览按钮
-    onLine() {
-      this.drawer = true;
-    },
-    //弹窗的确定按钮
-    outOrder() {
-      if(this.lineId && this.returnResult){
-        let map = {
-        returnResult:this.returnResult,
-        orderId: this.orderId,
-        lineId: this.lineId,
-      };
-      this.$axios.post("/api/v1/oms/returnOrderCloseOrder", map).then((res) => {
-        console.log(res);
-        this.dialogVisible = false;
-          this.option.requestUrl ="/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&i=0";
-      });
-      }else{
-          this.$message({
-          message: '请选择运输路线和退货原因，在确定！',
-          type: 'warning'
-        });
-      }
-    },
-    //弹窗关闭事件
-    handleClose() {
-      this.lineName = null;
-      this.lineId = null;
-      this.orderId = null;
-      this.dialogVisible = false;
-    },
-    //操作列退货按钮
-    sendClick(orderId) {
-      console.log(orderId);
-      this.orderId = orderId;
-      this.dialogVisible = true;
-    },
-    onclick() {
-      this.option.requestUrl =
-        "/api/v1/tms/getAllJiMaoResult?apiId=102&orderType=5&con=" + this.input;
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-  .text {
-    margin-bottom: 0.625rem;
-  }
-  .returnResult {
-    margin-top: 0.625rem;
-    margin-bottom: 0.625rem;
-  }
-}
-</style>

src/views/importedIngredients/components/truckQualityFuResult.vue

@@ -1,72 +0,0 @@
-<template>
-  <!-- 辅料质检作业 -->
-  <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>
-    </div>
-    
-    <dilTable v-bind.sync="option">
-      <el-table-column fixed="right" label="操作" width="50">
-        <template slot-scope="scope">
-          <el-button @click="updateClick(scope.row.resultId)" type="text" size="small">
-            修改
-          </el-button>
-        </template>
-      </el-table-column>
-    </dilTable>
-  </div>
-</template>
-
-
-<script>
-export default {
-  name: "wagonPlease",
-  data() {
-    return {
-      status: "",
-      input: "",
-      option: {       
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getQualityResult?apiId=150&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    onclick() {
-      this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=150&orderType=5&con=" + this.input;
-    },
-    btnclick() {
-      this.$router.push("/trainTMS/approveWagonPleaseAdd/");
-    },
-    updateClick(resultId) {
-      this.$router.push("/fuLiao/truckQualityFuResultEdit/" + resultId);
-    },
-    
-  },
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

src/views/importedIngredients/components/truckQualityFuResultEdit.vue

@@ -1,95 +0,0 @@
-<template>
-  <!-- 辅料修改质检作业页面 -->
-  <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="187" v-model="form1"></dil-form>
-        </div>
-      </div>
-    </div>
-
-    
-    <div class="button-box">
-      <el-button @click="onClickCancel">返回</el-button>
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-      
-    </div>
-  </div>
-</template>
-
-<script>
-import PageTitle from "@/components/Page/Title";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      // 表单
-      form1: {},
-      // 表格
-      table1: {},
-      contractId: "",
-    };
-  },
-  mounted() {
-    this.information();
-  },
-  methods: {
-  information() {
-      //编辑运输计划
-      this.$axios
-        .post("/api/v1/tms/getQualityResultById/" + this.$route.params.resultId)
-        .then((res) => {
-          res.data.data.forEach((e) => {
-            this.form1 = e;
-          });
-        });
-    },
-
-    handleCheckedCitiesChange(value) {
-      console.log(value);
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    // 确认
-    onClickConfirm() {
-      let QR = {
-        resultId: this.$route.params.resultId,
-        resultIssampling: this.form1.resultIssampling,
-        resultDeduction: this.form1.resultDeduction,
-        resultSamplingPointId: this.form1.resultSamplingPointId,
-        resultDeductionDescription: this.form1.resultDeductionDescription
-      };
-    
-      var val = this.value;
-      if (
-        QR.resultIssampling==null||
-        QR.resultDeduction==null||
-        QR.resultSamplingPointId==null||
-        QR.resultDeductionDescription==null
-      ) this.$message.error("存在空值！");
-      else
-      this.$axios
-        .post("/api/v1/tms/updateQualityResult", QR)
-        .then(() => {
-          this.$message({
-            type: "success",  
-            message: "修改成功!",
-          });
-          this.$router.go(-1);
-        });
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>

src/views/importedIngredients/components/truckReceiptFuResult.vue

@@ -1,58 +0,0 @@
-<template>
-  <!-- 辅料收货作业页面 -->
-  <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>
-    </div>
-    <dilTable v-bind.sync="option">
-      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getReceiveResult?apiId=149&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    
-    onclick() {
-     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

src/views/importedIngredients/components/truckReturnResult.vue

@@ -1,58 +0,0 @@
-<template>
-  <!-- 辅料退货作业页面 -->
-  <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>
-    </div>
-    <dilTable v-bind.sync="option">
-      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllReturnResult?apiId=377&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    
-    onclick() {
-     this.option.requestUrl = "/api/v1/tms/getReceiveResult?apiId=149&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

src/views/importedIngredients/components/truckUnloadFuResult.vue

@@ -1,57 +0,0 @@
-<template>
-  <!-- 卸货实绩页面 -->
-  <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>
-    </div>
-    <dilTable v-bind.sync="option">
-      
-    </dilTable>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "homeworkPath",
-  data() {
-    return {
-      restaurants: [],
-      input: "",
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=145&orderType=5",
-      },
-    };
-  },
-  methods: {
-    querySearch(queryString, cb) {
-      var restaurants = this.restaurants;
-      var results = queryString
-        ? restaurants.filter(this.createFilter(queryString))
-        : restaurants;
-      cb(results);
-    },
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (
-          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
-          0
-        );
-      };
-    },
-    onclick() {
-     this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=145&orderType=5&con=" + this.input;
-    },
-   }
-};
-</script>
-<style lang='scss' scoped>
-.homeworkPath {
-  .top {
-    padding: 1.25rem 1.875rem;
-  }
-}
-</style>

src/views/importedIngredients/router/index.js

@@ -1,53 +0,0 @@
-import Vue from 'vue'
-import Router from 'vue-router'
-
-import routerBefore from '@/config/routerBefore.js'
-
-// 主要
-import main from '@/components/main.vue'
-// 系统配置管理
-import transportReserveFu from '../components/transportReserveFu.vue'
-import transportReserveFuAdd from '../components/transportReserveFuAdd.vue'
-import transportReserveFuEdit from '../components/transportReserveFuEdit.vue'
-import truckDriverReceiveFu from '../components/truckDriverReceiveFu.vue'
-import truckEnfactoryFuResult from '../components/truckEnfactoryFuResult.vue'
-import truckJiMaoFuResult from '../components/truckJiMaoFuResult.vue'
-import truckLeaveFactoryFuResult from '../components/truckLeaveFactoryFuResult.vue'
-import truckQualityFuResult from '../components/truckQualityFuResult.vue'
-import truckQualityFuResultEdit from '../components/truckQualityFuResultEdit.vue'
-import truckReturnResult from '../components/truckReturnResult.vue'
-import truckUnloadFuResult from '../components/truckUnloadFuResult.vue'
-Vue.use(Router)
-
-const constantRouterMap = [
-  {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
-    component: main,
-    redirect: {name: 'transportReserveFu'},
-    children: [
-      {path: 'transportReserveFu', name: 'transportReserveFu', meta: {code: 'xtpzgl-jggl'}, component: transportReserveFu},
-      {path: 'transportReserveFuAdd', name: 'transportReserveFuAdd', meta: {code: 'xtpzgl-yhgl'}, component: transportReserveFuAdd},
-      {path: 'transportReserveFuEdit', name: 'transportReserveFuEdit', meta: {code: 'xtpzgl-yhgl'}, component: transportReserveFuEdit},
-      {path: 'truckDriverReceiveFu', name: 'truckDriverReceiveFu', meta: {code: 'xtpzgl-yhgl'}, component: truckDriverReceiveFu},
-      {path: 'truckEnfactoryFuResult', name: 'truckEnfactoryFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckEnfactoryFuResult},
-      {path: 'truckJiMaoFuResult', name: 'truckJiMaoFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckJiMaoFuResult},
-      {path: 'truckLeaveFactoryFuResult', name: 'truckLeaveFactoryFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckLeaveFactoryFuResult},
-      {path: 'truckQualityFuResult', name: 'truckQualityFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckQualityFuResult},
-      {path: 'truckQualityFuResultEdit', name: 'truckQualityFuResultEdit', meta: {code: 'xtpzgl-yhgl'}, component: truckQualityFuResultEdit},
-      {path: 'truckReturnResult', name: 'truckReturnResult', meta: {code: 'xtpzgl-yhgl'}, component: truckReturnResult},
-      {path: 'truckUnloadFuResult', name: 'truckUnloadFuResult', meta: {code: 'xtpzgl-yhgl'}, component: truckUnloadFuResult},
-    ]
-  }
-];
-
-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/addRequirement2.vue

@@ -3,7 +3,7 @@
   <div id="endMaintenance">
     <page-title>新增需求</page-title>
     <div class="main">
-      <span class="text">新增</span>
+      
       <span class="a"></span>
     </div>
     <div>
@@ -47,7 +47,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
@@ -85,7 +85,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>
@@ -184,7 +184,7 @@ export default {
         requirementPlatformId: this.requirementPlatformId
       };
       console.log(requiremnet);
-      this.$axios
+      this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
         .then((res) => {
           if (res.data.code == 200) {
@@ -205,6 +205,19 @@ 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

@@ -108,7 +108,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post(
               "/api/v1/ams/deleteTruckRequirement/" + scope.row.requirementId
             )
@@ -143,7 +143,7 @@ export default {
         center: true,
       })
         .then(() => {
-          this.$axios
+          this.axios
             .post("/api/v1/ams/downRequirement", this.first.mapList)
             .then((res) => {
               if (res.data.code == 200) {
@@ -151,7 +151,7 @@ export default {
                   type: "success",
                   message: "下发成功!",
                 });
-                this.$router.go(0);
+              this.first.requestUrl = "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&test=1"
               } else {
                 this.$message({
                   message: "下发失败",
@@ -171,12 +171,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/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/sale/components/saleSelfMachine/printLading.vue

@@ -127,6 +127,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  font-size:25px;
+}
 .tableBody{
   table, th, td
   {

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -165,6 +165,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  font-size:25px;
+}
 .tableBody{
   table, th, td
   {

src/views/sale/components/saleSelfMachine/printScan.vue

@@ -68,12 +68,13 @@ export default {
             overflow: hidden;
         }
         .orderNumberData{
-            width: 101.5%;height: 30%;
+            width: 20%;height: 30%;
             color: #fff;
             position: absolute;
             display: flex;
             justify-content: center;
             align-items: center;
+            margin-left: 27rem;
         }
     }
 </style>

src/views/sale/components/saleSelfMachine/printWarranty.vue

@@ -176,6 +176,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.title{
+  font-size:25px;
+}
 .tableBody{
   table, th, td
   {

src/views/sale/components/transportFreight/saleTrainSettlement/addBmsTrainFreight.vue

@@ -12,7 +12,7 @@
         
       </div>
     </div>
-    <div class="" style="margin-left:40rem">
+    <div class="button-box" style="margin-left:40rem">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
@@ -71,5 +71,19 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.form-box{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 </style>

src/views/sale/components/transportFreight/saleTrainSettlement/bmsTrainFreight.vue

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