修改

build/utils.js

@@ -15,6 +15,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
+
 // let devModules = ['index','inward']
 
 // let devModules = ['index','TMS']
@@ -25,6 +26,11 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 let devModules = ["index",'TMS','appoint','statisticalReport'];
 // let devModules = ['index','TMS']
+
+// let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
+// let devModules = ["index", "ADMINISTRATORS", "RMS"];
+// let devModules = ["index", "inward", "statisticalReport"];
+
 // let devModules = ['index','statisticalReport','inward']
 
 if (pathSrc.indexOf("node_modules") > -1) {

config/index.js

@@ -1,49 +1,50 @@
-'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',
-     changeOrigin: true,
-     pathRewrite: {
-       '^/icore.icp.web/pass/auth/login': ''
-     }
-   },
-   '/icore-api': {
-    target: 'http://172.16.33.166:9001',
+  "/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-api': '/'
+      "^/icore.icp.web/pass/auth/login": ""
     }
   },
-  '/icore.icp.web/pass/act': {
-    target: 'http://172.16.33.166:8095',
+  "/icore-api": {
+    target: "http://172.16.33.166:9001",
     changeOrigin: true,
     pathRewrite: {
-      '^/icore.icp.web/pass/act': '/'
+      "^/icore-api": "/"
+    }
+  },
+  "/icore.icp.web/pass/act": {
+    target: "http://172.16.33.166:8095",
+    changeOrigin: true,
+    pathRewrite: {
+      "^/icore.icp.web/pass/act": "/"
     }
   },
   // 表格表单请求的域名地址
@@ -64,45 +65,46 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.162:80",
+    // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
     }
   },
   "/views/api/v1": {
-    target: "http://localhost:8080",
+    target: "http://172.16.33.162:80",
     // 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': '/'
-    }
-  },
-}
-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]
+      "^/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];
+  }
 }
 
 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,
@@ -139,15 +141,14 @@ 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
@@ -155,14 +156,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:
@@ -170,4 +171,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.vue

@@ -225,7 +225,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [10, 20, 50, 100, 200, 1000, 50000];
+        return [5,10, 20, 50, 100, 200, 1000, 50000];
       }
     },
     // 每页显示条目个数，支持 .sync 修饰符

src/components/Page/Title/index.vue

@@ -2,11 +2,14 @@
   <div
     class="page-title"
     :class="{ 'show-border-buttom': showBorderBottom }"
-    @click="onClickBack"
   >
-    <i class="el-icon-back" v-if="showIcon"></i>
-    <span>{{ title }}</span>
-    <slot></slot>
+    <div  
+    style="width:10%"
+    @click="onClickBack">
+         <i class="el-icon-back" v-if="showIcon"></i>
+        <span>{{ title }}</span>
+        <slot></slot>
+    </div>
   </div>
 </template>
 

src/views/ADMINISTRATORS/components/ADMINISTRATORS1.vue

@@ -160,6 +160,44 @@
               </div>
             </div>
           </el-tab-pane>
+          <el-tab-pane label="删除多余实绩" name="third">
+            <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="deleteMoreResult"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+          </el-tab-pane>
         </el-tabs>
       </div>
     </template>
@@ -205,6 +243,16 @@ export default {
     this.information();
   },
   methods: {
+    deleteMoreResult() {
+      console.log(this.orderNumber);
+      this.axios
+        .post("/api/v1/bp/deleteErrorResult?orderNumber=" + this.orderNumber)
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("删除成功");
+          }
+        });
+    },
     updateLineSqe() {
       let map = {
         orderId: this.orderId,

src/views/RMS/components/capacity.vue

@@ -2,22 +2,25 @@
 <template>
   <div class="steel_inbound">
     <div class="sache">
-      <el-input
-        placeholder="请输入内容"
-        v-model="textInput"
-        clearable>
+      <el-input placeholder="请输入内容" v-model="textInput" clearable>
       </el-input>
-      <el-button type="primary" class="btn" @click="onclick" :loading="selectLoading">
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick"
+        :loading="selectLoading"
+      >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <el-button type="primary" class="btn" @click="toInsert">
+      <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
       <el-button type="primary" class="btn" @click="toInsert1">
         <i class="el-icon-plus"></i>新增特殊车牌
       </el-button>
-      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
-
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
     </div>
     <div class="table">
       <dilTable
@@ -29,25 +32,27 @@
       >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-             <el-button
+            <el-button
               type="text"
               size="small"
               @click="updateCapacity(scope.row.capacityCarrierId)"
             >
               修改备注
-            </el-button> 
+            </el-button>
             <el-button
               type="text"
               size="small"
               @click="deleteCapacity(scope.row)"
-              v-if="show==true">
+              v-if="show == true"
+            >
               删除
             </el-button>
-             <el-button
+            <el-button
               type="text"
               size="small"
               @click="showCapacity(scope.row.capacityId)"
-              v-if="show==false">
+              v-if="show == false"
+            >
               查看详情
             </el-button>
           </template>
@@ -59,134 +64,196 @@
 <script>
 import { getCookie } from "@/utils/util.js";
 export default {
-  data(){
-    return{
-     selectLoading:false,
-     isKuang:false,
-     tableloading:false,
-     show:false,
-     name:"homeworkPath",
-     textInput:"",
-     restaurants: [],
-     ssoId:null,
-     options:{
+  data() {
+    return {
+      selectLoading: false,
+      isKuang: false,
+      tableloading: false,
+      show: false,
+      name: "homeworkPath",
+      textInput: "",
+      restaurants: [],
+      ssoId: null,
+      options: {
         // first请求数据的地址
-        requestUrl: "",
-      },
-    }
+        requestUrl: ""
+      }
+    };
   },
-  created(){
-    if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "chengyunshang"){
-        this.show = true
+  created() {
+    if (
+      getCookie("orgCode") == "wuliuchuyunzhongxin" ||
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu" ||
+      getCookie("orgCode") == "chengyunshang"
+    ) {
+      this.show = true;
+    }
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.options.requestUrl =
+        "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+        getCookie("userId");
+    } else if (getCookie("orgCode") == "baohua") {
+      this.options.requestUrl =
+        "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.options.requestUrl =
+        "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null;
     }
-    if(getCookie("orgCode") == "chengyunshang"){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId");
-    }else if(getCookie("orgCode") == "baohua"){
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId");
-     }else{
-      this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null;
-     } 
   },
-  methods:{
-    func(res){
-      if(this.tableloading){
+  methods: {
+    func(res) {
+      if (this.tableloading) {
         this.tableloading = false;
       }
-      if(this.isKuang){
+      if (this.isKuang) {
         this.isKuang = false;
       }
-      if(this.selectLoading){
+      if (this.selectLoading) {
         this.selectLoading = false;
       }
     },
-    onclick(){
+    onclick() {
       this.isKuang = true;
       this.tableloading = true;
       this.selectLoading = true;
-      if(this.textInput){
-        if(getCookie("orgCode") == "chengyunshang"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&con=" +this.textInput + "&i=" + new Date();
-        }else if(getCookie("orgCode") == "baohua"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + this.textInput + "&i=" + new Date();
-        }else{
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null +"&con=" +this.textInput + "&i=" + new Date();
+      if (this.textInput) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.textInput +
+            "&i=" +
+            new Date();
+        } else if (getCookie("orgCode") == "baohua") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            this.textInput +
+            "&i=" +
+            new Date();
+        } else {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.textInput +
+            "&i=" +
+            new Date();
         }
-      }else{
-        if(getCookie("orgCode") == "chengyunshang"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") + "&i=" + new Date();
-        }else if(getCookie("orgCode") == "baohua"){
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") + "&i=" + new Date();
-        }else{
-          this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ null + "&i=" + new Date();
+      } else {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else if (getCookie("orgCode") == "baohua") {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.options.requestUrl =
+            "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+            null +
+            "&i=" +
+            new Date();
         }
       }
     },
-     toInsert() {
+    toInsert() {
       this.$router.push("/addCapacity");
     },
     toInsert1() {
       this.$router.push("/addOtherCapacity");
     },
-    updateCapacity(capacityCarrierId){
+    updateCapacity(capacityCarrierId) {
       // console.log("capacityCarrierId" +capacityCarrierId);
       this.$router.push("/editCapacity/" + capacityCarrierId);
     },
-    showCapacity(capacityId){
-      this.$router.push("/showCapacity/" + capacityId)
+    showCapacity(capacityId) {
+      this.$router.push("/showCapacity/" + capacityId);
     },
-    deleteUser(userId){
-      this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
-      });
+    deleteUser(userId) {
+      this.axios.delete("pass/v1/sysusers/" + userId).then(res => {});
     },
-    
+
     deleteCapacity(row) {
-      console.log("row",row)
+      console.log("row", row);
+      console.log(row);
       let map = {
-        carrierSSOId : getCookie("userId"),
-        capacityId : row.capacityId
-      }
-        if(getCookie("orgCode") == "wuliuchuyunzhongxin" || getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "chengyunshang"){
-          this.$confirm('是否删除与车牌号('+row.capacityNumber+')的绑定关系?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        }).then(() => {
-          this.axios
-          .post("/api/v1/rms/deleteCapacityCarrier",map)
-          .then((res) => {
-            if(res.data.code=='0'){
-              this.$message.success("删除成功!")
-              if(getCookie("orgCode") == "chengyunshang"){
-                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId="+ getCookie("userId") +"&i="+new Date();
-              }else if(getCookie("orgCode") == "baohua"){
-                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
-              }else{
-                this.options.requestUrl = "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" + null +"&i="+new Date();
-              } 
-            }
+        capacityCarrierId: row.capacityCarrierId,
+        carrierSSOId: getCookie("userId"),
+        capacityId: row.capacityId
+      };
+      if (
+        getCookie("orgCode") == "wuliuchuyunzhongxin" ||
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu" ||
+        getCookie("orgCode") == "chengyunshang"
+      ) {
+        this.$confirm(
+          "是否删除与车牌号(" + row.capacityNumber + ")的绑定关系?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        )
+          .then(() => {
+            this.axios
+              .post("/api/v1/rms/deleteCapacityCarrier", map)
+              .then(res => {
+                if (res.data.code == "0") {
+                  this.$message.success("删除成功!");
+                  if (getCookie("orgCode") == "chengyunshang") {
+                    this.options.requestUrl =
+                      "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+                      getCookie("userId") +
+                      "&i=" +
+                      new Date();
+                  } else if (getCookie("orgCode") == "baohua") {
+                    this.options.requestUrl =
+                      "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+                      getCookie("userId") +
+                      "&i=" +
+                      new Date();
+                  } else {
+                    this.options.requestUrl =
+                      "/api/v1/rms/getCapacityList?apiId=397&carrierSSOId=" +
+                      null +
+                      "&i=" +
+                      new Date();
+                  }
+                }
+              });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
           });
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });          
-        });
-        }else{
-          this.$message.error("权限不足，请联系管理员!")
-        }  
-      },
-    },
+      } else {
+        this.$message.error("权限不足，请联系管理员!");
+      }
+    }
   }
-
+};
 </script>
 <style lang="scss" scode>
-.steel_inbound{
-  .sache{
+.steel_inbound {
+  .sache {
     padding: 1.25rem 0.375rem;
     .el-input {
       width: 20%;
       margin-right: 1.25rem;
     }
   }
-  }
+}
 </style>

src/views/TMS/app.js

@@ -25,6 +25,8 @@ import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
 Vue.use(VueApollo)
+import htmlToPdf from "@/components/exportPdf/exportPdf";
+Vue.use(htmlToPdf);
 
 const apolloProvider = new VueApollo({
     defaultClient: apollo

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

@@ -141,6 +141,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

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

@@ -117,6 +117,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

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

@@ -1,26 +1,104 @@
 <template>
   <!-- 添加车皮装车实绩 -->
   <div class="addWagonLoad">
-    <page-title>新增</page-title>
+    <page-title>返回</page-title>
     <div class="cp">
-      <span style="width:80px">车皮号:</span>
-      <el-input
+      <span >车皮号:</span>
+      <el-upload style="margin: 8px;"
+          class="upload-excel"
+          action=""
+          :on-change="importExcel"
+          :show-file-list="false"
+          accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+          :auto-upload="false">
+          <el-button  type="primary">导入</el-button>
+      </el-upload>
+      <span >当前导入数量：{{tableData.length}}</span>
+      <!-- <el-input
         placeholder="请输入内容"
         v-model="input"
         @change="onchang"
         clearable
       >
-      </el-input>
+      </el-input> -->
     </div>
-    <div class="cpList">
+    <!-- <div class="cpList">
       <div class="list">
-        <span class="cpList1" v-for="(item, i) in list" :key="i">
+        <div class="cpList1" v-for="(item, i) in list" :key="i">
           {{ item }}
           <i class="el-icon-close itu" @click="onclick(i)"></i>
-        </span>
+        </div>
       </div>
+    </div> -->
+    <div class="table item">
+      <el-table
+        stripe
+        :data="tableData"
+        style="width: 100%">
+        <el-table-column
+        type="index"
+        width="50"
+        prop="number"
+        label="序号"
+        align="center"
+        fixed="left"
+        :resizable="false">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="materialName"
+          label="物资"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="supplierName"
+          label="发货单位"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="wagonNo"
+          label="车号"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="sendDate"
+          label="发货日期"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+          prop="sendStation"
+          label="火车发站"
+          width="180px">
+        </el-table-column>
+        <el-table-column
+        align="center"
+        width="180px"
+          prop="arrivalStation"
+          label="火车到站">
+        </el-table-column>
+         <el-table-column
+         align="center"
+        width="180px"
+          prop="weight"
+          label="标重">
+        </el-table-column>
+        <!-- <el-table-column
+        align="center"
+        width="100px"
+          fixed="right"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
+            <el-button type="text" size="small">编辑</el-button>
+          </template>
+        </el-table-column> -->
+      </el-table>
     </div>
-    <div class="matching item">
+    <!-- <div class="matching item">
           <span class="text">是否知道采购订单号:</span>
           <el-switch
             v-model="matching"
@@ -44,9 +122,9 @@
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
-    </div>
+    </div> -->
     <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
+      <!-- <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
         <el-form-item label="发站:">
           <el-autocomplete
             class="inline-input"
@@ -61,8 +139,8 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
+      </el-form> -->
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;margin-top:30px">
         <el-form-item label="到站:">
           <el-autocomplete
             class="inline-input"
@@ -154,6 +232,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      file:null,
       list: [],
       form1: {},
       input: "",
@@ -174,7 +253,14 @@ export default {
       supplierId: null,
       //物资id
       materialId: null,
+      //表格数据
+      tableData:[],
       unloadPointName:null,
+      //物资集合和供应商映射，相当于本地缓存，减少请求次数
+      materialMap:new Map(),
+      supplierMap:new Map(),
+      materials:[],
+      suppliers:[],
       unloadPointId:null,
       //是否需要打开模态窗口
       drawer: false,
@@ -214,6 +300,9 @@ export default {
       arrivalStationId: 1,
     };
   },
+  mounted(){
+    this.form1.resultLoadingDate=new Date();
+  },
   methods: {
     currentRadioChange1(selection) {
       this.input = null;
@@ -412,38 +501,16 @@ export default {
     },
     // 确定
     makeSure() {
-      let state = 0;
-      if (
-        this.list.length > 0 &&
-        this.sendStationId &&
-        this.toTheStationId &&
-        this.form1.resultLoadingDate
-      ) {
-        state = 1;
-      } else {
-        if (this.list.length == 0) {
+      let that=this;
+      if (this.tableData.length <= 0  || !this.toTheStationId || this.form1.resultLoadingDate){
+        if (this.tableData.length <= 0) {
           this.$message({
             type: "warning",
-            message: "请输入车皮号！",
+            message: "请导入数据！",
           });
         } else {
-          if (this.sendStationId) {
             if (this.toTheStationId) {
               if (this.form1.resultLoadingDate) {
-                if (this.supplierId) {
-                  if (this.materialId) {
-                  } else {
-                    this.$message({
-                      type: "warning",
-                      message: "请选择物资",
-                    });
-                  }
-                } else {
-                  this.$message({
-                    type: "warning",
-                    message: "请选择发货单位",
-                  });
-                }
               } else {
                 this.$message({
                   type: "warning",
@@ -456,54 +523,140 @@ export default {
                 message: "请选择到站！",
               });
             }
-          } else {
+        }
+      }
+      //绑定通用字段
+      this.tableData.forEach((row)=>{
+        row.resultType=3;
+        row.resultLoadingDate=sjTime(that.form1.resultLoadingDate);
+        row.arrivalStationId=that.form1.arrivalStationId;
+        row.resultRemarks=that.form1.resultRemarks;
+      })
+      console.log(that.tableData);
+      //请求添加
+      this.axios
+        .post("/api/v1/tms/addDomesticLoadResult", that.tableData)
+        .then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
             this.$message({
-              type: "warning",
-              message: "请选择发站！",
+              type: "success",
+              message: "新增成功",
             });
+            this.$router.push("/wagonLoadMine");
           }
+        });
+      
+    },
+    cancel() {
+      this.$router.push("/wagonLoadMine");
+    },
+    // 导入excel
+    async importExcel(file) {
+      let that=this;
+      if (!file) {
+        alert('文件错误，请重新选择');
+        return
         }
-      }
-      if (state == 1) {
-        let map = {
-          wagonNoList: this.list,
-          sendStationId: this.sendStationId,
-          arrivalStationId: this.toTheStationId,
-          resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-          resultRemarks: this.form1.resultRemarks,
-          resultType: 3,
-          sendUnitId: this.supplierId,
-          materialId: this.materialId,
-        };
-        if (this.matching) {
-          map = {
-            wagonNoList: this.list,
-            sendStationId: this.sendStationId,
-            arrivalStationId: this.toTheStationId,
-            resultLoadingDate: sjTime(this.form1.resultLoadingDate),
-            resultRemarks: this.form1.resultRemarks,
-            resultType: 3,
-            sendUnitId: this.supplierId,
-            materialId: this.materialId,
-            purchaseOrderRailPlanId: this.purchaseOrderId,
-          };
-        }
-        this.axios
-          .post("/api/v1/tms/addDomesticLoadResult", map)
-          .then((res) => {
-            console.log(res);
-            if (res.data.code == "200") {
-              this.$message({
-                type: "success",
-                message: "新增成功",
+        var reader = new FileReader();
+        var data=null;
+        var workbook=null;
+        //设置读取操作
+        reader.onload =async function (e) {
+          console.log(e);
+          data = e.target.result;
+          workbook= XLSX.read(data, {
+              type: 'binary'
+          });
+          //读取表格
+          let rows= XLSX.utils.sheet_to_json(workbook.Sheets[workbook.SheetNames[0]]);//只取第一页
+          console.log(rows);
+          //清空
+          if(rows.length>0){
+            that.tableData=[];
+            if((typeof rows[0]['车号'])=='undefined'){
+              that.$message({
+                message: "导入Excel格式错误!",
+                type: "warning",
               });
-              this.$router.push("/wagonLoadMine");
+              return;
             }
-          });
-      }
+          }
+          //绑定数据
+          rows.forEach(async (row,index) => {
+            let carNumber=row['车号'];
+            if((typeof carNumber)!="undefined" && carNumber.length > 6){
+            //查询数据库中的对于物资和发货单位
+            let materialName=row['品  名'];
+            let supplierName=row['发货单位'];
+            let material;
+            let supplier;
+            if((typeof material)=="undefined" || material==null){
+                await that.axios.post("/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+                    materialName).then((res)=>{
+                      if(res.data.code == "200" && res.data.data &&res.data.data.list.length > 0 ) {
+                        //赋值
+                        material={
+                            materialId:res.data.data.list[0].materialId,
+                            materialName:res.data.data.list[0].materialName
+                        };
+                      }else{
+                        this.$message.error("绑定品名失败，请检查数据！");
+                        material=null;
+                      }
+                });
+            }
+            if((typeof supplier)=="undefined" || supplier==null){
+                //绑定发货单位id
+                await that.axios.post("/api/v1/uc/getSupplierMesByMaterialId?apiId=247&index=" +
+                    supplierName).then((res)=>{
+                      if(res.data.code == "200" && res.data.data &&res.data.data.list.length > 0 ) {
+                        //赋值
+                        supplier={
+                          supplierId:res.data.data.list[0].supplierId,
+                          supplierName:res.data.data.list[0].supplierName
+                        }
+                      }else{
+                        supplier=null;
+                        this.$message.error("绑定发货单位失败，请检查数据！");
+                      }
+                });
+            }
+            //表格数据
+            let temp={
+              number:row['序号'],
+              materialId:material.materialId,
+              materialName:material.materialName,
+              sendUnitId:supplier.supplierId,
+              supplierName:supplier.supplierName,
+              sendDate:row['发货日期'],
+              sendStation:row['发站'],
+              arrivalStation:row['到站'],
+              wagonNo:row['车号'],
+              weight:row['标重']
+            }
+            that.tableData.push(temp);
+          }
+          else
+            console.log("车号"+carNumber+"不符合格式");
+        });
+        };
+        reader.readAsBinaryString(file.raw); //以二进制方式读取
     },
-    cancel() {
-      this.$router.push("/wagonLoadMine");
+    indexOfMaterial(materialName,materials){
+      materials.forEach((item,index)=>{
+        console.log(item);
+          if(item.materialName==materialName)
+            return index;
+      });
+      return -1;
+    },
+    indexOfSupplier(supplierName,suppliers){
+      suppliers.forEach((item,index)=>{
+          if(item.supplierName==supplierName)
+            return index;
+      });
+      return -1;
     },
   },
 };
@@ -539,10 +692,11 @@ export default {
       padding: 0.625rem;
       display: flex;
       flex-wrap: wrap;
+      overflow:auto;
       .cpList1 {
         background-color: #c9c7c7;
         height: 1.875rem;
-        margin-right: 0.5rem;
+        margin: 0.5rem;
         padding: 0.625rem;
         display: flex;
         align-items: center;
@@ -635,7 +789,7 @@ export default {
   .form {
     display: flex;
     width: 340px;
-    margin-left:25rem; 
+    margin-left:37.5%; 
     margin-right: 20px;
     .form_box {
       
@@ -655,7 +809,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 220px;
+                  width: 250px;
                 
                   margin-top: 0.03rem;
                 }
@@ -669,11 +823,13 @@ export default {
   .button_box {
     display: flex;
     justify-content: center;
-    padding-top: 30px;
+    margin-top: 30px;
+    margin-bottom: 30px;
   }
    .fromOther  .el-input__inner{
     width: 250px;
   }
+ 
 }
 </style>
 

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

@@ -8,7 +8,7 @@
         </div>
     </div>
     <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
         <el-form-item label="发站:">
           <el-autocomplete
             class="inline-input"
@@ -24,7 +24,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:520px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="70px" style="margin-left:35%;">
         <el-form-item label="到站:">
           <el-autocomplete
             class="inline-input"
@@ -227,6 +227,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

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

@@ -10,7 +10,7 @@
         <i class="el-icon-plus"></i>新增
       </el-button>
       <el-button type="primary" @click="btnclick(1)">
-        <i class="el-icon-edit-outline"></i>补录
+        <i class="el-icon-edit-outline"></i>配单
       </el-button>
     </div>
 

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

@@ -1,14 +1,82 @@
 <template>
   <div class="wagonLoadbu">
     <page-title>返回</page-title>
-    <div class="wagonLoadbu_table">
+    <!-- <div class="top">
+      <div class="text">物资：</div>
+      <el-select
+        v-model="materialId"
+        filterable
+        remote
+        reserve-keyword
+        placeholder="选择物资名"
+        :remote-method="searchMaterialName"
+        @change="searchSupplierName();getPurchaseOrderNo()">
+        <el-option
+          v-for="item in materialNames"
+          :key="item.materialId"
+          :label="item.materialName"
+          :value="item.materialId">
+        </el-option>
+      </el-select>
+      <div class="text">发货单位：</div>
+       <el-select
+        v-model="supplierId"
+        filterable
+        remote
+        reserve-keyword
+        placeholder="选择发货单位"
+        :remote-method="searchSupplierName"
+        @change="getPurchaseOrderNo();supplierIdChange()">
+        <el-option
+          v-for="item in supplierNames"
+          :key="item.supplierId"
+          :label="item.supplierName"
+          :value="item.supplierId">
+        </el-option>
+      </el-select>
+    </div> -->
+     <div class="purchaseOrder_table">
+      <div class="search" style="display:flex">
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>物资名或订单号：</el-label>
+        </div>
+        <el-input
+        placeholder="请输入"
+        v-model="search1"
+        style="margin: 10px; width:10%"
+        clearable
+        ></el-input>
+        <div style="margin-top: 18px;margin-left:10px">
+          <el-label>外轮船名：</el-label>
+        </div>
+        <el-input
+          placeholder="请输入"
+          v-model="search2"
+          style="margin: 10px;width:10%"
+          clearable
+        ></el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="searchOrder()"
+        style="margin: 10px;">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button 
+      type="primary"
+      class="btn" 
+      @click="makeSure" 
+      style="margin: 10px;">确认配单
+      </el-button>
+
+      </div>
       <dilTable
-        v-bind.sync="option"
-        @selection-change="selectionChange"
+        v-bind.sync="purchaseOption"
+        @radio-change="orderChange"
       ></dilTable>
     </div>
 
-    <div class="material form">
+    <!-- <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>
@@ -34,11 +102,17 @@
       <div class="form_box">  
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
       </div>
+    </div> -->
+    <div class="wagonLoadbu_table">
+      <dilTable
+        v-bind.sync="option"
+        @selection-change="selectionChange"
+        @row-click="selectionChange"
+      ></dilTable>
     </div>
-    <div class="button_box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
+    
+    
+   
     <!-- 模态窗口 -->
     <el-drawer :visible.sync="drawer" :direction="direction" size="30%">
       <el-input
@@ -84,12 +158,24 @@ export default {
   data() {
     return {
       form1: {},
+      con:null,
+      purchaseOption:{
+         // 表格请求数据的地址
+        requestUrl: "/api/v1/tms/findPurchaseOrderList?apiId=81",
+        // 控制选择单列
+        selectionType: "radio",
+        pageSize:5,
+      },
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10",
         // 控制显示多选列
         selectionType: "select",
+        pageSize:10,
       },
+      //查询用数据
+      search1:null,
+      search2:null,
       //多选选中的数据
       selecTionListMap: [],
       //船名
@@ -104,6 +190,13 @@ export default {
       supplierId: null,
       //物资id
       materialId: null,
+      //物资选项
+      materialNames:[],
+      //发货单位选项
+      supplierNames:[],
+      //卸货点
+      unloadPointId:null,
+      unloadPointName:null,
       //是否需要打开模态窗口
       drawer: false,
       a: 1,
@@ -126,28 +219,40 @@ export default {
       },
     };
   },
+  mounted(){
+    this.searchMaterialName('');
+  },
   methods: {
     //确定
     makeSure() {
       if(this.selecTionListMap.length <= 0){
         this.$message({
-          message: "请选择需要补录的装车信息!",
+          message: "请选择需要配单的装车信息!",
           type: "warning",
         });
-      }else{
+      }else if(!this.purchaseOrderId){
+         this.$message({
+          message: "请选择采购订单!",
+          type: "warning",
+        });
+      }
+      else{
         let map = {
           resultIdList:this.selecTionListMap,
           purchaseOrderId:this.purchaseOrderId,
           insertUpdateRemark: this.form1.insertUpdateRemark
         }
+        let that=this;
         this.axios.post('/api/v1/tms/updateDomesticLoadResult',map).then((res)=>{
           console.log(res.data.data)
           if(res.data.code == "200"){
             this.$message({
-              message: "补录成功!",
+              message: "配单成功!",
               type: "success",
             });
-            this.cancel();
+            that.purchaseOption.requestUrl += "&i="+new Date();
+            console.log();
+            // this.cancel();//不退出
           }
         })
       }
@@ -157,6 +262,18 @@ export default {
     cancel() {
       this.$router.push("/wagonLoadMine");
     },
+    //采购订单表格选中
+    orderChange(selection){
+      console.log(selection);
+      this.purchaseOrderId=selection.purchaseOrderId;
+      this.form1 = { purchaseOrderNo: selection.purchaseOrderNo };
+      this.materialId=selection.materialId;
+      this.materialName=selection.materialName;
+      this.supplierId=selection.supplierId;
+      this.supplierName=selection.supplierName;
+      this.remark=selection.resultForeignShipName;
+      this.tableChange();
+    },
     //表格选中
     selectionChange(selection) {
       this.selecTionListMap = [];
@@ -170,11 +287,13 @@ export default {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
+      this.tableChange();
     },
     currentRadioChange2(selection) {
       this.supplierName = selection.supplierName;
       this.supplierId = selection.supplierId;
       this.getPurchaseOrderNo();
+      this.tableChange();
     },
     currentRadioChange3(selection) {
       this.unloadPointId = selection.warehouseId;
@@ -222,6 +341,21 @@ export default {
         });
       }
     },
+    searchOrder(){
+      if((typeof this.search1)!="undefined" && (typeof this.search2)!='undefined'){
+        let requestUrl="/api/v1/tms/findPurchaseOrderList?apiId=81";
+        if(this.search1!=null){
+            requestUrl+=("&materialName="+this.search1);
+        }
+        if(this.search2!=null){
+            requestUrl+=("&resultForeignShipName="+this.search2);
+        }
+        this.purchaseOption.requestUrl=requestUrl;
+      }else{
+        this.purchaseOption.requestUrl=
+        "/api/v1/tms/findPurchaseOrderList?apiId=81"
+      }
+    },
     onClick(a) {
       if (a == 1) {
         this.frist.requestUrl =
@@ -238,6 +372,40 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=347&index=" + this.inputText;
       }
     },
+    searchMaterialName(index=''){
+      //根据name查询物资名
+      let that=this;
+      that.axios.post("api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index="+index).then((res)=>{
+          console.log(res);
+          if (res.data.code == "200" && res.data.data) {
+            that.materialNames=res.data.data.list;
+          } else {
+            this.$message.error("请求失败");
+          }
+         
+      });
+    },
+    searchSupplierName(index=''){
+      //根据name查询发货单位
+      let that=this;
+      that.axios.post("/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId="+that.materialId+"&index="+index).then((res)=>{
+           console.log(res);
+          if (res.data.code == "200" && res.data.data) {
+            that.supplierNames=res.data.data.list;
+          }else{
+            this.$message.error("请求失败");
+          }
+      });
+    },
+    tableChange(){
+      //重新查询配单车辆
+      if(typeof this.materialId !='undefined'&& this.materialId!=null && typeof this.supplierId!='undefined' && this.supplierId!=null){
+         this.option.requestUrl=
+          "/api/v1/tms/getTmstrainWagonLoad?apiId=209&resultType=10&materialId="
+          +this.materialId+"&supplierId="
+          +this.supplierId;
+      }
+    }
   },
 };
 </script>
@@ -247,6 +415,19 @@ export default {
   color: #606266;
   font-size: 0.675rem;
   font-weight: 500;
+  .top {
+    display: flex;
+    margin:0.375rem;
+    .el-select{
+      width: 15%;
+      // height: 2%;
+    }
+    .text {
+      text-align: left; 
+      margin-top: 0.5rem;
+      margin-left:0.375rem;
+    }
+  }
   .cp {
     width: 49%;
     display: flex;
@@ -377,7 +558,7 @@ export default {
               }
               .el-textarea{
                 .el-textarea__inner{
-                  width: 240px;  
+                  width: 250px;  
                   margin-top: 0.03rem;
                 }
               }
@@ -390,7 +571,7 @@ export default {
   .button_box {
     display: flex;
     justify-content: center;
-    padding-top: 30px;
+    margin: 30px;
   }
 }
 </style>

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

@@ -5,59 +5,57 @@
 
     <div class="form">
       <div class="form_box">
-        <dil-form :formId="122" v-model="form1"></dil-form>
+        <dil-form label-width="60px" :formId="122" v-model="form1"></dil-form>
       </div>
     </div>
 
     <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"
-          >
+        <el-form   label-width="70px"> 
+          <div class="preview-group">
+            <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.supplierName }}</div>
+                <div class="name">{{ item.arrivalName }}</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-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>
+        </div>
       </el-form>
     
       </div>
@@ -268,11 +266,8 @@ export default {
               width: 70px !important;
             }
             .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
+              .inline-input{
+                width:270px;
               }
             }
             .button_box {
@@ -287,7 +282,8 @@ export default {
 }
 .trainTransport {
   margin-left: 41.25%;
-  width: 50%;
+  margin-top: 30px;
+  width: 300px;
   .inline-input {
     width: 300px;
     .button_box {
@@ -300,7 +296,7 @@ export default {
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
@@ -311,17 +307,10 @@ export default {
               width: 70px !important;
             }
             .el-form-item__content {
-              .el-select {
-                width: 250px;
-              }
-              .el-input {
-                width: 250px;
+              .inline-input{
+                width:250px;
               }
             }
-            .button_box {
-              margin-left: 42%;
-              margin-top: 55px;
-            }
           }
         }
       }

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

@@ -271,31 +271,22 @@ export default {
     margin-top: 55px;
   }
 }
-.formOther {
+.formOther {  
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       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;
+        .el-form-item {
+          .el-form-item__label {
+            display: inline-block;
+            width: 70px !important;
+          }
+          .el-form-item__content {
+            .inline-input{
+              width:250px;
             }
           }
         }

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

@@ -140,8 +140,9 @@ export default {
     }
   }
   .button-box {
-    margin-top: 50px;
-    margin-left: 600px;
+    margin-left: 42%;
+    margin-top: 25px;
+    width: 300px;
   }
 }
 </style>

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

@@ -127,6 +127,7 @@ export default {
   .button_box {
     margin-left: 42%;
     margin-top: 55px;
+    width: 300px;
   }
 }
 </style>

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

@@ -64,7 +64,7 @@ export default {
       direction: "rtl",
       input: "",
       options: {
-        requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=383",
+        requestUrl: "/api/v1/tms/getBatchListForInstruction?apiId=383",
         selectionType: "radio",
         maplist: [],
       },
@@ -72,7 +72,6 @@ export default {
       form1: {},
       value: undefined,
       batchId: "",
-     
     };
   },
   mounted() {},
@@ -81,13 +80,13 @@ export default {
       this.drawer = true;
     },
     changeStatus(){
-      this.status=true,
-      console.log("aaa",this.status);
+      this.status=true;
+      // console.log("aaa",this.status);
     },
     
     onclick() {
       this.options.requestUrl =
-        "/api/v1/tms/getBatchList?apiId=383&con=" + this.input;
+        "/api/v1/tms/getBatchListForInstruction?apiId=383&con=" + this.input;
     },
     currentRadioChange1(selection) {
       this.maplist = selection;
@@ -118,6 +117,8 @@ export default {
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(this.form1.instructionTime),
         statu:this.status,
+        transportPortName:this.form1.transportPortName,
+        handoverMethod:this.form1.handoverMethod,
       };
 
       //判断合计吨位是否为数字

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

@@ -87,6 +87,7 @@ export default {
         .get("/api/v1/uc/getCapacityTel?capacityId=" + item.capacityId)
         .then((res) => {
           console.log(res.data);
+          this.capacityIds = "";
           if (res.data) {
             this.$set(this.form, "instructionContactInf", res.data.capacityTel);
           }

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

@@ -10,7 +10,7 @@
         style="margin-top:40px"
       >
         <div class="title">
-          <i class="titleText" align="center">装船指令</i>
+          <i class="titleText" align="center">装船通知</i>
         </div>
         <div>
           <!-- tablePart0 -->
@@ -62,14 +62,9 @@
             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>
+              <th style="width:0.6%"></th>
+              <th style="width:20.5%">具体提货船舶信息如下:</th>
+             
             </tr>
           </table>
 
@@ -84,11 +79,9 @@
             class="tablePart3"
           >
             <tr>
-              <th style="width:3%"></th>
-              <th style="width :10.5%">联系电话：</th>
-              <td style="width :98%">
-                {{ item.attorneyContactTelephone }}
-              </td>
+             <th style="width:0.6%"></th>
+              <th style="width :10.5%">船名:{{item.capacityNumber}}（{{item.instruct}}吨）航次{{item.capacityBookingNumber}}</th>
+              
             </tr>
           </table>
 
@@ -103,7 +96,8 @@
             class="tablePart4"
           >
             <tr>
-              <th style="width :12.5%">顺颂商祺！</th>
+              <th style="width:0.6%"></th>
+              <th style="width :10.5%">船舶联系方式:{{item.capacityTel}}</th>
             </tr>
           </table>
 
@@ -117,7 +111,37 @@
             class="tablePart5"
           >
             <tr>
-              <th style="width :10.5%">（传真件/扫描件有效）</th>
+              <th style="width:0.6%"></th>
+              <th style="width :10.5%">中转港:{{item.transitPort}} 目的港口{{item.arriveName}}</th>
+            </tr>
+          </table>
+           <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart6"
+          >
+            <tr>
+              <th style="width:0.6%"></th>
+              <th style="width :10.5%">收货人:{{item.shipperName}}</th>
+            </tr>
+          </table>
+
+           <table
+            border="1"
+            cellpadding="10"
+            cellspacing="0"
+            style="
+          border-top: 0px"
+            width="1000px"
+            class="tablePart7"
+          >
+            <tr>
+              <th style="width:0.6%"></th>
+              <th style="width :10.5%">交接方式:{{item.havdoverMode}}</th>
             </tr>
           </table>
         </div>
@@ -179,7 +203,7 @@ export default {
   data() {
     return {
       shipmentInstructionLists: [],
-      htmlTitle: "委托书"
+      htmlTitle: "装船通知单"
     };
   },
   created() {
@@ -190,10 +214,10 @@ export default {
       this.$router.go(-2);
     },
     getwts() {
-      // console.log(this.$route.params.test)
+      console.log(this.$route.params.text)
       this.shipmentInstructionLists = JSON.parse(
-        this.$route.params.test
-      ).shipmentInstructionLists;
+        this.$route.params.text
+      ).shipmentInstructionList;
       console.log(this.shipmentInstructionLists);
       // this.amsShipDeliveryNameLists = this.$route.params.test;
       console.log(this.shipmentInstructionLists);

src/views/TMS/router/index.js

@@ -348,7 +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: 'shipmentInstructionText/:text', 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/saleCokeInward.vue

@@ -15,7 +15,7 @@
         <!-- 已审批 -->
         <!-- <el-tab-pane name="four"> -->
         <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="150">
+          <el-table-column fixed="right" label="操作" width="120">
             <template slot-scope="scope">
               <el-button
                 @click="sendClick(scope.row.saleOrderId)"
@@ -23,12 +23,12 @@
                 size="small"
                 >派车</el-button
               >
-              <el-button
+              <!-- <el-button
                 @click="closeOrder(scope.row.saleOrderId)"
                 type="text"
                 size="small"
                 >关闭订单</el-button
-              >
+              > -->
               <el-button
                 @click="getOrderDetails(scope.row.saleOrderId)"
                 type="text"

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

@@ -58,33 +58,33 @@ export default {
       options: {
         requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=375",
         selectionType: "radio",
-        maplist: []
+        maplist: [],
       },
       batchIds: "",
       form1: {},
       value: undefined,
-      value2: undefined
+      value2: undefined,
     };
   },
   computed: {
     a1() {
       return this.form1.attorneyPickupContactPerson;
-    }
+    },
   },
   watch: {
     a1() {
       this.getPersonInfo();
-    }
+    },
   },
   created() {
     this.form1 = {
       downSwimPortId: 11,
-      attorneyTime: new Date()
+      attorneyTime: new Date(),
     };
   },
   mounted() {
-     this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
-     this.$set(this.form1, "carrierId", 11);
+    this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
+    this.$set(this.form1, "carrierId", 11);
   },
   methods: {
     getPersonInfo() {
@@ -95,7 +95,7 @@ export default {
           "/api/v1/tms/getPersonByName?personName=" +
             this.form1.attorneyPickupContactPerson
         )
-        .then(res => {
+        .then((res) => {
           console.log(this.form1);
           this.$set(this.form1, "attorenyPickupIdcard", res.data.data.personId);
           this.$set(
@@ -146,14 +146,15 @@ export default {
         noticeId: this.form1.noticeId,
         portId: this.form1.portId,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
-        userId: getCookie("userId")
+        userId: getCookie("userId"),
         // resultMemo: this.form1.resultMemo,
       };
       //身份证校验
       function checkCardNo() {
         var value3 = AmsshipDeliveryAttorney.attorenyPickupIdcard;
         //验证是否为数字
-        var patrn = /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
+        var patrn =
+          /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/;
         // var patrn2 = /^(\d{3,4}-)?\d{7,8}$/;
         if (patrn.exec(value3) == null || value3 == "") {
           return false;
@@ -194,15 +195,27 @@ export default {
             "/api/v1/tms/insertshipDeliveryAttorney",
             AmsshipDeliveryAttorney
           )
-          .then(res => {
-            this.$router.go(-1);
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功",
+              });
+            } else {
+              this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
+            }
+              this.$router.go(-1);
+            
           });
     },
     // 取消
     cancel() {
       this.$router.go(-1);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss">

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

@@ -48,14 +48,20 @@
         </el-form-item>
       </el-form>
     </div>
+    <div class="forwardingUnit from">
+      <span class="text">装货点：</span>
+      <el-input class="input" v-model="loadPointName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
     <div class="forwardingUnit from">
       <span class="text">卸货点：</span>
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
-    <div class="purchaseOrderNo from">
+    <div class="forwardingUnit from">
       <span class="text">采购订单号：</span>
       <el-input class="input" v-model="purchaseOrderNo" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(6)">浏览</el-button>
     </div>
     <div class="carrier from">
       <el-form :inline="true" class="demo-form-inline" label-width="80px">
@@ -112,6 +118,18 @@
           @radio-change="currentRadioChange4"
         ></dilTable>
       </div>
+      <div v-show="a == 5">
+        <dilTable
+          v-bind.sync="loadPoint"
+          @radio-change="currentRadioChange5"
+        ></dilTable>
+      </div>
+      <div v-show="a == 6">
+        <dilTable
+          v-bind.sync="purchaseOrder"
+          @radio-change="currentRadioChange6"
+        ></dilTable>
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -160,6 +178,9 @@ export default {
       unloadPointId: "",
       //卸货点名称
       unloadPointName: "",
+      //装货点id
+      loadPointId: null,
+      loadPointName: null,
       a: 1,
       direction: "rtl",
       input: "",
@@ -183,6 +204,14 @@ export default {
         requestUrl: "",
         selectionType: "radio"
       },
+      loadPoint: {
+        requestUrl: "",
+        selectionType: "radio"
+      },
+      purchaseOrder: {
+        requestUrl: "",
+        selectionType: "radio"
+      },
       purchaseOrgLable: null,
       purchaseOrgList: [
         {
@@ -203,9 +232,7 @@ export default {
       }
     }
   },
-  created() {
-    this.unloadPoint.requestUrl = "/api/v1/uc/getUnloadingMesByLike?apiId=374";
-  },
+  created() {},
   methods: {
     onClick(index) {
       this.selectionList.splice(index, 1);
@@ -236,8 +263,8 @@ export default {
         supplierId: this.supplierId,
         purchaseOrgId: this.purchaseOrgId
       };
-      if (this.remark) {
-        map.remark = this.remark;
+      if (this.stateConsignee) {
+        map.remark = this.stateConsignee;
       }
       console.log(map);
       if (this.materialId && this.supplierId && this.purchaseOrgId) {
@@ -250,11 +277,14 @@ export default {
                 type: "warning"
               });
               this.purchaseOrderNo = null;
+              this.purchaseOrderId = null;
+              this.remark = null;
+              this.stateConsignee = null;
               this.form1 = [];
             } else {
               console.log();
               console.log(res.data.data);
-              this.remark = res.data.data.remark;
+              this.stateConsignee = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo = res.data.data.purchaseOrderNo;
             }
@@ -281,6 +311,20 @@ export default {
           this.input +
           "&i=" +
           new Date();
+      } else if (a == 5) {
+        this.loadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" +
+          this.input +
+          "&i=" +
+          new Date();
+      } else if (a == 6) {
+        this.purchaseOrder.requestUrl =
+          "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+          this.supplierId +
+          "&con=" +
+          this.input +
+          "&i=" +
+          new Date();
       }
     },
     ondrawer(num) {
@@ -289,7 +333,21 @@ export default {
       if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
-          this.materialId;
+          this.materialId +
+          "&i=" +
+          new Date();
+      } else if (num == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374" + "&i=" + new Date();
+      } else if (num == 5) {
+        this.loadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374" + "&i=" + new Date();
+      } else if (num == 6) {
+        this.purchaseOrder.requestUrl =
+          "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+          this.supplierId +
+          "&i=" +
+          new Date();
       }
     },
     //承运商弹出层
@@ -327,20 +385,46 @@ export default {
     onClickCancel() {
       this.$router.push("/purInwardRequirement");
     },
+    //选择物资
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
       this.getPurchaseOrderNo();
     },
+    //选择发货单位
     currentRadioChange2(selection) {
       this.supplierName = selection.supplierName;
       this.supplierId = selection.supplierId;
       this.getPurchaseOrderNo();
     },
+    //选择卸货点
     currentRadioChange4(selection) {
       this.unloadPointId = selection.warehouseId;
       this.unloadPointName = selection.warehouseName;
     },
+    //选择装货点
+    currentRadioChange5(selection) {
+      this.loadPointId = selection.warehouseId;
+      this.loadPointName = selection.warehouseName;
+    },
+    //选择采购订单
+    currentRadioChange6(selection) {
+      console.log(selection);
+      if (selection.orgId == 1) {
+        this.purchaseOrgLable = "一厂";
+        this.purchaseOrgId = 1;
+      } else {
+        this.purchaseOrgLable = "二厂";
+        this.purchaseOrgId = 2;
+      }
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
+      this.purchaseOrderNo = selection.purchaseOrderNo;
+      this.purchaseOrderId = selection.purchaseOrderId;
+      this.stateConsignee = selection.resultForeignShipName;
+    },
     currentRadioChange3(selection) {
       this.selectionList = [];
       this.selectionList = selection;
@@ -396,6 +480,7 @@ export default {
         this.supplierName,
         this.purchaseOrderNo,
         this.unloadPointName,
+        this.loadPointName,
         this.stateCarrier
       );
       this.disabled = true;
@@ -439,6 +524,7 @@ export default {
           materialId: this.materialId,
           purchaseOrderId: this.purchaseOrderId,
           unloadPointId: this.unloadPointId,
+          loadPointId: this.loadPointId,
           carrierId: this.carrierId,
           rangeId: this.rangeId,
           userId: getCookie("orgCode")

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

@@ -206,6 +206,14 @@ export default {
         {
           value: 16,
           label: "一焦化采购内转"
+        },
+        {
+          value: 23,
+          label: "厂外内转-老区"
+        },
+        {
+          value: 24,
+          label: "厂外内转-二厂"
         }
       ],
       orderType: null,
@@ -292,7 +300,7 @@ export default {
           orderId: this.orderId,
           planId: this.planId,
           mapList: this.selectionList,
-          orgCode:getCookie("orgCode")
+          orgCode: getCookie("orgCode")
         })
         .then(res => {
           if (res.data.code == "200") {
@@ -331,13 +339,17 @@ export default {
           "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
           getCookie("userId") +
           "&index=" +
-          this.truckText;
+          this.truckText +
+          "&i=" +
+          new Date();
       } else {
         this.truck.requestUrl =
           "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
           null +
           "&index=" +
-          this.truckText;
+          this.truckText +
+          "&i=" +
+          new Date();
       }
     },
     //车辆表格
@@ -366,20 +378,28 @@ export default {
         if (getCookie("orgCode") == "chengyunshang") {
           this.truck.requestUrl =
             "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            getCookie("userId");
+            getCookie("userId") +
+            "&i=" +
+            new Date();
         } else if (getCookie("orgCode") == "biemeierchejian") {
           this.truck.requestUrl =
             "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=929059510763524096" +
             "&con=" +
-            "铁专线精煤";
+            "铁专线精煤" +
+            "&i=" +
+            new Date();
         } else {
           this.truck.requestUrl =
             "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
-            null;
+            null +
+            "&i=" +
+            new Date();
         }
         this.truckDrawer = true;
       } else {
         this.lineDrawer = true;
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }
     },
     //线路表格的框计算

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

@@ -0,0 +1,448 @@
+<template>
+  <div class="addSaleOrderSend">
+    <page-title>新增运输订单派车</page-title>
+    <!-- 零星订单表的数据 -->
+    <div class="saleOrder">
+      <dilTable v-bind.sync="option" @func="func"></dilTable>
+    </div>
+    <!-- 表单选择车辆-->
+    <div class="from">
+      <div class="line">
+        <span class="text">线路</span>
+        <el-input
+          v-model="lineName"
+          placeholder="请选择线路"
+          disabled
+        ></el-input>
+        <el-button type="primary" @click="onClick(1)">浏览</el-button>
+      </div>
+      <div class="orderType">
+        <span class="text">订单类型</span>
+        <el-select v-model="orderType" placeholder="请选择">
+          <el-option
+            v-for="item in orderTypeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="vehicle">
+        <span class="text">车辆</span>
+        <el-button type="primary" @click="onClick(2)">浏览</el-button>
+        <span class="span"></span>
+      </div>
+    </div>
+    <!-- 派车表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-drawer
+      :visible.sync="lineDrawer"
+      :with-header="false"
+      :destroy-on-close="true"
+      direction="rtl"
+      size="40%"
+      :show-close="true"
+      :wrapperClosable="false"
+      close-on-press-escape
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="lineText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange2"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <!-- 车辆模态框 -->
+    <el-drawer
+      :visible.sync="truckDrawer"
+      :with-header="false"
+      :destroy-on-close="true"
+      direction="rtl"
+      size="40%"
+      :show-close="true"
+      :wrapperClosable="false"
+      close-on-press-escape
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="truckText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="selectTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="AddTruckClick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="truck"
+          :isHeigth="isHeigth"
+          :shiyHeigth="shiyHeigth"
+          :isKuang="isKuang"
+          @selection-change="currentRadioChange1"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure" :disabled="disabled"
+        >确定</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      shiyHeigth: 140,
+      isHeigth: true,
+      isKuang: false,
+      planId: null,
+      disabled: false,
+      //线路名称
+      lineId: null,
+      lineName: null,
+      lineText: null,
+      materialId: null,
+      lineDrawer: false,
+      //线路的表格
+      line: {
+        requestUrl: "",
+        selectionType: "radio"
+      },
+      //订单类型
+      orderTypeList: [
+        {
+          value: 10,
+          label: "采购内转(铁专线-新区)"
+        },
+        {
+          value: 20,
+          label: "采购内转(铁专线-老区)"
+        },
+        {
+          value: 15,
+          label: "拼装车皮进厂(老区专线-老区)"
+        },
+        {
+          value: 16,
+          label: "一焦化采购内转"
+        },
+        {
+          value: 23,
+          label: "厂外内转-老区"
+        },
+        {
+          value: 24,
+          label: "厂外内转-二厂"
+        }
+      ],
+      orderType: null,
+      //已经选择车辆物资信息
+      selectionList: [],
+      //销售订单物资信息
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "",
+        // 控制显示当选列
+        isPagination: false
+      },
+      //是否打开选择车辆的模态框
+      truckDrawer: false,
+      //车辆的表格
+      truck: {
+        requestUrl: "",
+        selectionType: "select"
+      },
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号"
+        }
+      ],
+      truckText: null,
+      //当前多选选中的车辆
+      selectTruck: []
+    };
+  },
+  created() {
+    this.option.requestUrl =
+      "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&planId=" +
+      this.$route.params.planId;
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+        getCookie("userId");
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+    } else if (getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=929059510763524096" +
+        "&con=" +
+        "铁专线精煤";
+      this.line.requestUrl =
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" +
+        "&con=" +
+        "采购内转";
+    } else {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+      this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3";
+    }
+  },
+  methods: {
+    func(res) {
+      console.log(res.list[0].materialId);
+      this.materialId = res.list[0].materialId;
+    },
+    makeSure() {
+      this.disabled = true;
+      if (this.lineId == null) {
+        if (this.orderType == 10 || this.orderType == 20) {
+          this.$message.error("未选择路线");
+          this.disabled = false;
+          return;
+        }
+      } else if (this.selectionList.length == 0) {
+        this.$message.error("未选择车辆");
+        this.disabled = false;
+        return;
+      }
+      this.axios
+        .post("/api/v1/oms/addPurInwardOrder", {
+          materialId: this.materialId,
+          lineId: this.lineId,
+          orderType: this.orderType,
+          orderId: this.orderId,
+          planId: this.$route.params.planId,
+          mapList: this.selectionList,
+          orgCode: getCookie("orgCode")
+        })
+        .then(res => {
+          if (res.data.code == "200") {
+            this.$message.success("派车成功");
+            this.disabled = false;
+            this.cancel();
+          }
+        });
+    },
+    //点击取消按钮的事件
+    cancel() {
+      this.$router.push("/purInwardTruckOrder");
+    },
+    //点击删除按钮删除当前点击的对象
+    deleteRow(index) {
+      this.selectionList.splice(index, 1);
+    },
+    //车辆模态框的确定事件
+    AddTruckClick() {
+      if (this.a == 2) {
+        this.selectTruck.forEach(e => {
+          this.selectionList.push({
+            capacityId: e.capacityId,
+            capacityNumber: e.capacityNumber
+          });
+        });
+        this.truckDrawer = false;
+      } else {
+        this.lineDrawer = false;
+      }
+    },
+    //车辆模态框框计算
+    selectTruckClick() {
+      if (getCookie("orgCode") == "chengyunshang") {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          getCookie("userId") +
+          "&index=" +
+          this.truckText +
+          "&i=" +
+          new Date();
+      } else {
+        this.truck.requestUrl =
+          "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+          null +
+          "&index=" +
+          this.truckText +
+          "&i=" +
+          new Date();
+      }
+    },
+    //车辆表格
+    currentRadioChange1(select) {
+      this.selectTruck = [];
+      this.selectTruck = select;
+    },
+    currentRadioChange2(selection) {
+      this.lineId = selection.lineId;
+      if (selection.lineName == null && selection.lineDesk == null) {
+        this.lineName = "";
+      } else {
+        this.lineName = selection.lineName + "  " + selection.lineDesk;
+        this.lineId = selection.lineId;
+      }
+    },
+    onClick(num) {
+      this.a = num;
+      if (num == 2) {
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else if (getCookie("orgCode") == "biemeierchejian") {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=929059510763524096" +
+            "&con=" +
+            "铁专线精煤" +
+            "&i=" +
+            new Date();
+        } else {
+          this.truck.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
+        }
+        this.truckDrawer = true;
+      } else {
+        this.lineDrawer = true;
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+      }
+    },
+    //线路表格的框计算
+    selectClick() {
+      this.line.requestUrl =
+        "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.lineText;
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.addSaleOrderSend {
+  .from {
+    margin-top: 20px;
+    .line {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .el-input {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+    }
+    .vehicle {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      margin-top: 20px;
+      .el-button {
+        width: 250px;
+        margin-left: 10px;
+        margin-right: 10px;
+      }
+      .span {
+        width: 70px;
+      }
+    }
+  }
+  .orderType {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 20px;
+    margin-right: 130px;
+    .el-select {
+      padding-left: 10px;
+    }
+  }
+  .tablecls {
+    margin-top: 20px;
+  }
+  .button_box {
+    display: flex;
+    justify-content: center;
+    margin: 20px;
+    .el-button {
+      width: 100px;
+      margin-left: 20px;
+    }
+  }
+}
+</style>

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

@@ -27,7 +27,7 @@
       </span>
     </el-dialog>
     <div class="transportOrder_bottom">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName">
         <!-- 已下发 -->
         <el-tab-pane label="未接收" name="first">
           <dilTable v-bind.sync="first">
@@ -59,6 +59,23 @@
         <el-tab-pane label="已完成" name="completed">
           <dilTable v-bind.sync="completed"> </dilTable>
         </el-tab-pane>
+        <!-- 已派单 -->
+        <el-tab-pane label="已派单" name="dispatched">
+          <dilTable v-bind.sync="dispatched">
+            <el-table-column fixed="right" label="操作" width="100">
+              <template slot-scope="scope">
+                <el-button
+                  @click="continueDispatch(scope)"
+                  type="text"
+                  size="small"
+                  v-if="scope.row.enable1 == 1"
+                >
+                  继续分解
+                </el-button>
+              </template>
+            </el-table-column>
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -93,6 +110,9 @@ export default {
       completed: {
         requestUrl: ""
       },
+      dispatched: {
+        requestUrl: ""
+      },
       //车辆的表格
       truck: {
         requestUrl: "",
@@ -135,6 +155,9 @@ export default {
       this.completed.requestUrl =
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
         getCookie("userId");
+      this.dispatched.requestUrl =
+        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&carrierSsoId=" +
+        getCookie("userId");
     } else if (
       getCookie("orgCode") == "dagangadmin" ||
       getCookie("orgCode") == "zidonghuabu"
@@ -145,6 +168,8 @@ export default {
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5";
       this.completed.requestUrl =
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+      this.dispatched.requestUrl =
+        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
     } else {
       this.first.requestUrl =
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1";
@@ -152,9 +177,17 @@ export default {
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5";
       this.completed.requestUrl =
         "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+      this.dispatched.requestUrl =
+        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
     }
   },
   methods: {
+    continueDispatch(scope) {
+      this.$router.push("/addPurInwardOrderCon/" + scope.row.planId);
+    },
+    onclick() {
+      console.log();
+    },
     handleClose(done) {
       done();
       this.$message.info("取消修改运力");

src/views/inward/router/index.js

@@ -161,6 +161,9 @@ import inwardCountDetailsOrders from "../components/inwardSettlement/countDetail
 //内转结算--计时和计重计费详单
 import inwardWeightTimeDetailsOrder from "../components/inwardSettlement/inwardAllDetailsOrder.vue";
 
+//继续分解采购内转需求订单
+import addPurInwardOrderCon from "@/views/inward/components/truckOrder/addPurInwardOrderCon";
+
 Vue.use(Router);
 
 const constantRouterMap = [
@@ -626,6 +629,12 @@ const constantRouterMap = [
         name: "inwardWeightTimeDetailsOrder",
         meta: { code: "xtpzgl-yhgl" },
         component: inwardWeightTimeDetailsOrder
+      },
+      {
+        path: "addPurInwardOrderCon/:planId",
+        name: "addPurInwardOrderCon",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addPurInwardOrderCon
       }
     ]
   }

src/views/statisticalReport/components/inwardReport/allInwardReport.vue

@@ -30,6 +30,9 @@
         <el-tab-pane label="采购燃料报表" name="fourth"
           ><dilTable ref="excelDom" v-bind.sync="fourth"></dilTable
         ></el-tab-pane>
+        <el-tab-pane label="厂外-厂内内转报表" name="fifth"
+          ><dilTable ref="excelDom" v-bind.sync="fifth"></dilTable
+        ></el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -51,6 +54,7 @@ export default {
       //销售内转数据
       saleReport: [],
       purReport: [],
+      outFactory: [],
       input: null,
       activeName: "first",
       startTime: null,
@@ -66,6 +70,9 @@ export default {
       },
       fourth: {
         requestUrl: ""
+      },
+      fifth: {
+        requestUrl: ""
       }
     };
   },
@@ -208,7 +215,7 @@ export default {
               loading.close();
             }, 2000);
           });
-      } else {
+      } else if (this.activeName == "fourth") {
         this.axios
           .post(
             "/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&startTime=" +
@@ -231,6 +238,29 @@ export default {
               loading.close();
             }, 2000);
           });
+      } else if (this.activeName == "fifth") {
+        this.axios
+          .post(
+            "/api/v1/tms/getOutFactoryInwardList?apiId=486&isPage=yes&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&index=" +
+              this.input +
+              "&orgCode=" +
+              orgCode
+          )
+          .then(res => {
+            this.totalArr = [];
+            this.outFactory = [];
+            this.tableTitle = "厂外-厂内统计报表";
+            this.outFactory = res.data.data;
+            this.totalArr = this.totalArr.concat(this.outFactory);
+            this.exportAllReportToExcel();
+            setTimeout(() => {
+              loading.close();
+            }, 2000);
+          });
       }
     },
     openFullScreen() {
@@ -310,11 +340,29 @@ export default {
                         this.purReport = [];
                         this.purReport = res.data.data;
                         this.totalArr = this.totalArr.concat(this.purReport);
-                        this.tableTitle = "全部内转车辆报表";
-                        this.exportAllReportToExcel();
-                        setTimeout(() => {
-                          loading.close();
-                        }, 2000);
+                        this.axios
+                          .post(
+                            "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=null&isPage=yes&startTime=" +
+                              startTime +
+                              "&endTime=" +
+                              endTime +
+                              "&index=" +
+                              this.input +
+                              "&i=" +
+                              new Date()
+                          )
+                          .then(res => {
+                            this.outFactory = [];
+                            this.outFactory = res.data.data;
+                            this.totalArr = this.totalArr.concat(
+                              this.outFactory
+                            );
+                            this.tableTitle = "全部内转车辆报表";
+                            this.exportAllReportToExcel();
+                            setTimeout(() => {
+                              loading.close();
+                            }, 2000);
+                          });
                       });
                   });
               });
@@ -335,58 +383,77 @@ export default {
             this.inwardArr = [];
             this.inwardArr = res.data.data;
             this.totalArr = this.totalArr.concat(this.inwardArr);
-          });
-        this.axios
-          .post(
-            "/api/v1/tms/getPurchaseInwardList?apiId=486&isPage=yes&orgCode=" +
-              getCookie("orgCode") +
-              "&startTime=" +
-              startTime +
-              "&endTime=" +
-              endTime +
-              "&index=" +
-              this.input
-          )
-          .then(res => {
-            this.purInward = [];
-            this.purInward = res.data.data;
-            this.totalArr = this.totalArr.concat(this.purInward);
-          });
-        this.axios
-          .post(
-            "/api/v1/tms/getSaleOrderList?apiId=486&isPage=yes&orgCode=" +
-              getCookie("orgCode") +
-              "&startTime=" +
-              startTime +
-              "&endTime=" +
-              endTime +
-              "&index=" +
-              this.input
-          )
-          .then(res => {
-            this.saleReport = [];
-            this.saleReport = res.data.data;
-            this.totalArr = this.totalArr.concat(this.saleReport);
-          });
-        this.axios
-          .post(
-            "/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&orgCode=" +
-              getCookie("orgCode") +
-              "&startTime=" +
-              startTime +
-              "&endTime=" +
-              endTime +
-              "&index=" +
-              this.input
-          )
-          .then(res => {
-            this.purReport = [];
-            this.purReport = res.data.data;
-            this.totalArr = this.totalArr.concat(this.purReport);
-            this.exportAllReportToExcel();
-            setTimeout(() => {
-              loading.close();
-            }, 2000);
+            this.axios
+              .post(
+                "/api/v1/tms/getPurchaseInwardList?apiId=486&isPage=yes&orgCode=" +
+                  getCookie("orgCode") +
+                  "&startTime=" +
+                  startTime +
+                  "&endTime=" +
+                  endTime +
+                  "&index=" +
+                  this.input
+              )
+              .then(res => {
+                this.purInward = [];
+                this.purInward = res.data.data;
+                this.totalArr = this.totalArr.concat(this.purInward);
+                this.axios
+                  .post(
+                    "/api/v1/tms/getSaleOrderList?apiId=486&isPage=yes&orgCode=" +
+                      getCookie("orgCode") +
+                      "&startTime=" +
+                      startTime +
+                      "&endTime=" +
+                      endTime +
+                      "&index=" +
+                      this.input
+                  )
+                  .then(res => {
+                    this.saleReport = [];
+                    this.saleReport = res.data.data;
+                    this.totalArr = this.totalArr.concat(this.saleReport);
+                    this.axios
+                      .post(
+                        "/api/v1/tms/getPurchaseOrderList?apiId=486&isPage=yes&orgCode=" +
+                          getCookie("orgCode") +
+                          "&startTime=" +
+                          startTime +
+                          "&endTime=" +
+                          endTime +
+                          "&index=" +
+                          this.input
+                      )
+                      .then(res => {
+                        this.purReport = [];
+                        this.purReport = res.data.data;
+                        this.totalArr = this.totalArr.concat(this.purReport);
+                        this.axios
+                          .post(
+                            "/api/v1/tms/getOutFactoryInwardList?apiId=486&isPage=yes&orgCode=" +
+                              getCookie("orgCode") +
+                              "&startTime=" +
+                              startTime +
+                              "&endTime=" +
+                              endTime +
+                              "&index=" +
+                              this.input
+                          )
+                          .then(res => {
+                            this.outFactory = [];
+                            this.outFactory = res.data.data;
+                            this.totalArr = this.totalArr.concat(
+                              this.outFactory
+                            );
+                            this.tableTitle = "全部内转车辆报表";
+                            this.exportAllReportToExcel();
+                            setTimeout(() => {
+                              loading.close();
+                            }, 2000);
+                          });
+                      });
+                  });
+              });
           });
       }
     },
@@ -440,6 +507,11 @@ export default {
           null +
           "&i=" +
           new Date();
+        this.fifth.requestUrl =
+          "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
+          null +
+          "&i=" +
+          new Date();
       } else {
         this.first.requestUrl =
           "/api/v1/tms/getInwardInFactory?apiId=486&orgCode=" +
@@ -461,6 +533,11 @@ export default {
           getCookie("orgCode") +
           "&i=" +
           new Date();
+        this.fifth.requestUrl =
+          "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
+          getCookie("orgCode") +
+          "&i=" +
+          new Date();
       }
     },
     onClick() {
@@ -512,7 +589,7 @@ export default {
             this.input +
             "&i=" +
             new Date();
-        } else {
+        } else if (this.activeName == "fourth") {
           this.fourth.requestUrl =
             "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=" +
             null +
@@ -524,6 +601,18 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (this.activeName == "fifth") {
+          this.fifth.requestUrl =
+            "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
+            null +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&index=" +
+            this.input +
+            "&i=" +
+            new Date();
         }
       } else {
         if (this.activeName == "first") {
@@ -562,7 +651,7 @@ export default {
             this.input +
             "&i=" +
             new Date();
-        } else {
+        } else if (thia.activeName == "fourth") {
           this.fourth.requestUrl =
             "/api/v1/tms/getPurchaseOrderList?apiId=486&orgCode=" +
             getCookie("orgCode") +
@@ -574,6 +663,18 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (thia.activeName == "fifth") {
+          this.fifth.requestUrl =
+            "/api/v1/tms/getOutFactoryInwardList?apiId=486&orgCode=" +
+            getCookie("orgCode") +
+            "&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&index=" +
+            this.input +
+            "&i=" +
+            new Date();
         }
       }
     },

src/views/statisticalReport/components/tableItem.vue

@@ -72,10 +72,10 @@ export default {
   },
   methods: {
     headerCellStyle({ row, column, rowIndex, columnIndex }) {
-      let columnIndexList1 = [4];
-      let columnIndexList2 = [5];
-      let columnIndexList3 = [6];
-      let columnIndexList4 = [7];
+      let columnIndexList1 = [5];
+      let columnIndexList2 = [6];
+      let columnIndexList3 = [7];
+      let columnIndexList4 = [8];
       if (columnIndexList1.includes(columnIndex) && rowIndex == 0) {
         //如果有多个css样式，使用;隔开
         return "color:#fff;cursor: pointer;background-color:red !important";