修改

build/utils.js

@@ -14,12 +14,19 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //    登录     合同                       首页       内转     排队   资源   销售                       零星物资
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
-//  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
+//  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['index','inward']
+
 // let devModules = ['index','TMS']
 // let devModules = ["index", "appoint", "sale", "statisticalReport"];
-let devModules = ['index','appoint','TMS'];
+
 // let devModules = ["index", "statisticalReport", "inward", "TMS", "appoint"];
+
+// let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
+let devModules = ["index",'TMS','appoint','statisticalReport'];
+// let devModules = ['index','TMS']
+// let devModules = ['index','statisticalReport','inward']
+
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;
 }

config/index.js

@@ -1,55 +1,54 @@
-"use strict";
+'use strict'
 // Template version: 1.3.1
 // see http://vuejs-templates.github.io/webpack for documentation.
 
-const path = require("path");
+const path = require('path')
 
-const pathSrc = path.resolve(__dirname, "../src");
+const pathSrc = path.resolve(__dirname, '../src');
 
 let proxyTable = {
-  "/icore.icp.web/pass/v1/sysusers/user/token": {
-    //https://portal.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token
+  '/icore.icp.web/pass/v1/sysusers/user/token': {  //https://portal.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token
     //target: 'https://portal-dev.steerinfo.com/icore.icp.web/pass/sso/v1/sysusers/user/token',
-    target: "http://172.16.33.166:9001/v1/sysusers/user/token",
+    target:'http://172.16.33.166:9001/v1/sysusers/user/token',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/v1/sysusers/user/token": "/"
+      '^/icore.icp.web/pass/v1/sysusers/user/token': '/'
     }
   },
-  "/icore.icp.web/pass/v1": {
+  '/icore.icp.web/pass/v1': {
     //target: 'http://172.16.33.161:80/v1', //加http
-    target: "http://172.16.33.166:9001/v1",
+    target: 'http://172.16.33.166:9001/v1',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/v1": "/" //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
+      '^/icore.icp.web/pass/v1': '/' //这里理解成用‘/api’代替target里面的地址，组件中我们调接口时直接用/api代替
       // 比如我要调用'http://0.0:300/user/add'，直接写‘/api/user/add’即可 代理后地址栏显示/
     }
   },
-  "/icore.icp.web/pass/auth/login": {
-    //target: 'http://sso-dev.steerinfo.com/icore.icp.web/pass/auth/login',
-    target: "http://172.16.33.166:9001/auth/login",
+   '/icore.icp.web/pass/auth/login': {
+     //target: 'http://sso-dev.steerinfo.com/icore.icp.web/pass/auth/login',
+     target: 'http://172.16.33.166:9001/auth/login',
+     changeOrigin: true,
+     pathRewrite: {
+       '^/icore.icp.web/pass/auth/login': ''
+     }
+   },
+   '/icore-api': {
+    target: 'http://172.16.33.166:9001',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/auth/login": ""
+      '^/icore-api': '/'
     }
   },
-  "/icore-api": {
-    target: "http://172.16.33.166:9001",
+  '/icore.icp.web/pass/act': {
+    target: 'http://172.16.33.166:8095',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore-api": "/"
-    }
-  },
-  "/icore.icp.web/pass/act": {
-    target: "http://172.16.33.166:8095",
-    changeOrigin: true,
-    pathRewrite: {
-      "^/icore.icp.web/pass/act": "/"
+      '^/icore.icp.web/pass/act': '/'
     }
   },
   // 表格表单请求的域名地址
   "/api/v1/cd": {
-    target: "http://172.16.33.166:80",
+    target: "http://172.16.33.161:8083",
     ws: true,
     pathRewrite: {
       "^/api/v1/cd": "/api/v1/cd"
@@ -65,46 +64,45 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:80",
-    // target: "http://192.168.1.107:8080",
-    // target: "http://localhost:8080",
+    target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://172.16.33.166:80",
+    target: "http://localhost:8080",
+    // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
     }
   },
-  "/icore.icp.web/pass/logout": {
-    target: "http://172.16.33.166:9001/logout",
+  '/icore.icp.web/pass/logout': {
+    target: 'http://172.16.33.166:9001/logout',
     changeOrigin: true,
     pathRewrite: {
-      "^/icore.icp.web/pass/logout": "/"
+      '^/icore.icp.web/pass/logout': '/'
+    }
+  },
+}
+let dist = '../dist';
+if (pathSrc.indexOf('node_modules') > -1) {
+    dist = '../../../dist';
+    let proxyTableGet = require('../../../cors.js').proxyTable;
+    for (let i in proxyTableGet) {
+        proxyTable[i] = proxyTableGet[i]
     }
-  }
-};
-let dist = "../dist";
-if (pathSrc.indexOf("node_modules") > -1) {
-  dist = "../../../dist";
-  let proxyTableGet = require("../../../cors.js").proxyTable;
-  for (let i in proxyTableGet) {
-    proxyTable[i] = proxyTableGet[i];
-  }
 }
 
 module.exports = {
-  dev: {
-    // Paths
-    assetsSubDirectory: "static",
-    assetsPublicPath: "/",
-    proxyTable: proxyTable,
+    dev: {
+      // Paths
+      assetsSubDirectory: 'static',
+      assetsPublicPath: '/',
+      proxyTable: proxyTable,
     // Various Dev Server settings
-    host: "localhost", // can be overwritten by process.env.HOST
+    host: 'localhost', // can be overwritten by process.env.HOST
     port: 8802, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
@@ -141,14 +139,15 @@ module.exports = {
     }
   },
 
+  
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, dist + "/index.html"),
+    index: path.resolve(__dirname, dist + '/index.html'),
 
     // Paths
     assetsRoot: path.resolve(__dirname, dist),
-    assetsSubDirectory: "static", // 打包后 static放的位置
-    assetsPublicPath: "../", // html中webpack打包的JS -> ../static/xxx.js
+    assetsSubDirectory: 'static', // 打包后 static放的位置
+    assetsPublicPath: '../', // html中webpack打包的JS -> ../static/xxx.js
 
     /**
      * Source Maps
@@ -156,14 +155,14 @@ module.exports = {
 
     productionSourceMap: false,
     // https:       //webpack.js.org/configuration/devtool/#production
-    devtool: "#source-map",
+    devtool: '#source-map',
 
     // Gzip off by default as many popular static hosts such as
     // Surge or Netlify already gzip all static assets for you.
     // Before setting to `true`, make sure to:
     // npm install --save-dev compression-webpack-plugin
     productionGzip: false,
-    productionGzipExtensions: ["js", "css"],
+    productionGzipExtensions: ['js', 'css'],
 
     // Run the build command with an extra argument to
     // View the bundle analyzer report after build finishes:
@@ -171,4 +170,4 @@ module.exports = {
     // Set to `true` or `false` to always turn it on or off
     bundleAnalyzerReport: process.env.npm_config_report
   }
-};
+}

src/components/DilCommonUI/packages/table/src/table.js

@@ -25,8 +25,8 @@ export default {
     };
   },
   created() {
-    if(this.isHeigth){
-      window.addEventListener('resize',this.getHeight)
+    if (this.isHeigth) {
+      window.addEventListener("resize", this.getHeight);
       this.getHeight();
     }
     this.dataCurrentPage = this.currentPage;
@@ -40,19 +40,19 @@ export default {
     // this.columnDrop();
   },
   methods: {
-    getHeight(){
+    getHeight() {
       this.height = window.innerHeight - this.shiyHeigth;
     },
     // 通过请求获取数据
     requestData(options) {
       let pageNum = undefined;
       let pageSize = undefined;
-      
+
       if (options) {
         pageNum = options.pageNum;
         pageSize = options.pageSize;
       }
-      
+
       if (this.requestUrl) {
         // 处理请求地址逻辑
         let url;
@@ -62,39 +62,39 @@ export default {
           url = this.requestUrl;
         }
         // 判断是否需要在请求体中放入参数
-        if(this.requestQuery){
-          this.dataRequestQuery=this.requestQuery;
+        if (this.requestQuery) {
+          this.dataRequestQuery = this.requestQuery;
         }
         let data = undefined;
         for (const key in this.dataRequestQuery) {
           const val = this.dataRequestQuery[key];
 
-          if (val||val==0) {
+          if (val || val == 0) {
             if (!data) data = {};
             data[key] = val;
           }
         }
         //判断是否是带分页查询
-        if(this.isKuang){
+        if (this.isKuang) {
           // 发送请求
           this.axios
-          .post(url, data, {
-            // 请求地址 中
-            params: {
-              pageNum: 1,
-              pageSize: pageSize || this.dataPageSize
-            }
-          })
-          .then(response => {
-            let d = response.data.data;
-            this.dataTabel = d.list;
-            this.dataTotal = d.total;
-            //执行成功的回调
-            this.$emit('func',response.data.data);
-            this.refreshColumnData(d.columnData);
-            this.isShow = true;
-          });
-        }else{
+            .post(url, data, {
+              // 请求地址 中
+              params: {
+                pageNum: 1,
+                pageSize: pageSize || this.dataPageSize
+              }
+            })
+            .then(response => {
+              let d = response.data.data;
+              this.dataTabel = d.list;
+              this.dataTotal = d.total;
+              //执行成功的回调
+              this.$emit("func", response.data.data);
+              this.refreshColumnData(d.columnData);
+              this.isShow = true;
+            });
+        } else {
           // 发送请求
           this.axios
             .post(url, data, {
@@ -109,7 +109,7 @@ export default {
               this.dataTabel = d.list;
               this.dataTotal = d.total;
               //执行成功的回调
-              this.$emit('func',response.data.data);
+              this.$emit("func", response.data.data);
               this.refreshColumnData(d.columnData);
               this.isShow = true;
             });
@@ -256,7 +256,7 @@ export default {
   computed: {
     // 计算是否使用排序功能
     dataSortable() {
-      return function (item) {
+      return function(item) {
         if (item.template) {
           return false;
         } else if (item.sortable) {
@@ -268,7 +268,7 @@ export default {
     },
     // 计算每列的最小宽度
     dataColumnMinWidth() {
-      return function (item) {
+      return function(item) {
         let mw = 0;
         if (this.dataSortable(item)) {
           // 如果使用排序功能
@@ -306,7 +306,7 @@ export default {
         }
         this.setDataRequestQuery(q);
       }
-    },
+    }
   },
   // 注册组件
   components: {

src/components/DilCommonUI/packages/table/src/table.vue

@@ -174,9 +174,6 @@ export default {
     // Table 的高度，默认为自动高度。
     // 如果 height 为 number 类型，单位 px；
     // 如果 height 为 string 类型，则这个高度会设置为 Table 的 style.height 的值，Table 的高度会受控于外部样式。
-    height: {
-      default: null
-    },
     // Table 的最大高度。合法的值为数字或者单位为 px 的高度。
     //sdada
     maxHeight: {
@@ -250,6 +247,11 @@ export default {
       }
     }
   },
+  data() {
+    return {
+      height: null
+    };
+  },
   methods: {
     // 刷新表格数据
     refreshData() {

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

@@ -3,9 +3,33 @@
   <!-- 零星物资运输预约 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text" v-if="activeName != 'first'">订单时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+        v-if="activeName != 'first'"
+      >
+      </el-date-picker>
+      <span class="text" v-if="activeName != 'first'">至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+        v-if="activeName != 'first'"
+      >
+      </el-date-picker>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+        style="width:200px"
+      >
+      </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
       <el-button type="primary" @click="insertClick">
         <i class="el-icon-plus"></i>新增
@@ -18,155 +42,173 @@
         <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"
-            label="操作"
-            width="120"
-          >
-            <template slot-scope="scope">
-              <el-button @click="deleteClick(scope)" type="text" size="small">
-                删除
-              </el-button>
-              <el-button @click="getMatrialDetails1(scope.row)" type="text" size="small">
-                物资详情
-              </el-button>
-            </template>
-          </el-table-column>
-          //物资详情抽屉
-          <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-      <!-- 已下发 -->
-      <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2" ref="table1">
-          <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
+    <div class="table">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <!-- 未下发 -->
+        <el-tab-pane label="未下发" name="first">
+          <dilTable
+            v-bind.sync="option1"
+            ref="table"
+            @selection-change="selectionChange"
           >
-            <template slot-scope="scope">
-              <el-button @click="getMatrialDetails2(scope.row)" type="text" size="small">
-                物资详情
-              </el-button>
-              <el-button @click="stopSpoOrder(scope)" type="text" size="small">
-                停止
-              </el-button>
-            </template>
-          </el-table-column>
-          //物资详情抽屉
-          <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData1" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-       <!-- 已接单 -->
-      <el-tab-pane label="已接单" name="third">
-        <dilTable v-bind.sync="option3" ref="table2">
-           <el-table-column
-            fixed="right"
-            label="操作"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <el-button @click="getMatrialDetails3(scope.row)" type="text" size="small">
-                物资详情
-              </el-button>
-            </template>
-          </el-table-column>
-          //物资详情抽屉
-          <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData1" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-        </dilTable>
-      </el-tab-pane>
-    </el-tabs>
+            <el-table-column fixed="right" label="操作" width="120">
+              <template slot-scope="scope">
+                <el-button @click="deleteClick(scope)" type="text" size="small">
+                  删除
+                </el-button>
+                <el-button
+                  @click="getMatrialDetails1(scope.row)"
+                  type="text"
+                  size="small"
+                >
+                  物资详情
+                </el-button>
+              </template>
+            </el-table-column>
+            //物资详情抽屉
+            <el-table-column type="expand" width="1">
+              <template slot-scope="props">
+                <el-form
+                  label-position="center"
+                  inline
+                  class="demo-table-expand"
+                >
+                  <div v-if="false">{{ props }}</div>
+                  <div>
+                    <el-table :data="tableData" border>
+                      <el-table-column
+                        v-for="(item, i) in tableHead"
+                        :key="i"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :width="item.width"
+                      ></el-table-column>
+                    </el-table>
+                  </div>
+                </el-form>
+              </template>
+            </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+        <!-- 已下发 -->
+        <el-tab-pane label="已下发" name="second">
+          <dilTable v-bind.sync="option2" ref="table1">
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button
+                  @click="getMatrialDetails2(scope.row)"
+                  type="text"
+                  size="small"
+                >
+                  物资详情
+                </el-button>
+                <el-button
+                  @click="stopSpoOrder(scope)"
+                  type="text"
+                  size="small"
+                >
+                  停止
+                </el-button>
+              </template>
+            </el-table-column>
+            //物资详情抽屉
+            <el-table-column type="expand" width="1">
+              <template slot-scope="props">
+                <el-form
+                  label-position="center"
+                  inline
+                  class="demo-table-expand"
+                >
+                  <div v-if="false">{{ props }}</div>
+                  <div>
+                    <el-table :data="tableData1" border>
+                      <el-table-column
+                        v-for="(item, i) in tableHead"
+                        :key="i"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :width="item.width"
+                      ></el-table-column>
+                    </el-table>
+                  </div>
+                </el-form>
+              </template>
+            </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+        <!-- 已接单 -->
+        <el-tab-pane label="已接单" name="third">
+          <dilTable v-bind.sync="option3" ref="table2">
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button
+                  @click="getMatrialDetails3(scope.row)"
+                  type="text"
+                  size="small"
+                >
+                  物资详情
+                </el-button>
+              </template>
+            </el-table-column>
+            //物资详情抽屉
+            <el-table-column type="expand" width="1">
+              <template slot-scope="props">
+                <el-form
+                  label-position="center"
+                  inline
+                  class="demo-table-expand"
+                >
+                  <div v-if="false">{{ props }}</div>
+                  <div>
+                    <el-table :data="tableData1" border>
+                      <el-table-column
+                        v-for="(item, i) in tableHead"
+                        :key="i"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :width="item.width"
+                      ></el-table-column>
+                    </el-table>
+                  </div>
+                </el-form>
+              </template>
+            </el-table-column>
+          </dilTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
   </div>
 </template>
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "inplantTMS",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       input: null,
       Time: "",
       activeName: "first",
       option1: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: "",
         // 控制显示多选列
-        selectionType: "select",
+        selectionType: "select"
       },
       option2: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: ""
       },
       option3: {
         // 表格请求数据的地址
-        requestUrl:
-          "",
+        requestUrl: ""
       },
       selection: [],
-      maplist:[],
-       //记录旧的row对象
+      maplist: [],
+      //记录旧的row对象
       oldRow: "",
       //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态
       oldRowCount: 1,
@@ -181,75 +223,108 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: 150,
+          width: 150
         },
         {
           prop: "specificationModel",
           label: "规格型号",
-          width: 150,
+          width: 150
         },
         {
           prop: "materialNumber",
           label: "物资件数",
-          width: 100,
+          width: 100
         },
         {
           prop: "materialWeight",
           label: "物资重量",
-          width: 100,
-        },
+          width: 100
+        }
       ],
       tableData: [],
-      tableData1:[],
-      tableData2:[]
+      tableData1: [],
+      tableData2: []
     };
   },
-  created(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0",
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1",
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1"       
-      }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" + getCookie("orgCode"),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" + getCookie("orgCode"),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode")
-      } 
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu"
+    ) {
+      this.option1.requestUrl =
+        "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0";
+      this.option2.requestUrl =
+        "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1";
+      this.option3.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1";
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" +
+        getCookie("orgCode");
+      this.option2.requestUrl =
+        "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" +
+        getCookie("orgCode");
+      this.option3.requestUrl =
+        "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" +
+        getCookie("orgCode");
+    }
   },
   methods: {
-    getRequestUrl(){
-      if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" + new Date()
-      }else{
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" + getCookie("orgCode") + "&test=" + new Date(),
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" + getCookie("orgCode") + "&test=" + new Date(),
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" + getCookie("orgCode") + "&test=" + new Date()
-     }
+    getRequestUrl() {
+      if (
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu"
+      ) {
+        this.option1.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&test=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&test=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&test=" +
+          new Date();
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.option2.requestUrl =
+          "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+        this.option3.requestUrl =
+          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" +
+          getCookie("orgCode") +
+          "&test=" +
+          new Date();
+      }
     },
-    stopSpoOrder(scope){
+    stopSpoOrder(scope) {
       this.$confirm("是否停止", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
-            .post("/api/v1/ams/closeSporadicOrder" ,{
-              sporadicOrderId : scope.row.sporadicOrderId
+            .post("/api/v1/ams/closeSporadicOrder", {
+              sporadicOrderId: scope.row.sporadicOrderId
             })
-            .then((res) => {
+            .then(res => {
               if (res.data.code == 200) {
                 this.$message({
                   type: "success",
-                  message: "成功停止!",
+                  message: "成功停止!"
                 });
-              this.getRequestUrl()
+                this.getRequestUrl();
               } else {
                 this.$message({
                   message: "停止失败",
-                  type: "warning",
+                  type: "warning"
                 });
               }
             });
@@ -257,7 +332,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "停止操作已取消!",
+            message: "停止操作已取消!"
           });
         });
     },
@@ -266,50 +341,85 @@ export default {
       this.maplist = selection;
     },
     onclick() {
-      if(this.input != null){
-        if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu")
-        {
-          if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&con=" + this.input
-          }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&con=" + this.input
-          }else{
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&con=" + this.input
-          }                
-        }else
-        {
-          if(this.activeName == "first"){
-            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=0&orderType=12&dispatchStatus=0&userId=" + getCookie("orgCode") + "&con=" + this.input
-          }else if(this.activeName == "second"){
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" + getCookie("orgCode") + "&con=" + this.input
-          }else{
-            this.option3.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=11&userId=" + getCookie("orgCode") + "&con=" + this.input
-          }       
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
+      if (
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu"
+      ) {
+        if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&con=" +
+            this.input +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&i=" +
+            new Date();
         }
-        }else{
-        this.$message.warning("未输入查询条件")
+      } else {
+        if (this.activeName == "second") {
+          this.option2.requestUrl =
+            "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&userId=" +
+            getCookie("orgCode") +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        } else {
+          this.option3.requestUrl =
+            "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&type1=1&userId=" +
+            getCookie("orgCode") +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
         }
+      }
     },
     handleClick(tab, event) {
-      this.getRequestUrl()
+      this.getRequestUrl();
     },
     // 下发
     sendClick() {
-      if(this.maplist.length == 0){
-        this.$message.warning('未选择零星订单')
-        return
+      if (this.maplist.length == 0) {
+        this.$message.warning("未选择零星订单");
+        return;
       }
       this.axios
         .post("/api/v1/ams/issueSporadicOrders", this.maplist)
-        .then((res) => {
+        .then(res => {
           if (res.data.code == "200") {
-            this.getRequestUrl()
+            this.getRequestUrl();
             // this.$router.go(0)
             this.$message({
               type: "success",
-              message: "下发成功!",
+              message: "下发成功!"
             });
-            this.maplist = []
+            this.maplist = [];
           }
         });
     },
@@ -319,25 +429,25 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true,
+        center: true
       })
         .then(() => {
           this.axios
-          .post(
-          "/api/v1/ams/deleteSporadicOrders?sporadicOrderId=" +
-            scope.row.sporadicOrderId
+            .post(
+              "/api/v1/ams/deleteSporadicOrders?sporadicOrderId=" +
+                scope.row.sporadicOrderId
             )
-            .then((res) => {
+            .then(res => {
               if (res.data.code == 200) {
                 this.$message({
                   type: "success",
-                  message: "成功删除!",
+                  message: "成功删除!"
                 });
-              this.getRequestUrl()
+                this.getRequestUrl();
               } else {
                 this.$message({
                   message: "删除失败",
-                  type: "warning",
+                  type: "warning"
                 });
               }
             });
@@ -345,7 +455,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "删除操作已取消!",
+            message: "删除操作已取消!"
           });
         });
     },
@@ -354,8 +464,8 @@ export default {
       this.$router.push("addOldSporadicAppoint");
     },
     //获取物资详情--未下发
-    getMatrialDetails1(row){
-      console.log("wuzixq")
+    getMatrialDetails1(row) {
+      console.log("wuzixq");
       // 记录重复点击次数
       if (this.oldRow === row) {
         this.oldRowCount += 1;
@@ -377,15 +487,17 @@ export default {
       }
       // 重置上一个点击对象
       this.oldRow = row;
-      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
-        console.log(res.data.data)
-        this.tableData = res.data.data
-      })
+      this.axios
+        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
+        .then(res => {
+          console.log(res.data.data);
+          this.tableData = res.data.data;
+        });
     },
     //获取物资详情--已下发
 
-    getMatrialDetails2(row){
-      console.log("wuzixq")
+    getMatrialDetails2(row) {
+      console.log("wuzixq");
       // 记录重复点击次数
       if (this.oldRow1 === row) {
         this.oldRowCount1 += 1;
@@ -407,12 +519,14 @@ export default {
       }
       // 重置上一个点击对象
       this.oldRow1 = row;
-      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
-        console.log(res.data.data)
-        this.tableData1 = res.data.data
-      })
+      this.axios
+        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
+        .then(res => {
+          console.log(res.data.data);
+          this.tableData1 = res.data.data;
+        });
     },
-    getMatrialDetails3(row){
+    getMatrialDetails3(row) {
       // 记录重复点击次数
       if (this.oldRow2 === row) {
         this.oldRowCount2 += 1;
@@ -434,22 +548,25 @@ export default {
       }
       // 重置上一个点击对象
       this.oldRow2 = row;
-      this.axios.post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId).then((res) =>{
-        console.log(res.data.data)
-        this.tableData1 = res.data.data
-      })
+      this.axios
+        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
+        .then(res => {
+          console.log(res.data.data);
+          this.tableData1 = res.data.data;
+        });
     }
-  },
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .homeworkPath {
   .top {
-    padding: 40px;
-    .el-input {
-      width: 250px;
-      margin-right: 20px;
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
-</style>
+</style>

src/views/SporadicManage/router/index.js

@@ -1,190 +1,489 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-import routerBefore from '@/config/routerBefore.js'
+import routerBefore from "@/config/routerBefore.js";
 
 // 主要
-import main from '@/components/main.vue'
+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 sporadicTransportAppoint from "../components/sporadicMaterial/transportAppoint/transportAppoint.vue";
+import addSporadicTransportAppoint from "../components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue";
+import editSporadicTransportAppoint from "../components/sporadicMaterial/transportAppoint/editTransportAppoint.vue";
 //内转零星运输计划
-import addSporadicTransportPlan from '../components/sporadicMaterial/transportPlan/addTransportPlan.vue'
-import sporadicTransportPlan from '../components/sporadicMaterial/transportPlan/transportPlan.vue'
+import addSporadicTransportPlan from "../components/sporadicMaterial/transportPlan/addTransportPlan.vue";
+import sporadicTransportPlan from "../components/sporadicMaterial/transportPlan/transportPlan.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 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 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 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 oldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/transportAppoint.vue'
-import addOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue'
-import editOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/editTransportAppoint.vue'
+import oldSporadicAppoint from "../components/oldAreaSporadic/transportAppoint/transportAppoint.vue";
+import addOldSporadicAppoint from "../components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue";
 //老厂零星物资运输派单
-import oldSporadicOrder from '../components/oldAreaSporadic/transportOrder/transportOrder.vue'
-import addOldSporadicOrder from '../components/oldAreaSporadic/transportOrder/addTransportOrder.vue'
+import oldSporadicOrder from "../components/oldAreaSporadic/transportOrder/transportOrder.vue";
+import addOldSporadicOrder from "../components/oldAreaSporadic/transportOrder/addTransportOrder.vue";
 
 //老厂零星物资中转
-import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue'
-import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
-import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
-import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
-import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
-import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
+import oldSporadicInwardTenfactory from "../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue";
+import oldSporadicInwardGrossWeight from "../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue";
+import oldSporadicInwardoutFactory from "../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue";
+import oldSporadicInwardtareWeight from "../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue";
+import oldSporadicInwardload from "../components/oldAreaSporadic/inwardSporadicFactory/Load.vue";
+import oldSporadicInwardUnload from "../components/oldAreaSporadic/inwardSporadicFactory/unload.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 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 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'
+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";
 
 //一车多趟运输预约
-import mornThanTransportAppoint from '../components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue'
-import addMornThanTransportAppoint from '../components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue'
+import mornThanTransportAppoint from "../components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue";
+import addMornThanTransportAppoint from "../components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue";
 //一车多趟运输派单
-import mornThanTransportOrder from '../components/moreThanMaterialTruck/transportOrder/transportOrder.vue'
-import addMornThanTransportOrder from '../components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue'
+import mornThanTransportOrder from "../components/moreThanMaterialTruck/transportOrder/transportOrder.vue";
+import addMornThanTransportOrder from "../components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue";
 //一车多趟运输执行进厂
-import mornThanENenfactory from '../components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue'
-import mornThanENgrossWeight from '../components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue'
-import mornThanENoutFactory from '../components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue'
-import mornThanENtareWeight from '../components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue'
-import mornThanENunload from '../components/moreThanMaterialTruck/sporadicEnfactory/unload.vue'
+import mornThanENenfactory from "../components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue";
+import mornThanENgrossWeight from "../components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue";
+import mornThanENoutFactory from "../components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue";
+import mornThanENtareWeight from "../components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue";
+import mornThanENunload from "../components/moreThanMaterialTruck/sporadicEnfactory/unload.vue";
 //一车多趟运输执行出厂
-import mornThanOUTenfactory from '../components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue'
-import mornThanOUTgrossWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue'
-import mornThanOUToutFactory from '../components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue'
-import mornThanOUTtareWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue'
-import mornThanOUTload from '../components/moreThanMaterialTruck/sporadicOutfactory/load.vue'
+import mornThanOUTenfactory from "../components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue";
+import mornThanOUTgrossWeight from "../components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue";
+import mornThanOUToutFactory from "../components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue";
+import mornThanOUTtareWeight from "../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue";
+import mornThanOUTload from "../components/moreThanMaterialTruck/sporadicOutfactory/load.vue";
 
 // 内转零星内转进厂展示界面
-import sporadicEnfactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/enFactory.vue'
-import sporadicgrossWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue'
-import sporadicLeavefactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue'
-import sporadicLoadInward from '../components/sporadicMaterial/inwardSporadicFactory/Load.vue'
-import sporadicTareWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue'
-import sporadicUnloadInward from '../components/sporadicMaterial/inwardSporadicFactory/unload.vue'
+import sporadicEnfactoryInward from "../components/sporadicMaterial/inwardSporadicFactory/enFactory.vue";
+import sporadicgrossWeightInward from "../components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue";
+import sporadicLeavefactoryInward from "../components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue";
+import sporadicLoadInward from "../components/sporadicMaterial/inwardSporadicFactory/Load.vue";
+import sporadicTareWeightInward from "../components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue";
+import sporadicUnloadInward from "../components/sporadicMaterial/inwardSporadicFactory/unload.vue";
 
-Vue.use(Router)
+Vue.use(Router);
 const constantRouterMap = [
   {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
+    path: "/",
+    name: "main",
+    meta: { title: "首页", code: "xtpzgl" },
     component: main,
-    redirect: {name: 'addSporadicTransportAppoint'},
+    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: "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:'addSporadicTransportPlan',name:'addSporadicTransportPlan',meta:{code:'xtpzgl-jggl'},component:addSporadicTransportPlan},
-      {path:'sporadicTransportPlan',name:'sporadicTransportPlan',meta:{code:'xtpzgl-yhgl'},component:sporadicTransportPlan},
+      {
+        path: "addSporadicTransportPlan",
+        name: "addSporadicTransportPlan",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSporadicTransportPlan
+      },
+      {
+        path: "sporadicTransportPlan",
+        name: "sporadicTransportPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicTransportPlan
+      },
       //零星物资运输订单
-      {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: "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: "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: "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: "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: "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},
+      {
+        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
+      },
 
-       //一车多趟运输预约
-       {path:'addMornThanTransportAppoint',name:'addMornThanTransportAppoint',meta:{code:'xtpzgl-jggl'},component:addMornThanTransportAppoint},
-       {path:'mornThanTransportAppoint',name:'mornThanTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:mornThanTransportAppoint},
-       //一车多趟运输订单
-       {path:'addMornThanTransportOrder',name:'addMornThanTransportOrder',meta:{code:'xtpzgl-jggl'},component:addMornThanTransportOrder},
-       {path:'mornThanTransportOrder',name:'mornThanTransportOrder',meta:{code:'xtpzgl-yhgl'},component:mornThanTransportOrder},
-       //一车多趟进厂
-       {path:'mornThanENenfactory',name:'mornThanENenfactory',meta:{code:'xtpzgl-yhgl'},component:mornThanENenfactory},
-       {path:'mornThanENgrossWeight',name:'mornThanENgrossWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanENgrossWeight},
-       {path:'mornThanENoutFactory',name:'mornThanENoutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanENoutFactory},
-       {path:'mornThanENtareWeight',name:'mornThanENtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanENtareWeight},
-       {path:'mornThanENunload',name:'mornThanENunload',meta:{code:'xtpzgl-yhgl'},component:mornThanENunload},
-       //一车多趟出厂
-       {path:'mornThanOUTenfactory',name:'mornThanOUTenfactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTenfactory},
-       {path:'mornThanOUTgrossWeight',name:'mornThanOUTgrossWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTgrossWeight},
-       {path:'mornThanOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUToutFactory},
-       {path:'mornThanOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTtareWeight},
-       {path:'mornThanOUTload',name:'mornThanOUTload',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTload},
+      //一车多趟运输预约
+      {
+        path: "addMornThanTransportAppoint",
+        name: "addMornThanTransportAppoint",
+        meta: { code: "xtpzgl-jggl" },
+        component: addMornThanTransportAppoint
+      },
+      {
+        path: "mornThanTransportAppoint",
+        name: "mornThanTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanTransportAppoint
+      },
+      //一车多趟运输订单
+      {
+        path: "addMornThanTransportOrder",
+        name: "addMornThanTransportOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addMornThanTransportOrder
+      },
+      {
+        path: "mornThanTransportOrder",
+        name: "mornThanTransportOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanTransportOrder
+      },
+      //一车多趟进厂
+      {
+        path: "mornThanENenfactory",
+        name: "mornThanENenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENenfactory
+      },
+      {
+        path: "mornThanENgrossWeight",
+        name: "mornThanENgrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENgrossWeight
+      },
+      {
+        path: "mornThanENoutFactory",
+        name: "mornThanENoutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENoutFactory
+      },
+      {
+        path: "mornThanENtareWeight",
+        name: "mornThanENtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENtareWeight
+      },
+      {
+        path: "mornThanENunload",
+        name: "mornThanENunload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENunload
+      },
+      //一车多趟出厂
+      {
+        path: "mornThanOUTenfactory",
+        name: "mornThanOUTenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTenfactory
+      },
+      {
+        path: "mornThanOUTgrossWeight",
+        name: "mornThanOUTgrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTgrossWeight
+      },
+      {
+        path: "mornThanOUToutFactory",
+        name: "sporadicOUToutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUToutFactory
+      },
+      {
+        path: "mornThanOUTtareWeight",
+        name: "sporadicOUTtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTtareWeight
+      },
+      {
+        path: "mornThanOUTload",
+        name: "mornThanOUTload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTload
+      },
 
-       //内转零星内转
-       {path:'sporadicEnfactoryInward',name:'sporadicEnfactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicEnfactoryInward},
-       {path:'sporadicgrossWeightInward',name:'sporadicgrossWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicgrossWeightInward},
-       {path:'sporadicLeavefactoryInward',name:'sporadicLeavefactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLeavefactoryInward},
-       {path:'sporadicLoadInward',name:'sporadicLoadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLoadInward},
-       {path:'sporadicTareWeightInward',name:'sporadicTareWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicTareWeightInward},
-       {path:'sporadicUnloadInward',name:'sporadicUnloadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicUnloadInward},
+      //内转零星内转
+      {
+        path: "sporadicEnfactoryInward",
+        name: "sporadicEnfactoryInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicEnfactoryInward
+      },
+      {
+        path: "sporadicgrossWeightInward",
+        name: "sporadicgrossWeightInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicgrossWeightInward
+      },
+      {
+        path: "sporadicLeavefactoryInward",
+        name: "sporadicLeavefactoryInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicLeavefactoryInward
+      },
+      {
+        path: "sporadicLoadInward",
+        name: "sporadicLoadInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicLoadInward
+      },
+      {
+        path: "sporadicTareWeightInward",
+        name: "sporadicTareWeightInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicTareWeightInward
+      },
+      {
+        path: "sporadicUnloadInward",
+        name: "sporadicUnloadInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicUnloadInward
+      },
 
       //老厂零星物资运输预约
-      {path:'addOldSporadicAppoint',name:'addOldSporadicAppoint',meta:{code:'xtpzgl-jggl'},component:addOldSporadicAppoint},
-      {path:'oldSporadicAppoint',name:'oldSporadicAppoint',meta:{code:'xtpzgl-yhgl'},component:oldSporadicAppoint},
-      {path: 'editSporadicTransportAppoint', name: 'editSporadicTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportAppoint},
+      {
+        path: "addOldSporadicAppoint",
+        name: "addOldSporadicAppoint",
+        meta: { code: "xtpzgl-jggl" },
+        component: addOldSporadicAppoint
+      },
+      {
+        path: "oldSporadicAppoint",
+        name: "oldSporadicAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicAppoint
+      },
+      {
+        path: "editSporadicTransportAppoint",
+        name: "editSporadicTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSporadicTransportAppoint
+      },
       //零星物资运输订单
-      {path:'addOldSporadicOrder',name:'addOldSporadicOrder',meta:{code:'xtpzgl-jggl'},component:addOldSporadicOrder},
-      {path:'oldSporadicOrder',name:'oldSporadicOrder',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOrder},
+      {
+        path: "addOldSporadicOrder",
+        name: "addOldSporadicOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addOldSporadicOrder
+      },
+      {
+        path: "oldSporadicOrder",
+        name: "oldSporadicOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicOrder
+      },
       //零星物资运输执行
-      {path:'oldSporadicInwardTenfactory',name:'oldSporadicInwardTenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardTenfactory},
-      {path:'oldSporadicInwardGrossWeight',name:'oldSporadicInwardGrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardGrossWeight},
-      {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
-      {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
-      {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
-      {path:'oldSporadicInwardload',name:'oldSporadicInwardload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardload},
-    ]    
+      {
+        path: "oldSporadicInwardTenfactory",
+        name: "oldSporadicInwardTenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardTenfactory
+      },
+      {
+        path: "oldSporadicInwardGrossWeight",
+        name: "oldSporadicInwardGrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardGrossWeight
+      },
+      {
+        path: "oldSporadicInwardoutFactory",
+        name: "oldSporadicInwardoutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardoutFactory
+      },
+      {
+        path: "oldSporadicInwardtareWeight",
+        name: "oldSporadicInwardtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardtareWeight
+      },
+      {
+        path: "oldSporadicInwardUnload",
+        name: "oldSporadicInwardUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardUnload
+      },
+      {
+        path: "oldSporadicInwardload",
+        name: "oldSporadicInwardload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardload
+      }
+    ]
   }
 ];
 
 const router = new Router({
   routes: constantRouterMap
-})
+});
 //  before
 routerBefore(router, constantRouterMap);
 

src/views/TMS/app.js

@@ -21,6 +21,7 @@ Vue.config.productionTip = false;
 
 // 注册表格的全局组件
 import DilCommonUI from "@/components/DilCommonUI";
+
 Vue.use(DilCommonUI);
 
 Vue.use(VueApollo)

src/views/TMS/components/domesticMine/approveWagonPleaseAdd.vue

@@ -96,7 +96,7 @@ export default {
       else
         this.axios
           .post("/api/v1/tms/addApproveWagonPlease", approveWagonPlease)
-          .then(() => {
+          .then((res) => {
             if(res.data.code=="200"){
             this.$message({
               type: "success",
@@ -110,7 +110,6 @@ export default {
 };
 </script>
 <style lang="scss">
-// @import "@/styles/appoint/contract/ContractInsert.scss";
 #trainTransport {
   .form {
     display: flex;

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -20,34 +20,33 @@
         </span>
       </div>
     </div>
-    <div class="matching">
-      <span class="text">是否知道采购订单号:</span>
-      <el-switch
-        v-model="matching"
-        active-color="#27d452"
-        inactive-color="#e1e3e6"
-      >
-      </el-switch>
-      <span class="span"></span>
+    <div class="matching item">
+          <span class="text">是否知道采购订单号:</span>
+          <el-switch
+            v-model="matching"
+            active-color="#27d452"
+            inactive-color="#e1e3e6"
+          >
+          </el-switch>
     </div>
-    <div class="material from">
+    <div class="material item">
       <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">
+    <div class="forwardingUnit item">
       <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" v-if="matching">
+    <div class="forwardingUnit item" v-if="matching">
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
     <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
         <el-form-item label="发站:">
           <el-autocomplete
             class="inline-input"
@@ -63,7 +62,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
         <el-form-item label="到站:">
           <el-autocomplete
             class="inline-input"
@@ -90,7 +89,7 @@
       </el-input>
       <span class="span"></span>
     </div>
-    <div class="purchaseOrder from" v-if="matching" style="width:330px;margin-left:544px;padding-bottom:15px">
+    <div class="purchaseOrder from" v-if="matching" >
       <span class="text" style="width:140px">采购订单号：</span>
       <el-input
         v-model="purchaseOrderNo"
@@ -560,12 +559,12 @@ export default {
     }
   }
   .matching {
-    width: 100%;
+    width: 20rem;
     height: 3.125rem;
     display: flex;
     justify-content: center;
     align-items: center;
-    margin-left: 160px;
+    margin-left: 24rem;
     .text {
       width: 8.75rem;
     }
@@ -580,7 +579,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
-    margin-left: 27rem;
+    margin-left: 24rem;
     width: 20rem;
     .text {
       text-align: right;
@@ -592,7 +591,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
-    margin-left: 27rem;
+    margin-left: 24rem;
     width: 20rem;
     .text {
       text-align: right;
@@ -604,6 +603,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 24rem;
+    width: 22rem;
     .text {
       text-align: right;
       width: 5.625rem;
@@ -622,6 +623,9 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
+    margin-left: 24rem;
+    width: 22rem;
+    margin-bottom: 15px;
     .span {
       display: inline-block;
       width: 1.875rem;
@@ -629,11 +633,12 @@ export default {
     }
   }
   .form {
-   display: flex;
+    display: flex;
+    width: 340px;
+    margin-left:25rem; 
+    margin-right: 20px;
     .form_box {
-      width: 340px;
-      margin-left: 37%; 
-      margin-right: 20px;
+      
       .el-form {
         .preview-group {
           .el-form-item {

src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -8,30 +8,30 @@
       ></dilTable>
     </div>
 
-    <div class="material from">
+    <div class="material form">
       <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">
+    <div class="forwardingUnit form">
       <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">
+    <div class="forwardingUnit form">
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
-    <div class="remark from">
-      <span class="text" style="margin-left: 60px; ">船名(备注)：</span>
-      <el-input v-model="remark" @blur="onBlur" style="width: 230px; margin-right:140px"> </el-input>
+    <div class="remark form">
+      <span class="text" >船名(备注)：</span>
+      <el-input v-model="remark" @blur="onBlur" > </el-input>
       <span class="span"></span>
     </div>
 
     <div class="form">
-      <div class="form_box">
+      <div class="form_box">  
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
@@ -345,10 +345,6 @@ export default {
       width: 1.875rem;
       height: 1.25rem;
     }
-    .el-input{
-      width: 13.5rem;
-      margin-right: 2.375rem;
-    }
   }
   .purchaseOrder {
     display: flex;
@@ -361,11 +357,10 @@ export default {
     }
   }
   .form {
-   display: flex;
+    display: flex;
+    width: 340px;
+    margin-left:23rem; 
     .form_box {
-      width: 340px;
-      margin-left: 37%; 
-      margin-right: 20px;
       .el-form {
         .preview-group {
           .el-form-item {

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -9,12 +9,12 @@
       </div>
     </div>
 
-    <div class="fromOther">
-      <el-form
+    <div class="formOther">
+      <div class="form_box">
+          <el-form
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
-        style="margin-left: 525px"
       >
         <el-form-item label="发货单位">
           <el-autocomplete
@@ -25,13 +25,11 @@
             :trigger-on-focus="false"
             @select="handleSelectSupplier"
           >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.supplierName }}</div>
-            </template>
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.supplierName }}</div>
+              </template>
           </el-autocomplete>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <el-form-item label="发站">
           <el-autocomplete
             class="inline-input"
@@ -46,8 +44,6 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <el-form-item label="到站">
           <el-autocomplete
             class="inline-input"
@@ -63,6 +59,8 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
+    
+      </div>
     </div>
     <div class="trainTransport">
       <!-- 确定和取消 -->
@@ -259,7 +257,7 @@ export default {
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
@@ -297,4 +295,36 @@ export default {
     }
   }
 }
+
+ .formOther {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .button_box {
+              margin-left: 42%;
+              margin-top: 55px;
+            }
+          }
+        }
+      }
+    }
+  }
 </style>

src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -7,55 +7,53 @@
           <dil-form :formId="117" v-model="form1"></dil-form>
         </div>
     </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
-        <el-form-item label="发货单位">
-          <el-autocomplete
-            class="inline-input"
-            v-model="stateSupplier"
-            :fetch-suggestions="querySearchSupplier"
-            placeholder="请输入发货单位名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSupplier"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.supplierName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
-        <el-form-item label="发站">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
-        <el-form-item label="到站">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
+    <div class="formOther">
+      <div  class="form_box">
+          <el-form :inline="true" class="demo-form-inline" label-width="80px">
+            <el-form-item label="发货单位">
+              <el-autocomplete
+                class="inline-input"
+                v-model="stateSupplier"
+                :fetch-suggestions="querySearchSupplier"
+                placeholder="请输入发货单位名称"
+                :trigger-on-focus="false"
+                @select="handleSelectSupplier"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.supplierName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="发站">
+              <el-autocomplete
+                class="inline-input"
+                v-model="sendStation"
+                :fetch-suggestions="querySearchSendStation"
+                placeholder="请输入发站名称"
+                :trigger-on-focus="false"
+                @select="handleSelectSendStation"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.arrivalName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="到站">
+              <el-autocomplete
+                class="inline-input"
+                v-model="toTheStation"
+                :fetch-suggestions="querySearchToTheStation"
+                placeholder="请输入到站名称"
+                :trigger-on-focus="false"
+                @select="handleSelectToTheStation"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.arrivalName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+          </el-form>
+      </div>
     </div> 
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -245,7 +243,7 @@ export default {
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
@@ -273,5 +271,36 @@ export default {
     margin-top: 55px;
   }
 }
+.formOther {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .button_box {
+              margin-left: 42%;
+              margin-top: 55px;
+            }
+          }
+        }
+      }
+    }
+  }
 </style>
 </style>

src/views/TMS/components/importedShip/addShipmentInstructions.vue

@@ -5,6 +5,14 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="114" v-model="form1" ref="from1"></dil-form>
+        <span> 二程:海港-江港</span>
+        <el-switch
+          v-model="status"
+          active-color="#13ce66"
+          inactive-color="#909399"
+          @change="changeStatus"
+        >
+        </el-switch>
       </div>
       <div class="liulan">
         <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
@@ -58,11 +66,13 @@ export default {
       options: {
         requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=383",
         selectionType: "radio",
-        maplist: []
+        maplist: [],
       },
+      status: false,
       form1: {},
       value: undefined,
-      batchId: ""
+      batchId: "",
+     
     };
   },
   mounted() {},
@@ -70,6 +80,11 @@ export default {
     onDrawer() {
       this.drawer = true;
     },
+    changeStatus(){
+      this.status=true,
+      console.log("aaa",this.status);
+    },
+    
     onclick() {
       this.options.requestUrl =
         "/api/v1/tms/getBatchList?apiId=383&con=" + this.input;
@@ -80,7 +95,11 @@ export default {
         this.$set(
           this.form1,
           "batchId",
-          selection.resultForeignShipName +"-"+selection.materialName+"-" +selection.infactoryShipName
+          selection.resultForeignShipName +
+            "-" +
+            selection.materialName +
+            "-" +
+            selection.infactoryShipName
         );
         this.batchId = selection.batchId;
       }
@@ -97,7 +116,8 @@ export default {
       let omsshipShipmentInstructions = {
         batchId: this.maplist.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
-        instructionTime: sjTime(this.form1.instructionTime)
+        instructionTime: sjTime(this.form1.instructionTime),
+        statu:this.status,
       };
 
       //判断合计吨位是否为数字
@@ -126,11 +146,11 @@ export default {
             "/api/v1/tms/addShipmentInstructions",
             omsshipShipmentInstructions
           )
-          .then(res => {
+          .then((res) => {
             if (res.data.code == "200") {
               this.$message({
                 type: "success",
-                message: "新增成功"
+                message: "新增成功",
               });
             }
             this.$router.go(-1);
@@ -139,8 +159,8 @@ export default {
     // 取消
     cancel() {
       this.$router.go(-1);
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/TMS/components/importedShip/instructionsCapacity.vue

@@ -52,15 +52,15 @@ export default {
         // 表格请求数据的地址
         requestUrl:
           "/api/v1/tms/getCapacities?apiId=76&instructionsId=" +
-          this.$route.params.instructionsId
-      }
+          this.$route.params.instructionsId,
+      },
     };
   },
   methods: {
     querySearch(queryString, cb) {
       this.axios
         .post("/api/v1/tms/getShipNameList?state=" + this.state)
-        .then(res => {
+        .then((res) => {
           console.log(res.data.data);
           var restaurants = res.data.data;
           var results = queryString
@@ -71,7 +71,7 @@ export default {
         });
     },
     createFilter(queryString) {
-      return restaurant => {
+      return (restaurant) => {
         return (
           restaurant.capacityName
             .toLowerCase()
@@ -85,7 +85,7 @@ export default {
       console.log(this.capacityIds);
       this.axios
         .get("/api/v1/uc/getCapacityTel?capacityId=" + item.capacityId)
-        .then(res => {
+        .then((res) => {
           console.log(res.data);
           if (res.data) {
             this.$set(this.form, "instructionContactInf", res.data.capacityTel);
@@ -105,7 +105,8 @@ export default {
         instructionsShipPosition: this.form.instructionsShipPosition,
         instructionContactInf: this.form.instructionContactInf,
         instructionsCapacityStatus: this.form.instructionsCapacityStatus,
-        instructionEsarrivalTime: sjTime(this.form.instructionEsarrivalTime)
+        instructionEsarrivalTime: sjTime(this.form.instructionEsarrivalTime),
+        capacityBookingNumber: this.form.capacityBookingNumber,
       };
       //判断是否为电话号码
       function isTelePhone() {
@@ -144,6 +145,7 @@ export default {
       )
         this.$message.error("存在空值！");
       else if (!isNumber(val)) this.$message.warning("计划装载吨位必须为数字");
+      
       else if (!isTelePhone(val2)) this.$message.warning("联系方式格式错误");
       else
         this.axios
@@ -151,11 +153,11 @@ export default {
             "/api/v1/tms/addInstructionsCapacity",
             omsshipInstructionsCapacity
           )
-          .then(res => {
+          .then((res) => {
             if (res.data.code == 200) {
               this.$message({
                 type: "success",
-                message: "新增成功!"
+                message: "新增成功!",
               });
               // this.$refs.table.refreshData();
               this.option.requestUrl =
@@ -184,7 +186,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
@@ -192,7 +194,7 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
               this.option.requestUrl =
                 "/api/v1/tms/getCapacities?apiId=76&instructionsId=" +
@@ -204,11 +206,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">

src/views/TMS/components/importedShip/shipmentInstructionText.vue

@@ -0,0 +1,260 @@
+<template>
+  <div class="tableAllDate">
+    <page-title>返回</page-title>
+    <div id="pdfDom">
+      <div class="blank"></div>
+      <!-- 循环遍历传过来的数组中的所有的对象，生成多张提货委托书 -->
+      <div
+        v-for="(item, index) in shipmentInstructionLists"
+        :key="index"
+        style="margin-top:40px"
+      >
+        <div class="title">
+          <i class="titleText" align="center">装船指令</i>
+        </div>
+        <div>
+          <!-- tablePart0 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto;font-size:20px;"
+            width="1000px"
+            class="tablePart0"
+          >
+            <tr>
+              <td style="width :100%">
+                TO:{{ item.piername}}有限公司：
+              </td>
+            </tr>
+          </table>
+        </div>
+        <div class="tableBody">
+          <!-- tablePart1 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin-top: 5px;"
+            width="1000px"
+            class="tablePart1"
+          >
+            <tr>
+              <td style="width :100%" padding-right="20px">
+                &nbsp;&nbsp;&nbsp;&nbsp; 兹委任{{ item.carrierName }}有限公司
+               代表我司到贵港办理:海轮"{{item.foreignShipName}}"{{item.numberOfLoans}}湿吨
+               {{item.materialName}}的提货、数量、清场、交接等相关事宜。恳请给予办理为盼!!
+               谢谢!!(传真件与原件具有同等法律效应)。
+              </td>
+            </tr>
+          </table>
+        
+
+          
+          <!-- tablePart2 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+            border-top:0px"
+            width="1000px"
+            class="tablePart2"
+          >
+            <tr>
+              <th style="width:3%">具体提货船舶信息如下</th>
+              <th style="width :12.5%;padding-left:2 px;">船名航次:{{item.capacityNumber}} 航次 {{item.capacityBookingNumber}}</th>
+              <td style="width :10.5%">
+                {{ item.attorneyPickupContactPerson }}
+              </td>
+              <th style="width:3%"></th>
+              <th style="width :10%">身份证号：</th>
+              <td style="width :59%">{{ item.attorneyPickupIdcard }}</td>
+            </tr>
+          </table>
+
+          <!-- tablePart3 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart3"
+          >
+            <tr>
+              <th style="width:3%"></th>
+              <th style="width :10.5%">联系电话：</th>
+              <td style="width :98%">
+                {{ item.attorneyContactTelephone }}
+              </td>
+            </tr>
+          </table>
+
+          <!-- tablePart4 -->
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart4"
+          >
+            <tr>
+              <th style="width :12.5%">顺颂商祺！</th>
+            </tr>
+          </table>
+
+          <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart5"
+          >
+            <tr>
+              <th style="width :10.5%">（传真件/扫描件有效）</th>
+            </tr>
+          </table>
+        </div>
+        <div>
+          <!-- tablePart6 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto;margin-top: 5px;font-size:20px;"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width:50px;"></th>
+              <td style="width :33%">{{ item.shipperName }}</td>
+            </tr>
+          </table>
+        </div>
+        <div>
+          <!-- tablePart7 -->
+          <table
+            border="0"
+            cellpadding="10"
+            cellspacing="0"
+            style="margin: auto;margin-top: 5px;font-size:20px;"
+            width="1000px"
+            class="tablePart7"
+          >
+            <tr>
+              <td style="width :63%"></td>
+              <td style="width :4%">{{ item.year }}</td>
+              <th style="width :7%">年</th>
+              <td style="width :3%">{{ item.month }}</td>
+              <th style="width :7%">月</th>
+              <td style="width :3%">{{ item.date }}</td>
+              <th style="width :7%">日</th>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </div>
+    <div class="buttns">
+      <el-button class="buttn" type="primary" @click="getPdf()">
+        <i class="el-icon-download">{{ "\xa0\xa0" }}</i
+        >导出(pdf)
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import table from "@/components/DilCommonUI/packages/table/src/table.vue";
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { table },
+  components: { PageTitle },
+  name: "Login",
+  data() {
+    return {
+      shipmentInstructionLists: [],
+      htmlTitle: "委托书"
+    };
+  },
+  created() {
+    this.getwts();
+  },
+  methods: {
+    backScan() {
+      this.$router.go(-2);
+    },
+    getwts() {
+      // console.log(this.$route.params.test)
+      this.shipmentInstructionLists = JSON.parse(
+        this.$route.params.test
+      ).shipmentInstructionLists;
+      console.log(this.shipmentInstructionLists);
+      // this.amsShipDeliveryNameLists = this.$route.params.test;
+      console.log(this.shipmentInstructionLists);
+      this.shipmentInstructionLists.forEach(e => {
+        e.year = e.instructionTime.split("-")[0];
+        e.month = e.instructionTime.split("-")[1];
+        e.date = e.instructionTime.split("-")[2].split(" ")[0];
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  text-align: center;
+  margin-bottom: 30px;
+  .titleText {
+    font-size: 30px;
+  }
+}
+.buttns {
+  display: flex;
+  flex-wrap: nowrap;
+  margin-top: 20px;
+  margin-left: 465px;
+  .buttn {
+    margin-left: 10px;
+    width: 130px;
+  }
+}
+.tableBody {
+  table,
+  th,
+  td {
+    border: 0px solid black;
+    font-size: 20px;
+    margin: auto;
+  }
+  .tablePart1 th {
+    border-top: 1px solid black;
+  }
+  .tablePart2 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart3 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart4 td,
+  th {
+    border-top: 0px;
+  }
+  .tablePart5 td,
+  th {
+    border-top: 0px;
+  }
+}
+.blank {
+  width: 100%;
+  height: 50px;
+}
+</style>

src/views/TMS/components/importedShip/shipmentInstructions.vue

@@ -15,6 +15,14 @@
       <el-button class="btn" type="primary" @click="btnclick(0)">
         <i class="el-icon-circle-plus-outline"></i>新增
       </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="addPick"
+        v-if="activeName === 'second'"
+      >
+        <i class="el-icon-circle-plus-outline"></i>生成转船指令PDF
+      </el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 未下发 -->
@@ -57,7 +65,10 @@
       </el-tab-pane>
       <!-- 已下发 -->
       <el-tab-pane label="已下发" name="second">
-        <dilTable v-bind.sync="option2"></dilTable>
+        <dilTable
+          v-bind.sync="option2"
+          @selection-change="selectionChange"
+        ></dilTable>
       </el-tab-pane>
     </el-tabs>
   </div>
@@ -74,17 +85,40 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发"
+          "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发",
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发"
-      }
+          "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=已下发",
+        selectionType: "select",
+      },
+      shipmentInstructionList: [],
     };
   },
   mounted() {},
   methods: {
+    selectionChange(selection) {
+      // console.log(selection);
+      this.shipmentInstructionList = selection;
+    },
+    addPick() {
+      if (this.shipmentInstructionList.length == 0) {
+        this.$message.warning("请勾选已下发的提货委托,方可生成提货委托书");
+        return;
+      }
+      // if (this.shipmentInstructionList.instructions != null) {
+      //   this.$message.warning("请勾选已下发的提货委托,方可生成提货委托书");
+      //   return;
+      // }
+      let shipmentInstructionList = {
+        shipmentInstructionList: this.shipmentInstructionList,
+      };
+      // console.log("list", shipmentInstructionList);
+      let test = encodeURIComponent(JSON.stringify(shipmentInstructionList));
+      console.log("test",test);
+      this.$router.push("/shipmentInstructionText/" + test);
+    },
     handleClick(tab, event) {
       console.log(tab, event);
     },
@@ -104,7 +138,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
@@ -112,7 +146,7 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "删除成功!"
+                message: "删除成功!",
               });
               this.option.requestUrl =
                 "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发&i=" +
@@ -125,7 +159,7 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消删除!"
+            message: "取消删除!",
           });
         });
     },
@@ -135,7 +169,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
-        center: true
+        center: true,
       })
         .then(() => {
           this.axios
@@ -145,7 +179,7 @@ export default {
             .then(() => {
               this.$message({
                 type: "success",
-                message: "下发成功!"
+                message: "下发成功!",
               });
               this.option.requestUrl =
                 "/api/v1/tms/getShipMentInstructionsList?apiId=74&status=未下发&i=" +
@@ -158,11 +192,11 @@ export default {
         .catch(() => {
           this.$message({
             type: "info",
-            message: "取消下发!"
+            message: "取消下发!",
           });
         });
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -174,7 +208,7 @@ export default {
       margin-right: 40rpx;
     }
     .btn {
-      width: 5.5%;
+      width: 12%;
       margin-left: 0.25rem;
     }
   }

src/views/TMS/router/index.js

@@ -209,7 +209,7 @@ import mineralGrossResult from '../components/importedMineral/transportExcute/gr
 import mineralTareResult from '../components/importedMineral/transportExcute/tareResult.vue'
 import mineralUnload from '../components/importedMineral/transportExcute/unload.vue'
 import mineralQuality from '../components/importedMineral/transportExcute/qualityResult.vue'
-
+import shipmentInstructionText from '../components/importedShip/shipmentInstructionText.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -348,6 +348,7 @@ const constantRouterMap = [
       {path: 'updateWaterQuality/:resultId', name: 'updateWaterQuality', meta: {code: 'xtpzgl-yhgl'}, component: updateWaterQuality},
       {path: 'waterQuality', name: 'waterQuality', meta: {code: 'xtpzgl-yhgl'}, component: waterQuality},
       {path: 'updateLoadShip/:resultId', name: 'updateLoadShip', meta: {code: 'xtpzgl-yhgl'}, component: updateLoadShip},
+      {path: 'shipmentInstructionText', name: 'shipmentInstructionText', meta: {code: 'xtpzgl-yhgl'}, component: shipmentInstructionText},
 
       {path: 'assignmentPlan', name: 'assignmentPlan', meta: {code: 'xtpzgl-yhgl'}, component: assignmentPlan},
       {path: 'breakdownPlan', name: 'breakdownPlan', meta: {code: 'xtpzgl-yhgl'}, component: breakdownPlan},

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

@@ -26,13 +26,13 @@
       >
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
+        <i class="el-icon-search"></i>
       </el-button>
       <el-button type="primary" @click="btnclick(0)">
         <i class="el-icon-plus"></i>钢材订单新增
       </el-button>
       <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
+        <i class="el-icon-refresh"></i>
       </el-button>
       <el-button type="primary" @click="batchReport">
         <i class="upload2"></i>批量上传
@@ -41,7 +41,7 @@
         type="primary"
         @click="exportData()"
         v-if="activeName == 'first'"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
+        ><i class="el-icon-download"></i>Excel</el-button
       >
     </div>
     <div class="table">
@@ -106,7 +106,7 @@
                   >关闭订单</el-button
                 >
                 <el-button
-                  @click="updateSaleOrder(scope.row.saleOrderId)"
+                  @click="updateSaleOrder(scope.row)"
                   type="text"
                   size="small"
                   >异常处理</el-button
@@ -292,7 +292,7 @@ export default {
     updateSaleOrder(row) {
       console.log(row);
       this.$router.push(
-        "updateSaleOrderSteel/" + row.saleOrderId + "&deleted=1"
+        "updateSaleOrderSteel/" + row.saleOrderId + "/" + row.deleted
       );
     },
     getOrderDetails(saleOrderId) {
@@ -529,10 +529,6 @@ export default {
   .top {
     margin-left: 20px;
     margin-top: 20px;
-    .el-input {
-      width: 20%;
-      margin-right: 1.25rem;
-    }
   }
   .table {
     margin-left: 20px;

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

@@ -157,10 +157,28 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="200">
           <template slot-scope="scope">
-            <el-button type="text" size="mini" @click="updateMaterial(scope)">
+            <el-button
+              type="text"
+              size="mini"
+              @click="updateMaterial(scope)"
+              v-if="deleted == 1"
+            >
               物资变更
             </el-button>
-            <el-button type="text" size="mini" @click="updateAddress(scope)">
+            <el-button
+              type="text"
+              size="mini"
+              @click="updateCapacity(scope)"
+              v-if="deleted == 0"
+            >
+              车辆变更
+            </el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="updateAddress(scope)"
+              v-if="deleted == 0"
+            >
               收货地址变更
             </el-button>
           </template>
@@ -363,12 +381,41 @@
         </div>
       </el-dialog>
     </div>
+    <!-- 修改运力弹窗 -->
+    <div class="updateCapcityDialog">
+      <el-dialog title="修改车牌号" :visible.sync="capacityDialog" width="90%">
+        <div style="magin-bottom:20px,color: red;">
+          原车牌号:{{ oldCapacityNum }}
+        </div>
+        <div class="inputItem">
+          <el-input v-model="inputCapacity1" style="width:200px"></el-input>
+          <el-button type="primary" @click="handleCapacity"
+            ><i class="el-icon-search"></i
+          ></el-button>
+        </div>
+        <div class="capacityItem">
+          <dilTable
+            v-bind.sync="capacityOptions"
+            @radio-change="radioChangeCapcity"
+          ></dilTable>
+        </div>
+        <div slot="footer" class="button-box">
+          <el-button @click="capacityDialog = false">取 消</el-button>
+          <el-button type="primary" @click="updateCapacitySure">确定</el-button>
+        </div>
+      </el-dialog>
+    </div>
   </div>
 </template>
 <script>
 export default {
   data() {
     return {
+      inputCapacity1: null,
+      newCapacityId: null,
+      newCapacityNum: null,
+      oldCapacityNum: null,
+      capacityDialog: false,
       addressDialog: false,
       currentTable: false,
       title: "",
@@ -385,6 +432,11 @@ export default {
           label2: "否"
         }
       ],
+      capacityOptions: {
+        requestUrl: "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248",
+        // 控制显示单选列
+        selectionType: "radio"
+      },
       table1: false,
       isDelete: false,
       dialogTableVisible: false,
@@ -481,22 +533,92 @@ export default {
       //省市县Id
       addressId: null,
       orderSaleMap: {},
-      isNewCar: null
+      isNewCar: null,
+      deleted: 0,
+      lineSequence: null
     };
   },
   watch: {
     dialogTableVisible() {
       this.getOrderList();
+    },
+    capacityDialog() {
+      this.getOrderList();
+      this.inputCapacity1 = null;
+      this.capacityOptions.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&i=" + new Date();
     }
   },
+  created() {
+    this.deleted = this.$route.params.deleted;
+  },
   mounted() {
     console.log(this.$route);
+    console.log(this.$route.params.deleted);
+
     this.getOrderList();
     this.getAllProvince();
   },
   methods: {
+    //车辆变更
+    updateCapacity(scope) {
+      this.oldCapacityNum = scope.row.capacityNumber;
+      this.$confirm("确定变更车辆吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        center: true,
+        type: "info"
+      })
+        .then(() => {
+          this.capacityDialog = true;
+        })
+        .catch(() => {
+          this.$message.info("取消变更");
+        });
+    },
+    radioChangeCapcity(row) {
+      this.newCapacityNum = row.capacityNumber;
+      this.newCapacityId = row.capacityId;
+    },
+    updateCapacitySure() {
+      let map = {
+        orderId: this.orderId,
+        saleOrderMaterialId: this.saleOrderMaterialId,
+        lineSequence: this.lineSequence,
+        capacityId: this.newCapacityId
+      };
+      let title = `确定将-${this.oldCapacityNum}-替换为-${this.newCapacityNum}?`;
+      this.$confirm(title, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "info",
+        center: true
+      }).then(() => {
+        this.axios
+          .post("/api/v1/ams/updateCapacityNumberInFactory", map)
+          .then(res => {
+            if (res.data.code == 200) {
+              this.$message.success("变更成功");
+              this.capacityDialog = false;
+            } else {
+              this.$message.success("变更失败，请联系管理员");
+              this.capacityDialog = false;
+            }
+          })
+          .catch(() => {
+            this.$message.success("变更失败，请联系管理员");
+            this.capacityDialog = false;
+          });
+      });
+    },
+    handleCapacity() {
+      this.capacityOptions.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&index=" +
+        this.inputCapacity1 +
+        "&i=" +
+        new Date();
+    },
     updateAddress(scope) {
-      console.log(scope);
       this.capacityNumber = scope.row.capacityNumber;
       this.oldAddress = scope.row.completeAddress;
       this.orderSaleMap = scope.row;
@@ -1026,6 +1148,7 @@ export default {
           this.tableData = [];
           this.tableData = res.data.data;
           this.orderId = this.tableData[0].orderId;
+          this.lineSequence = this.tableData[0].lineSequence;
           this.saleOrderMaterialId = this.tableData[0].saleOrderMaterialId;
           this.getSpanArr(this.tableData);
         });

src/views/appoint/components/ship/addDeliveryAttorney.vue

@@ -82,7 +82,10 @@ export default {
       attorneyTime: new Date()
     };
   },
-  mounted() {},
+  mounted() {
+     this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
+     this.$set(this.form1, "carrierId", 11);
+  },
   methods: {
     getPersonInfo() {
       console.log(this.form1);
@@ -132,6 +135,8 @@ export default {
         return;
       }
       let AmsshipDeliveryAttorney = {
+        carrierId: this.form1.carrierId, //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
+        requesterGroupId: this.form1.requesterGroupId,
         downSwimPortId: this.form1.downSwimPortId,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyContactTelephone: this.form1.attorneyContactTelephone,

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -9,15 +9,14 @@
         >浏览</el-button
       >
     </div> -->
-    <!-- 货权转移送达单位 -->
+    <!-- 货权转移送达单位 
     <div class="mofrom">
       <span class="motext">货权转移送达单位</span>
       <el-input class="moinput" v-model="cargo" disabled> </el-input>
       <el-button class="mobutton" type="primary" @click="ondrawer(2)"
         >浏览</el-button
       >
-    </div>
-
+    </div>-->
     <!--大品类 -->
     <div class="mofrom">
       <span class="motext">大品类</span>
@@ -125,6 +124,7 @@
           class="upload-demo"
           style="width: 270px"
           ref="upload1"
+          accept=".pdf , .jpg, .png, .jpeg, .tif, .gif, .pcx, .tga, .exif, .fpx, .svg , .bmp"
           action="/api/v1/rms/uploadCarrier1"
           :before-upload="beforeUpload"
           :multiple="false"
@@ -180,7 +180,6 @@ export default {
       shippingCertificate: "",
      
       materialType: "",
-      cargo: "",
       receiver: "",
       input: "",
       drawer: false,
@@ -219,8 +218,8 @@ export default {
     };
   },
   mounted() {
-    this.$set(this.form1, "requesterGroupId", 1);
-    this.$set(this.form1, "carrierId", 11);
+    // this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
+    // this.$set(this.form1, "carrierId", 11);
   },
   methods: {
     upCLick(val) {
@@ -314,10 +313,10 @@ export default {
       //   this.$message.warning("请选择物资");
       //   return;
       // }
-      if (this.second1.mapList2.length == 0) {
-        this.$message.warning("请选择送达单位");
-        return;
-      }
+      // if (this.second1.mapList2.length == 0) {
+      //   this.$message.warning("请选择送达单位");
+      //   return;
+      // }
       if (this.second2.mapList3.length == 0) {
         this.$message.warning("请选择收货人");
         return;
@@ -346,8 +345,8 @@ export default {
       //电话号码赋值
       var val2 = this.value2;
       let map = {
-        carrierId: this.form1.carrierId,
-        requesterGroupId: this.form1.requesterGroupId,
+        // carrierId: this.form1.carrierId, //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
+        // requesterGroupId: this.form1.requesterGroupId,
         noticeCommerceMethod: this.form1.noticeCommerceMethod,
         noticeHandoverMethod: this.form1.noticeHandoverMethod,
         portId: this.form1.portId,
@@ -397,7 +396,7 @@ export default {
         map.resultContactPerson == null ||
         map.resultTelephoneFax == null ||
         map.resultNumberOfLoans == null ||
-        map.carrierId == null ||
+       //map.carrierId == null ||
         map.groupId == null ||
         map.inFactoryShipName == null ||
         map.isNeedPortDisCharge == null ||
@@ -412,6 +411,27 @@ export default {
         this.$message.warning("电话号码或传真格式不正确");
         return;
       }
+      if (
+        typeof map.noticePortConstructionFee != "undefined" &&
+        !isNumber(map.noticePortConstructionFee)
+      ) {
+        this.$message.error("港建费金额得为数字");
+        return;
+      }
+      if (
+        typeof map.purchaseContractMoisture != "undefined" &&
+        !isNumber(map.purchaseContractMoisture)
+      ) {
+        this.$message.error("合同水分得为数字");
+        return;
+      }
+      if (
+        typeof map.noticePortConstructionFee != "undefined" &&
+        !isNumber(map.noticePortConstructionFee)
+      ) {
+        this.$message.error("港建费金额得为数字");
+        return;
+      }
       if (
         typeof map.noticePileFreeDays != "undefined" &&
         !isNumber(map.noticePileFreeDays)

src/views/appoint/components/ship/attorneytext.vue

@@ -24,7 +24,7 @@
           >
             <tr>
               <td style="width :100%">
-                江苏{{ item.carrierName }}港口集团股份有限公司：
+                {{ item.carrierName }}有限公司：
               </td>
             </tr>
           </table>
@@ -41,33 +41,37 @@
           >
             <tr>
               <td style="width :100%" padding-right="20px">
-                兹委任重庆市万州区万港船务有限公司
-                前来贵港办理我公司的货权提货和水路运输事宜，品种：{{
+                &nbsp;&nbsp;&nbsp;&nbsp; 兹委任重庆市万州区万港船务有限公司
+                前来贵港办理我公司的货权提货和水路运输事宜，品种:{{
                   item.materialName
-                }}；外轮船名：{{ item.resultForeignShipName }}； 数量：{{
+                }};外轮船名：{{ item.resultForeignShipName }}; 数量:{{
                   item.purchaseOrderMaterialNum
                 }}
-                湿吨（如遇最后一批提货，须清场）；物流流向：万州港。望贵公司予以支持为盼。
+                湿吨（如遇最后一批提货，须清场),物流流向:万州港。望贵公司予以支持为盼。
               </td>
             </tr>
           </table>
+        
 
+          
           <!-- tablePart2 -->
           <table
             border="0"
             cellpadding="10"
             cellspacing="0"
             style="
-          border-top: 0px"
+            border-top:0px"
             width="1000px"
             class="tablePart2"
           >
             <tr>
-              <th style="width :16.5%">提货联系人：</th>
+              <th style="width:3%"></th>
+              <th style="width :12.5%;padding-left:2 px;">提货联系人：</th>
               <td style="width :10.5%">
                 {{ item.attorneyPickupContactPerson }}
               </td>
-              <th style="width :14%">身份证号：</th>
+              <th style="width:3%"></th>
+              <th style="width :10%">身份证号：</th>
               <td style="width :59%">{{ item.attorneyPickupIdcard }}</td>
             </tr>
           </table>
@@ -83,8 +87,9 @@
             class="tablePart3"
           >
             <tr>
-              <th style="width :16.5%">联系电话：</th>
-              <td style="width :83.5%">
+              <th style="width:3%"></th>
+              <th style="width :10.5%">联系电话：</th>
+              <td style="width :98%">
                 {{ item.attorneyContactTelephone }}
               </td>
             </tr>
@@ -101,7 +106,7 @@
             class="tablePart4"
           >
             <tr>
-              <th style="width :10.5%">顺颂商祺！</th>
+              <th style="width :12.5%">顺颂商祺！</th>
             </tr>
           </table>
 
@@ -130,7 +135,8 @@
             class="tablePart6"
           >
             <tr>
-              <td style="width :48.5%">{{ item.shipperName }}</td>
+              <th style="width:50px;"></th>
+              <td style="width :33%">{{ item.shipperName }}</td>
             </tr>
           </table>
         </div>
@@ -146,12 +152,12 @@
           >
             <tr>
               <td style="width :63%"></td>
-              <td style="width :5%">{{ item.year }}</td>
-              <th style="width :8%">年</th>
+              <td style="width :4%">{{ item.year }}</td>
+              <th style="width :7%">年</th>
               <td style="width :3%">{{ item.month }}</td>
-              <th style="width :8%">月</th>
+              <th style="width :7%">月</th>
               <td style="width :3%">{{ item.date }}</td>
-              <th style="width :5%">日</th>
+              <th style="width :7%">日</th>
             </tr>
           </table>
         </div>
@@ -216,7 +222,7 @@ export default {
   display: flex;
   flex-wrap: nowrap;
   margin-top: 20px;
-  margin-left: 900px;
+  margin-left: 465px;
   .buttn {
     margin-left: 10px;
     width: 130px;

src/views/appoint/components/ship/deliveryAttorney.vue

@@ -115,7 +115,9 @@ export default {
       }
       let amsShipDeliveryNameList = {
         amsShipDeliveryNameList: this.amsShipDeliveryList
+      
       };
+        console.log("list",amsShipDeliveryNameList);
       let test = encodeURIComponent(JSON.stringify(amsShipDeliveryNameList));
       this.$router.push("/attorneytext/" + test);
     },

src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -3,14 +3,14 @@
   <div class="shipTransport">
     <page-title>返回</page-title>
 
-    <!-- 货权转移送达单位 -->
+    <!-- 货权转移送达单位 
     <div class="mofrom">
       <span class="motext">货权转移送达单位</span>
       <el-input class="moinput" v-model="cargo" disabled> </el-input>
       <el-button class="mobutton" type="primary" @click="ondrawer(2)"
         >浏览</el-button
       >
-    </div>
+    </div>-->
 
     <!--大品类 -->
     <div class="mofrom">
@@ -151,7 +151,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-import { sjTime } from "@/utils/sharedJsFile";
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
@@ -320,8 +320,8 @@ export default {
     onClickConfirm() {
       let map = {
         noticeId: this.$route.params.noticeId,
-        carrierId: this.form1.carrierId,
-        requesterGroupId: this.form1.requesterGroupId,
+        // carrierId: this.form1.carrierId,
+        // requesterGroupId: this.form1.requesterGroupId,
         noticeCommerceMethod: this.form1.noticeCommerceMethod,
         noticeHandoverMethod: this.form1.noticeHandoverMethod,
         portId: this.form1.portId,
@@ -354,26 +354,120 @@ export default {
         cargoPictureUrl: this.cargoPictureUrl,
         userId: getCookie("userId"),
       };
+      //判断是否为电话号码
+      function isTelePhone() {
+        var value2 = map.resultTelephoneFax;
+        //验证是否为数字
+        var patrn = /^1[3-9]\d{9}$/;
+        // var patrn2 = /^(\d{3,4}-)?\d{7,8}$/;
+        if (patrn.exec(value2) == null || value2 == "") {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      var val = this.value;
+       if (
+        map.noticeCommerceMethod == null ||
+        map.noticeHandoverMethod == null ||
+        map.noticePortConstructionFee == null ||
+        map.noticeDeliveryTime == null ||
+        map.noticePileFreeDays == null ||
+        map.purchaseContractUnitPrice == null ||
+        map.purchaseContractMoisture == null ||
+        map.tfeContent == null ||
+        map.silicaContent == null ||
+        map.aluminaContent == null ||
+        map.phosphorusContent == null ||
+        map.manganeseContent == null ||
+        map.resultContactPerson == null ||
+        map.resultTelephoneFax == null ||
+        map.resultNumberOfLoans == null ||
+        //map.carrierId == null ||
+        //map.groupId == null ||
+        map.inFactoryShipName == null ||
+        map.isNeedPortDisCharge == null ||
+        map.isNeedPortFee == null
+        // map.foreignShipName==null||
+        // map.materialId==null
+      ) {
+        this.$message.error("存在空值！");
+        return;
+      }
+      if (!isTelePhone(val)) {
+        this.$message.warning("电话号码或传真格式不正确");
+        return;
+      }
+      if (
+        typeof map.noticePortConstructionFee != "undefined" &&
+        !isNumber(map.noticePortConstructionFee)
+      ) {
+        this.$message.error("港建费金额得为数字");
+        return;
+      }
+      if (
+        typeof map.purchaseContractMoisture != "undefined" &&
+        !isNumber(map.purchaseContractMoisture)
+      ) {
+        this.$message.error("合同水分得为数字");
+        return;
+      }
+      if (
+        typeof map.noticePortConstructionFee != "undefined" &&
+        !isNumber(map.noticePortConstructionFee)
+      ) {
+        this.$message.error("港建费金额得为数字");
+        return;
+      }
+      if (
+        typeof map.noticePileFreeDays != "undefined" &&
+        !isNumber(map.noticePileFreeDays)
+      ) {
+        this.$message.error("免堆天数得为数字");
+        return;
+      }
 
-      // function isNumber() {
-      //   var value = AmsshipCargoTransferResult.resultTelephoneFax;
-      //   //验证是否为数字
-      //   var patrn = /^(-)?\d+(\.\d+)?$/;
-      //   if (patrn.exec(value) == null || value == "") {
-      //     return false;
-      //   } else {
-      //     return true;
-      //   }
-      // }
-      // var val = this.value;
-      // if (
-      //   AmsshipCargoTransferResult.resultTelephoneFax==null||
-      //   AmsshipCargoTransferResult.resultContactPerson==null
-      // ) this.$message.error("存在空值！");
-      // else
-      // if (!isNumber(val)) this.$message.error("联系电话必须是数字！");
-      // else
-
+      if (
+        typeof map.purchaseContractUnitPrice != "undefined" &&
+        !isNumber(map.purchaseContractUnitPrice)
+      ) {
+        this.$message.error("单价得为数字");
+        return;
+      }
+      if (typeof map.tfeContent != "undefined" && !isNumber(map.tfeContent)) {
+        this.$message.error("tfe含量得为数字");
+        return;
+      }
+      if (
+        typeof map.silicaContent != "undefined" &&
+        !isNumber(map.silicaContent)
+      ) {
+        this.$message.error("二氧化硅含量得为数字");
+        return;
+      }
+      if (
+        typeof map.aluminaContent != "undefined" &&
+        !isNumber(map.aluminaContent)
+      ) {
+        this.$message.error("氧化铝含量得为数字");
+        return;
+      }
+      if (
+        typeof map.phosphorusContent != "undefined" &&
+        !isNumber(map.phosphorusContent)
+      ) {
+        this.$message.error("含磷量得为数字");
+        return;
+      }
+      if (
+        typeof map.resultNumberOfLoans != "undefined" &&
+        !isNumber(map.resultNumberOfLoans)
+      ) {
+        this.$message.error("放货数量得为数字");
+        return;
+      } else{
+        
+      }
       this.axios.post("/api/v1/tms/editDeliveryNotice", map).then((res) => {
         if (res.data.code == "200") {
           this.$message({

src/views/appoint/router/index.js

@@ -457,7 +457,7 @@ const constantRouterMap = [
         component: saleOrderOODetails
       },
       {
-        path: "updateSaleOrderSteel/:saleOrderId/:",
+        path: "updateSaleOrderSteel/:saleOrderId/:deleted",
         name: "updateSaleOrderSteel",
         meta: { code: "xtpzgl-yhgl" },
         component: updateSaleOrderSteel

src/views/inward/components/inwardFactory/unload.vue

@@ -3,23 +3,48 @@
   <!-- 卸货卸货实绩页面 -->
   <div class="homeworkPath">
     <div class="top">
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+      <span class="text">卸车时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span class="text">至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <el-input
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+        style="width:200px"
+      >
+      </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 class="table"><dilTable v-bind.sync="option"></dilTable></div>
   </div>
 </template>
 
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "../../../ADMINISTRATORS/app";
 export default {
   name: "homeworkPath",
   data() {
     return {
+      startTime: null,
+      endTime: null,
       restaurants: [],
-      input: "",
+      input: null,
       option: {
         // 表格请求数据的地址
         requestUrl: ""
@@ -41,19 +66,37 @@ export default {
   },
   methods: {
     onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
       if (
         getCookie("orgCode") == "dagangadmin" ||
         getCookie("orgCode") == "zidonghuabu"
       ) {
         this.option.requestUrl =
           "/api/v1/tms/getUnloadResult?apiId=360&orderType=11&con=" +
-          this.input;
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       } else {
         this.option.requestUrl =
           "/api/v1/tms/getUnloadResult?apiId=360&orderType=11&userId=" +
           getCookie("orgCode") +
           "&con=" +
-          this.input;
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     }
   }
@@ -62,10 +105,12 @@ export default {
 <style lang="scss" scoped>
 .homeworkPath {
   .top {
-    padding: 1.25rem 1.875rem;
-    .el-input {
-      width: 20%;
-    }
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
   }
 }
 </style>

src/views/sale/components/offSiteTransportation/checkGPS.vue

@@ -448,6 +448,7 @@ export default {
         if (status === "complete" && result.info === "OK") {
           that.endPointName = result.regeocode.formattedAddress;
           setInterval(
+            //设置自定义窗体
             that.initCustomMarkes(
               that.carNumber,
               that.formatDate(that.time[0], "yyyy-MM-dd") +
@@ -460,7 +461,12 @@ export default {
                 that.endPointName +
                 "<br/>" +
                 "距离：" +
-                that.listPath[0].miled,
+                that.listPath[0].miled+
+                "<br/>" +
+                "时间范围：" +
+                that.formatDate(that.time[0],"yyyy-MM-dd hh:mm")+"至"+that.formatDate(that.time[1],"yyyy-MM-dd hh:mm") +
+                "<br/>"
+                ,
               lnglatXY[0],
               lnglatXY[1]
             ),
@@ -500,7 +506,7 @@ export default {
         })
         .then(res => {
           if (res.data.data == "-1") {
-            this.$message.error("自提车辆无权查看!");
+            this.$message.error("运输订单未关闭,自提车辆无权查看!");
           } else if (res.data.data.startAndEndRoutes != "") {
             that.listPath = res.data.data.startAndEndRoutes;
             that.initMap([105.602725, 37.076636]);
@@ -580,7 +586,7 @@ export default {
       let that = this;
       //自定义窗体内容
       var content = [
-        "<div  style='top:1px;width: 180px; background-color:  rgba(22, 160, 133, 1);' ><font color='white'>" +
+        "<div  style='top:1px;width: 200px; background-color:  rgba(22, 160, 133, 1);' ><font color='white'>" +
           title +
           "</font>",
         "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>" +

src/views/sale/components/offSiteTransportation/currentLocation.vue

@@ -62,12 +62,17 @@ export default {
     return {
       //查询车牌号
       carNumber: "",
+      //开始时间和结束时间
+      startTime:"",
+      endTime:"",
       //地图组件
       map: null,
-      path: [],
-      pointmarker: null,
+      path:[],
+      pointmarker:null,
       //定时器
-      timer: null
+      timer: null,
+      //是否关闭信息窗体
+      infoClose:false
     };
   },
   created() {
@@ -108,26 +113,22 @@ export default {
               "现在所在位置"
             );
             //给路径加点
-            let point = new AMap.LngLat(
-              res.data.data.result.lon,
-              res.data.data.result.lat
-            );
-            if (
-              that.path.length <= 0 ||
-              !that.path[that.path.length - 1].equals(point)
-            ) {
+            let point=new AMap.LngLat(res.data.data.result.lon, res.data.data.result.lat);
+            if(that.path.length<=0 || !that.path[that.path.length-1].equals(point)){
               that.path.push(point);
             }
             console.log(that.path);
             //初始化轨迹
             that.initPolyline();
             //显示窗体
-            that.initCustomMarkes(
-              that.carNumber,
-              res.data.data.result.adr,
-              res.data.data.result.lon,
-              res.data.data.result.lat
-            );
+            if( this.infoClose==false){
+              that.initCustomMarkes(
+                that.carNumber,
+                res.data.data.result.adr,
+                res.data.data.result.lon,
+                res.data.data.result.lat
+              );
+            }
             this.lon = res.data.data.result.lon;
             this.lat = res.data.data.result.lat;
           } else {
@@ -169,6 +170,65 @@ export default {
       that.pointmarker = pointmarker;
       that.map.add(pointmarker);
     },
+    //初始化轨迹
+    initPolyline() {
+      let that = this;
+      // 创建一个 Polyline 实例：
+      var polyline = new AMap.BezierCurve({
+            path: that.path,  
+            borderWeight: 2, // 线条宽度，默认为 1
+            strokeColor: '#18BFA6', // 线条颜色
+            lineJoin: 'round' ,// 折线拐点连接处样式
+      });
+      // 将创建的线路添加到已有的线路中去：
+      that.map.add(polyline);
+    },
+    //时间格式转换
+    formatDate(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(
+          RegExp.$1,
+          (date.getFullYear() + "").substr(4 - RegExp.$1.length)
+        );
+      }
+      let o = {
+        "M+": date.getMonth() + 1,
+        "d+": date.getDate(),
+        "h+": date.getHours(),
+        "m+": date.getMinutes(),
+        "s+": date.getSeconds()
+      };
+      for (let k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          let str = o[k] + "";
+          fmt = fmt.replace(
+            RegExp.$1,
+            RegExp.$1.length === 1 ? str : ("00" + str).substr(str.length)
+          );
+        }
+      }
+      return fmt;
+    },
+    //定时取得当前位置并加入轨迹中去，点击查询时触发，同时清除path和旧的定时器
+    initTimer(){
+      let that=this;
+      //清除旧的定时器
+      clearTimeout(this.timer);
+      that.startTime=that.formatDate(new Date(),"yyyy年MM月dd日 hh:mm:ss");
+      that.endTime=that.formatDate(new Date(),"yyyy年MM月dd日 hh:mm:ss");
+      //清除path
+      that.path=[];
+      //清除所有覆盖物
+      that.map.clearMap();
+      //设置定时器
+      that.timer=setInterval(()=>{
+          //清除之前车的图标
+          that.map.remove(that.pointmarker);
+          that.initData();
+          that.endTime=that.formatDate(new Date(),"yyyy年MM月dd日 hh:mm:ss");
+      },5000);
+    },
+    
 
     //初始化窗体
     initCustomMarkes(title, details, lon, lat) {
@@ -179,7 +239,8 @@ export default {
           title +
           "</font>",
         "<div style='background-color:rgba(22, 160, 133, 1);'><font color='white'>" +
-          details +
+          details + "<br>"+
+        "时间范围："+that.startTime+"至"+that.endTime+"<br>"+
           "</font></div></div>"
       ];
       // 创建 infoWindow 实例
@@ -192,11 +253,13 @@ export default {
     },
     // 关闭信息窗口
     closeinfo() {
+      this.infoClose=true;
       infoWindow.close();
     },
     openInfo() {
       console.log(this.lon);
       console.log(this.lat);
+      this.infoClose=false;
       infoWindow.open(this.map, [this.lon, this.lat]);
     },
     //初始化轨迹

src/views/sale/components/offSiteTransportation/mapTest.vue

@@ -145,6 +145,8 @@ export default {
       times: 1,
       totalTime: "11",
       speed: 10000,
+      startTime:"",
+      endTime:"",
       //选择停车时长
       parkingTime: null,
       //停车时长选择区间
@@ -472,9 +474,11 @@ export default {
         .then(res => {
           console.log(res.data);
           if (res.data.data == "-1") {
-            this.$message.error("自提车辆无权查看!");
+            this.$message.error("运输订单未关闭的自提车辆无权查看!");
           } else if (res.data.data.startAndEndRoutes != null) {
             that.listPath = res.data.data.startAndEndRoutes;
+            that.startTime=res.data.data.startAndEndRoutes[0].runRoute[0].gtm;
+            that.endTime=res.data.data.startAndEndRoutes[0].runRoute[res.data.data.startAndEndRoutes[0].runRoute.length-1].gtm;
             that.initMap();
           } else {
             that.listPath = [];
@@ -531,7 +535,11 @@ export default {
               that.currentPointName +
               "<br/>" +
               "距离：" +
-              that.listPath[0].miled,
+              that.listPath[0].miled+
+              "<br/>" +
+              "时间范围：" +
+              that.startTime+' 至 '+that.endTime,
+
             lnglatXY[0],
             lnglatXY[1]
           );
@@ -565,7 +573,7 @@ export default {
       let that = this;
       //自定义窗体内容
       var content = [
-        "<div  style='top:1px;width: 180px; background-color: rgba(22, 160, 133, 1);' ><font color='white'>" +
+        "<div  style='top:1px;width: 200px; background-color: rgba(22, 160, 133, 1);' ><font color='white'>" +
           title +
           "</font>",
         "<div style='background-color:(22, 160, 133, 1); ;'><font color='white'>" +

src/views/sale/components/offSiteTransportation/paintVertexTest.vue

@@ -0,0 +1,292 @@
+<template>
+  <div class="container">
+    <div id="amap-container"></div>
+    <div class="controller">
+      <div class="in_transit_information">
+        <span class="item_details">起始点:</span>
+        <el-select v-model="startPoint" style="width: 150px;" class="inputStyle" filterable placeholder="请选择起点">
+          <el-option
+            v-for="item in vertexs"
+            :key="item.vertexId"
+            :label="item.addressName"
+            :value="item.vertexId">
+          </el-option>
+        </el-select>
+        <!--<el-input style="width: 120px;" class="inputStyle" v-model.trim="startPoint"> </el-input>-->
+        <span class="item_details">终点:</span>
+        <el-select v-model="endPoint" style="width: 150px;" class="inputStyle" filterable placeholder="请选择终点">
+         <el-option
+            v-for="item in vertexs"
+            :key="item.vertexId"
+            :label="item.addressName"
+            :value="item.vertexId">
+          </el-option>
+        </el-select>
+        <!--<el-input style="width: 120px;" class="inputStyle" v-model.trim="endPoint"> </el-input>-->
+        <el-button type="primary" class="searchstyle" @click="initData2">查询</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { shallowRef } from "@vue/reactivity";
+import { lazyAMapApiLoaderInstance } from "vue-amap";
+import { sjTime, stringToDate } from "@/utils/sharedJsFile";
+import Slider from "./slider.vue";
+Vue.use(Slider);
+import Vue from "vue";
+export default {
+  name: "PathView",
+  setup() {
+    const map = shallowRef(null);
+    return {
+      map
+    };
+  },
+ 
+  data() {
+    return {
+      lineList:[],
+      startPoint:"",
+      endPoint:"",
+      //地图组件
+      map:null,
+      //顶点
+      vertexs:"",
+    };
+  },
+  created() {
+    let that =this;
+    that.initMap(105.602725,37.076636);
+  },
+  mounted() {},
+  methods: {
+    //初始化数据
+    initData() {
+      let that = this;
+      that.axios
+        .get("/api/v1/otms/mapvertexs/findAllAvailableVertex")
+        .then(res => {
+          console.log(res);
+          that.vertexs=res.data.data;
+          console.log(that.vertexs);
+          that.map.setCenter([res.data.data[0].longitude,res.data.data[0].latitude]);
+          //画车
+          res.data.data.forEach(element => {
+             that.initMarkes( 20,25, require("@/assets/img/end.png"),element.longitude,element.latitude,element.addressName);
+          });
+        });
+          
+    },
+   //查询路线
+   initData2(){
+      let that = this;
+      if(that.lineList!=null){
+        that.map.remove(that.lineList);
+      }
+      that.axios
+        .get("/api/v1/otms/mapvertexs/getObtainTheOptimalPath?startPoint="+that.startPoint+"&endPoint="+that.endPoint)
+        .then(res => {
+          console.log(res);
+          let path=[];
+          res.data.data.forEach((item,index)=>{
+            console.log(item)
+            console.log(item.latitude)
+            console.log(item.longitude)
+            let point=[item.longitude,item.latitude];
+            path.push(point);
+          })
+          console.log()
+         that.initPolyline(path, "#FF0000");
+        });
+   },
+   
+    //初始化预计轨迹
+    initPolyline(path, color) {
+      let that = this;
+      //预计轨迹
+      var endLine = new AMap.Polyline({
+        map: that.map, //地图组件
+        path: path, //预计轨迹
+        isOutline: true,
+        outlineColor: color, //轨迹颜色
+        borderWeight: 0,
+        strokeColor: "#FF0000",
+        strokeOpacity: 1,
+        strokeWeight: 5,
+        // 折线样式还支持 'dashed'
+        strokeStyle: "solid",
+        // strokeStyle是dashed时有效
+        strokeDasharray: [10, 5],
+        lineJoin: "round",
+        lineCap: "round",
+        zIndex: 50
+      });
+      that.lineList.push(endLine);
+      that.map.setFitView([[endLine]]);
+    },
+    //初始化地图
+    initMap(lon,lat) {
+      lazyAMapApiLoaderInstance.load().then(() => {
+        let that = this;
+        that.map = new AMap.Map("amap-container", {
+          //设置地图容器id
+          viewMode: "2D", //是否为2D地图模式
+          zoom: 20, //初始化地图级别
+          center: [lon,lat] //初始化地图中心点位置105.602725,37.076636
+        });
+        that.initData()
+      });
+    },
+
+     //创建简单的标记
+    initMarkes(weight, height, image, lon, lat, title) {
+      let that = this;
+      //图标标记点
+      let pointicon = new AMap.Icon({
+        size: new AMap.Size(weight, height), // 图标尺寸
+        image: image, // Icon的图像
+        imageOffset: new AMap.Pixel(2, 10), // 图像相对展示区域的偏移量，适于雪碧图等
+        imageSize: new AMap.Size(weight, height) // 根据所设置的大小拉伸或压缩图片
+      });
+      // 创建一个 Marker 实例：
+      var pointmarker = new AMap.Marker({
+        position: new AMap.LngLat(lon, lat), // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+        icon: pointicon,
+        title: title
+      });
+      // 将创建的点标记添加到已有的地图实例：
+      that.map.add(pointmarker);
+      console.log("成功绘制一个标记");
+    },
+   
+    //初始化窗体
+    initCustomMarkes(title, details, lon, lat) {
+      let that = this;
+      //自定义窗体内容
+      var content = [
+        "<div  style='top:1px;width: 180px; background-color: rgba(0, 0, 0, 1);' ><font color='white'>" +
+          title +
+          "</font>",
+        "<div style='background-color:rgba(255, 255, 255, 0.5);'><font color='white'>" +
+          details +
+          "</font></div></div>"
+      ];
+      // 创建 infoWindow 实例
+      var infoWindow = new AMap.InfoWindow({
+        content: content.join("<br>"),//传入 dom 对象，或者 html 字符串
+        offset:new AMap.Pixel(0,-20)//修改信息差窗体偏移
+      });
+      // 打开信息窗体
+      infoWindow.open(that.map, [lon, lat]);
+    },
+  
+  }
+};
+</script>
+<style>
+.inputStyle {
+  position: absolute;
+  width: 200px;
+  left: 50px;
+}
+
+.controller {
+  width: 100%;
+  height: 70px;
+  background: white;
+  position: absolute;
+  z-index: 99;
+  top: 0;
+  left: 0;
+}
+.in_transit_information {
+  width: 600px;
+  float: left;
+  height: 40px;
+}
+
+.container {
+  width: 100%;
+  height: 100%;
+}
+span.item_details2 {
+  position: relative;
+  left: 20px;
+  top: 20px;
+}
+.date_picker_style {
+  position: relative;
+  left: 50px;
+}
+.item_details {
+  position: relative;
+  top: 5px;
+  height: 0px;
+  left: 50px;
+}
+#amap-container {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  margin: 0;
+  font-family: "微软雅黑";
+}
+
+/* 进度条 */
+.mySlider {
+  width: 150px;
+  height: 20px;
+  display: inline-block;
+  position: relative;
+  left: 32px;
+}
+/* 进度条 */
+.mySlider2 {
+  width: 400px;
+  height: 20px;
+  display: inline-block;
+  position: relative;
+  left: 32px;
+}
+.play {
+  position: relative;
+  left: 28px;
+}
+.quickly {
+  float: right;
+  position: relative;
+  left: -20px;
+  top: 10px;
+}
+.pause {
+  position: relative;
+  left: 28px;
+}
+.passed-time {
+  position: relative;
+  left: 5px;
+}
+.end-time {
+  position: relative;
+  left: 5px;
+}
+.map-times {
+  position: relative;
+  width: 40px;
+}
+.searchstyle {
+  position: relative;
+  left: 45px;
+}
+.map-control {
+  float: left;
+  width: 270px;
+}
+.driving_information {
+  height: 40px;
+  width: 240px;
+  float: left;
+}
+</style>

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -278,13 +278,23 @@ export default {
 
     //other
     click(row) {
-     
-        this.pathOption.orderNumber=row.orderNumber;
-        this.pathOption.capacityNumber=row.capacityNumber;
-        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
-        this.pathOption.endPointName=row.deliveryAddress,
-        this.value7=true;
-
+        let that = this;
+        that.axios
+          .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
+          .then(res => {
+            console.log(res.data);
+            if (res.data.data == "-1") {
+              this.$message.error("运输订单未关闭的自提车辆无权查看!");
+            } else if (res.data.data.startAndEndRoutes != null) {
+              that.pathOption.orderNumber=row.orderNumber;
+              that.pathOption.capacityNumber=row.capacityNumber;
+              that.pathOption.startPointName="达钢集团"+row.outGatepostName,
+              that.pathOption.endPointName=row.deliveryAddress,
+              that.value7=true;
+            } else {
+              this.$message.error("车辆没有开启GPS");
+            }
+          });
     },
     historyclick(row){
       

src/views/statisticalReport/components/Ship_dynamic_table.vue

@@ -48,6 +48,10 @@ export default {
         {
           prop: "tonnage",
           label: "下游港口吨位"
+        },
+          {
+          prop: "tonnage1",
+          label: "二层船吨位"
         },
         {
           label: "未到闸船舶",

src/views/statisticalReport/components/salesLogisticsStatistics/saleChemicalCokeForm.vue

@@ -27,7 +27,7 @@
               v-model="inputReceiveName"
               style="width:200px"
               placeholder="输入收货单位"
-              clearable="true"
+              clearable
             ></el-input>
           </el-form-item>
           <el-form-item>
@@ -35,7 +35,7 @@
               v-model="inputMaterial"
               style="width:200px"
               placeholder="输入仓库或物资名称或备注"
-              clearable="true"
+              clearable
             ></el-input>
           </el-form-item>
           <el-button type="primary" class="btn" @click="onclick">
@@ -79,7 +79,6 @@
         :shiyHeigth="shiyHeigth"
         :isKuang="isKuang"
         @func="func"
-        @requestQuery="requestQuery"
         :pageSize="pageSize"
       ></dilTable>
     </div>

src/views/statisticalReport/components/salesLogisticsStatistics/saleCoproductForm.vue

@@ -1,71 +1,73 @@
 //副产品统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <el-form :inline="true" style="margin-top :5px">
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >计毛时间：</label
-        >
-        <el-date-picker
-          v-model="startTime"
-          type="datetime"
-          placeholder="选择日期时间"
-        >
-        </el-date-picker>
-        <span>至</span>
-        <el-date-picker
-          v-model="endTime"
-          type="datetime"
-          placeholder="选择日期时间"
-        >
-        </el-date-picker>
+    <div class="items">
+      <el-form :inline="true" style="margin-top :5px">
         <el-form-item>
+          <label class="el-form-item__label" style="width: auto;"
+            >计毛时间:</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-form-item>
+            <el-input
+              v-model="inputReceiveName"
+              style="width:200px"
+              placeholder="输入收货单位"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              v-model="inputMaterial"
+              style="width:200px"
+              placeholder="输入物资名称或备注"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="exportData()"
+            ><i class="el-icon-download"></i>Excel</el-button
+          >
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="refresh">
+            <i class="el-icon-refresh"></i>
+          </el-button>
+        </el-form-item>
+        <el-form-item>
+          <span>合计净重：</span>
           <el-input
-            v-model="inputReceiveName"
-            style="width:200px"
-            placeholder="输入收货单位"
-            clearable="true"
+            v-model="totalNumber"
+            :disabled="true"
+            style="width: 100px;"
           ></el-input>
         </el-form-item>
         <el-form-item>
+          <span>合计车数：</span>
           <el-input
-            v-model="inputMaterial"
-            style="width:200px"
-            placeholder="输入物资名称或备注"
-            clearable="true"
+            v-model="totalCapacity"
+            :disabled="true"
+            style="width: 50px;"
           ></el-input>
         </el-form-item>
-        <el-button type="primary" class="btn" @click="onclick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="exportData()"
-          ><i class="el-icon-download"></i>导出(Excel)</el-button
-        >
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="refresh">
-          <i class="el-icon-refresh"></i>刷新
-        </el-button>
-      </el-form-item>
-      <el-form-item>
-        <span style="margin-left: 1rem;width:68px">合计净重：</span>
-        <el-input
-          v-model="totalNumber"
-          :disabled="true"
-          style="width: 150px;"
-        ></el-input>
-      </el-form-item>
-      <el-form-item>
-        <span style="margin-left: 1rem;width:68px">合计车数：</span>
-        <el-input
-          v-model="totalCapacity"
-          :disabled="true"
-          style="width: 150px;"
-        ></el-input>
-      </el-form-item>
-    </el-form>
+      </el-form>
+    </div>
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -74,7 +76,6 @@
         :shiyHeigth="shiyHeigth"
         :isKuang="isKuang"
         @func="func"
-        @requestQuery="requestQuery"
         :pageSize="pageSize"
       ></dilTable>
     </div>
@@ -278,4 +279,15 @@ export default {
 };
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .items {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
+}
+</style>

src/views/statisticalReport/components/tableItem.vue

@@ -132,6 +132,15 @@ export default {
           rowspan: _row,
           colspan: _col
         };
+      }
+       if (columnIndex === 4) {
+        // this.tableData  修改
+        const _row = this.flitterData(this.tableData).one[rowIndex];
+        const _col = _row > 0 ? 1 : 0;
+        return {
+          rowspan: _row,
+          colspan: _col
+        };
       }
       if (columnIndex === 2) {
         // this.tableData  修改