合并冲突

build/utils.js

@@ -19,7 +19,7 @@ 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','sale','appoint'];
+let devModules = ['all'];
 // let devModules = ['index','systemConfig', 'formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'custom'];
 // let devModules = ['index', 'systemConfig','formGenerator', 'preview', 'metaData', 'serviceManager', 'configManager', 'btnControll'];
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

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

src/views/RMS/components/addPier.vue

@@ -2,8 +2,7 @@
   <!-- 添加码头信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-    <el-divider content-position="left">码头</el-divider>
-     <div class="form-box" style="margin-right: 10rem">
+     <div class="form-box">
         <dil-form :formId="272" v-model="form1" ref="from1"></dil-form>
       </div>
     <div class="button-box">
@@ -49,8 +48,7 @@ export default {
               type: "success",
               message: "新增成功!",
             });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
+            this.$router.push("/pier");
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
@@ -65,5 +63,14 @@ export default {
 };
 </script>
 <style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
 
 </style>

src/views/RMS/components/addPortStorageYard.vue

@@ -1,5 +1,75 @@
 <template>
-    <div>
-        
+  <!-- 添加码头信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+     <div class="form-box">
+        <dil-form :formId="366" v-model="form1" ref="from1"></dil-form>
+      </div>
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
     </div>
-</template>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+     makeSure() {
+        console.log(this.form1)
+    //   let RmsCapacity = {
+          
+    //   };
+       let RmsCapacity=this.form1;
+      console.log(RmsCapacity)
+      if (
+        RmsCapacity.warehouseName==null||
+        RmsCapacity.portId==null
+      ) this.$message.error("存在空值！");
+      else 
+      this.axios
+        .post(
+          "/api/v1/rms/insertPortYard",
+           RmsCapacity
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.$message({
+              type: "success",
+              message: "新增成功!",
+            });
+            // this.$refs.table.refreshData();
+            this.$router.go(-1);
+          } else {
+            this.$message.error("新增失败,可能存在重复！");
+          }
+          this.$refs['table'].resetField();
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/RMS/components/pier.vue

@@ -44,7 +44,15 @@ export default {
     }
   },
   methods:{
-     toInsert() {
+    onclick(){
+        if(this.inputText != null){
+          this.options.requestUrl = "/api/v1/rms/getPier?apiId=223&con=" + this.inputText
+        }
+        else{
+          this.options.requestUrl = "/api/v1/rms/getPier?apiId=223&test=1"
+        }
+    },
+    toInsert() {
       this.$router.push("/addPier");
     },
     deleteBmsTrainFreight(scope){
@@ -63,7 +71,7 @@ export default {
                   type: "success",
                   message: "删除成功!",
                 });     
-                this.$router.go(0);
+                this.options.requestUrl = "/api/v1/rms/getPier?apiId=223&test=1"
               } else {
                 this.$message({
                   message: "删除失败",

src/views/RMS/components/portStorageYard.vue

@@ -44,8 +44,16 @@ export default {
     }
   },
   methods:{
+    onclick(){
+      if(this.inputText != null){
+          this.options.requestUrl = "/api/v1/rms/getYardList?apiId=224"
+      }else{
+          this.options.requestUrl = "/api/v1/rms/getYardList?apiId=224&test=1"
+      }
+      
+    },
      toInsert() {
-      this.$router.push("/addPort");
+      this.$router.push("/addPortStorageYard");
 
     },
 
@@ -58,14 +66,14 @@ export default {
       })
         .then(() => {
           this.axios
-            .post("/api/v1/rms/deletePort/" + scope.row.portId)
+            .post("/api/v1/rms/deletePortYard/" + scope.row.warehouseId)
             .then((res) => {
               if (res.data.code == 200) {
                 this.$message({
                   type: "success",
                   message: "删除成功!",
                 });     
-                this.$router.go(0);
+                this.options.requestUrl = "/api/v1/rms/getYardList?apiId=224&test=1"
               } else {
                 this.$message({
                   message: "删除失败",

src/views/RMS/components/transitRouteAdd.vue

@@ -32,7 +32,8 @@
       </div>
       <div class="link_zi_list">
         <span>环节：</span>
-          <el-tag
+          <el-button
+            type="primary"
             :key="index"
             v-for="(item,index) in btnList"
             :disable-transitions="false"
@@ -40,7 +41,7 @@
             class="link_zi_list_btn"
           >
             {{item.linkName}}
-          </el-tag>
+          </el-button>
           <el-input
             class="input-new-tag"
             v-if="inputVisible"
@@ -176,6 +177,7 @@ export default {
     },
     // 将点击的对象添加到linkList的数组中
     addClick(item) {
+      console.log(item);
       this.linkList.push(item);
     },
     // 删除被点击的对象

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,567 @@
+//新增运输预约
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+    <div class="main">
+      <el-divider content-position="left">新增运输预约</el-divider>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">发货单位：</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <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>
+            <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,
+        },
+      ],
+      // 收货单位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"){
+          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,
+        };
+        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);
+        debugger
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
+          if (res.data.code == "200") {
+            this.$router.push("/sporadicMaterial/transportAppoint");
+          }
+        });
+      }
+    },
+};
+</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: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.orderType{
+  .text{
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.switch {
+  width: 100%;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 6.875rem;
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.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,131 @@
+//运输预约展现
+<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(() => {
+              this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=12"
+            })
+            .then(() => {
+             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("/sporadicMaterial/addTransportAppoint");
+    },
+    //修改
+    updateClick(orderId) {
+      this.$router.push("/importedIngredients/transportReserveFuEdit/" + orderId);
+    },
+
+  },
+};
+</script>
+<style lang='scss' scoped>
+   .homeworkPath {
+   .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

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

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

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

@@ -0,0 +1,355 @@
+//运输派单
+<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;
+  }
+  .drawer_top {
+    width: 100%;
+    height: 50px;
+    padding-left: 20px;
+    display: flex;
+    align-items: center;
+  }
+}
+</style>

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

@@ -0,0 +1,544 @@
+//新增运输预约
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+    <div class="main">
+      <el-divider content-position="left">新增运输预约</el-divider>
+    </div>
+    <div class="forwardingUnit from">
+      <span class="text">发货单位：</span>
+      <el-input v-model="supplierName" disabled> </el-input>
+      <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="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>
+            <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: [],
+      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,
+        },
+      ],
+      // 收货单位ID
+      receiveId:null,
+      //承运商ID
+      carrierId:null,
+      //物资表格数据
+      tableData: [],
+      selectionList1: [],
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      a: 1,
+      direction: "rtl",
+      input: "",
+      //物资模态框
+      materialOptions:{
+          requestUrl:
+            "/api/v1/uc/queryMaterialByLike?apiId=395&startNum=" + '0801',
+           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"){
+          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,
+        };
+        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:12,
+          carrierId: this.carrierId,
+          receiveId: this.receiveId,
+          mapList: this.tableData,
+        };
+        console.log(amsOrder);
+        debugger
+        this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
+          if (res.data.code == "200") {
+            this.$router.push("/steelReturn/steelTransportAppoint");
+          }
+        });
+      }
+    },
+};
+</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: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.material {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.orderType{
+  .text{
+    display: inline-block;
+    width: 5.625rem;
+    text-align: right;
+  }
+}
+.switch {
+  width: 100%;
+  height: 2.5rem;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding-right: 6.875rem;
+}
+.forwardingUnit {
+  .text {
+    display: inline-block;
+    width: 10rem;
+    text-align: right;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 9.375rem;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 17.5rem;
+    }
+  }
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 6.25rem;
+}
+</style>

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/SporadicManage/components/steelReturn/transportExcute/enFactory.vue

@@ -0,0 +1,93 @@
+//进厂
+<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/getAllEnFactoryResult?apiId=143&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/getAllEnFactoryResult?apiId=143&orderType=5&con=" + this.input;
+    },
+    updateClick(resultId) {
+      this.$router.push("/tmsTruck/truckLoadResultEdit/" + resultId);
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/tmsTruck/truckLoadResultAdd/");
+    },
+    deleteClick(resultId) {
+      
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.$axios
+            .post(
+              "/api/v1/tms/deleteLoadResult/" + resultId
+            )
+            .then(() => {
+              this.$router.go(0);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

src/views/SporadicManage/components/steelReturn/transportExcute/grossWeight.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/outFactory.vue

@@ -0,0 +1,59 @@
+//出厂
+<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/getLeaveFactoryResult?apiId=147&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/getLeaveFactoryResult?apiId=147&orderType=5&con=" + this.input;
+    },
+   }
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 1.25rem 1.875rem;
+  }
+}
+</style>

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/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>
@@ -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);
@@ -493,6 +502,7 @@ export default {
 .material {
   display: flex;
   justify-content: center;
+  margin-top: 20px;
   .text {
     display: inline-block;
     width: 170px;

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/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/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);
+              
               } 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>