adadsa

build/utils.js

@@ -18,7 +18,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ['index','inward']
 // let devModules = ['index','TMS']
 // let devModules = ["index", "appoint", "sale", "statisticalReport"];
-let devModules = ["all"];
+let devModules = ["index", "SporadicManage", "statisticalReport"];
 // let devModules = ["index", "statisticalReport", "inward", "TMS", "appoint"];
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

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

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

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

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

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

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

src/views/SporadicManage/router/index.js

@@ -1,190 +1,489 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";
 
-import routerBefore from '@/config/routerBefore.js'
+import routerBefore from "@/config/routerBefore.js";
 
 // 主要
-import main from '@/components/main.vue'
+import main from "@/components/main.vue";
 // 系统配置管理
 //零星物资运输预约
-import sporadicTransportAppoint from '../components/sporadicMaterial/transportAppoint/transportAppoint.vue'
-import addSporadicTransportAppoint from '../components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue'
-import editSporadicTransportAppoint from '../components/sporadicMaterial/transportAppoint/editTransportAppoint.vue'
+import sporadicTransportAppoint from "../components/sporadicMaterial/transportAppoint/transportAppoint.vue";
+import addSporadicTransportAppoint from "../components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue";
+import editSporadicTransportAppoint from "../components/sporadicMaterial/transportAppoint/editTransportAppoint.vue";
 //内转零星运输计划
-import addSporadicTransportPlan from '../components/sporadicMaterial/transportPlan/addTransportPlan.vue'
-import sporadicTransportPlan from '../components/sporadicMaterial/transportPlan/transportPlan.vue'
+import addSporadicTransportPlan from "../components/sporadicMaterial/transportPlan/addTransportPlan.vue";
+import sporadicTransportPlan from "../components/sporadicMaterial/transportPlan/transportPlan.vue";
 //零星物资运输派单
-import sporadicTransportOrder from '../components/sporadicMaterial/transportOrder/transportOrder.vue'
-import addSporadicTransportOrder from '../components/sporadicMaterial/transportOrder/addTransportOrder.vue'
-import editSporadicTransportOrder from '../components/sporadicMaterial/transportOrder/editTransportOrder.vue'
+import sporadicTransportOrder from "../components/sporadicMaterial/transportOrder/transportOrder.vue";
+import addSporadicTransportOrder from "../components/sporadicMaterial/transportOrder/addTransportOrder.vue";
+import editSporadicTransportOrder from "../components/sporadicMaterial/transportOrder/editTransportOrder.vue";
 //零星物资进厂
-import sporadicENenfactory from '../components/sporadicMaterial/sporadicEnfactory/enFactory.vue'
-import sporadicENgrossWeight from '../components/sporadicMaterial/sporadicEnfactory/grossWeight.vue'
-import sporadicENoutFactory from '../components/sporadicMaterial/sporadicEnfactory/outFactory.vue'
-import sporadicENtareWeight from '../components/sporadicMaterial/sporadicEnfactory/tareWeight.vue'
-import sporadicENunload from '../components/sporadicMaterial/sporadicEnfactory/unload.vue'
+import sporadicENenfactory from "../components/sporadicMaterial/sporadicEnfactory/enFactory.vue";
+import sporadicENgrossWeight from "../components/sporadicMaterial/sporadicEnfactory/grossWeight.vue";
+import sporadicENoutFactory from "../components/sporadicMaterial/sporadicEnfactory/outFactory.vue";
+import sporadicENtareWeight from "../components/sporadicMaterial/sporadicEnfactory/tareWeight.vue";
+import sporadicENunload from "../components/sporadicMaterial/sporadicEnfactory/unload.vue";
 //零星物资出厂
-import sporadicOUTenfactory from '../components/sporadicMaterial/sporadicOutfactory/enFactory.vue'
-import sporadicOUTgrossWeight from '../components/sporadicMaterial/sporadicOutfactory/grossWeight.vue'
-import sporadicOUToutFactory from '../components/sporadicMaterial/sporadicOutfactory/outFactory.vue'
-import sporadicOUTtareWeight from '../components/sporadicMaterial/sporadicOutfactory/tareWeight.vue'
-import sporadicOUTload from '../components/sporadicMaterial/sporadicOutfactory/load.vue'
+import sporadicOUTenfactory from "../components/sporadicMaterial/sporadicOutfactory/enFactory.vue";
+import sporadicOUTgrossWeight from "../components/sporadicMaterial/sporadicOutfactory/grossWeight.vue";
+import sporadicOUToutFactory from "../components/sporadicMaterial/sporadicOutfactory/outFactory.vue";
+import sporadicOUTtareWeight from "../components/sporadicMaterial/sporadicOutfactory/tareWeight.vue";
+import sporadicOUTload from "../components/sporadicMaterial/sporadicOutfactory/load.vue";
 
 //老区零星进出厂
 //老厂零星物资运输预约
-import oldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/transportAppoint.vue'
-import addOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue'
-import editOldSporadicAppoint from '../components/oldAreaSporadic/transportAppoint/editTransportAppoint.vue'
+import oldSporadicAppoint from "../components/oldAreaSporadic/transportAppoint/transportAppoint.vue";
+import addOldSporadicAppoint from "../components/oldAreaSporadic/transportAppoint/addSporadicTransportAppoint.vue";
 //老厂零星物资运输派单
-import oldSporadicOrder from '../components/oldAreaSporadic/transportOrder/transportOrder.vue'
-import addOldSporadicOrder from '../components/oldAreaSporadic/transportOrder/addTransportOrder.vue'
+import oldSporadicOrder from "../components/oldAreaSporadic/transportOrder/transportOrder.vue";
+import addOldSporadicOrder from "../components/oldAreaSporadic/transportOrder/addTransportOrder.vue";
 
 //老厂零星物资中转
-import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue'
-import oldSporadicInwardGrossWeight from '../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue'
-import oldSporadicInwardoutFactory from '../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue'
-import oldSporadicInwardtareWeight from '../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue'
-import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
-import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
+import oldSporadicInwardTenfactory from "../components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue";
+import oldSporadicInwardGrossWeight from "../components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue";
+import oldSporadicInwardoutFactory from "../components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue";
+import oldSporadicInwardtareWeight from "../components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue";
+import oldSporadicInwardload from "../components/oldAreaSporadic/inwardSporadicFactory/Load.vue";
+import oldSporadicInwardUnload from "../components/oldAreaSporadic/inwardSporadicFactory/unload.vue";
 
 //钢材退货运输预约
-import steelReturnTransportAppoint from '../components/steelReturn/transportAppoint/transportAppoint.vue'
-import addSteelReturnTransportAppoint from '../components/steelReturn/transportAppoint/addSteelReturnTransportAppoint'
-import editSteelReturnTransportAppoint from '../components/steelReturn/transportAppoint/editTransportAppoint.vue'
+import steelReturnTransportAppoint from "../components/steelReturn/transportAppoint/transportAppoint.vue";
+import addSteelReturnTransportAppoint from "../components/steelReturn/transportAppoint/addSteelReturnTransportAppoint";
+import editSteelReturnTransportAppoint from "../components/steelReturn/transportAppoint/editTransportAppoint.vue";
 //钢材退货运输派单
-import steelReturnTransportOrder from '../components/steelReturn/transportOrder/transportOrder.vue'
-import addSteelReturnTransportOrder from '../components/steelReturn/transportOrder/addTransportOrder.vue'
-import editSteelReturnTransportOrder from '../components/steelReturn/transportOrder/editTransportOrder.vue'
+import steelReturnTransportOrder from "../components/steelReturn/transportOrder/transportOrder.vue";
+import addSteelReturnTransportOrder from "../components/steelReturn/transportOrder/addTransportOrder.vue";
+import editSteelReturnTransportOrder from "../components/steelReturn/transportOrder/editTransportOrder.vue";
 //钢材退货运输执行
-import steelReturnEnfactory from '../components/steelReturn/transportExcute/enFactory.vue'
-import steelReturnGrossWeight from '../components/steelReturn/transportExcute/grossWeight.vue'
-import steelReturnOutFactory from '../components/steelReturn/transportExcute/outFactory.vue'
-import steelReturnTareWeight from '../components/steelReturn/transportExcute/tareWeight.vue'
-import steelReturnUnload from '../components/steelReturn/transportExcute/unload.vue'
+import steelReturnEnfactory from "../components/steelReturn/transportExcute/enFactory.vue";
+import steelReturnGrossWeight from "../components/steelReturn/transportExcute/grossWeight.vue";
+import steelReturnOutFactory from "../components/steelReturn/transportExcute/outFactory.vue";
+import steelReturnTareWeight from "../components/steelReturn/transportExcute/tareWeight.vue";
+import steelReturnUnload from "../components/steelReturn/transportExcute/unload.vue";
 
 //一车多趟运输预约
-import mornThanTransportAppoint from '../components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue'
-import addMornThanTransportAppoint from '../components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue'
+import mornThanTransportAppoint from "../components/moreThanMaterialTruck/transportAppoint/transportAppoint.vue";
+import addMornThanTransportAppoint from "../components/moreThanMaterialTruck/transportAppoint/addSporadicTransportAppoint.vue";
 //一车多趟运输派单
-import mornThanTransportOrder from '../components/moreThanMaterialTruck/transportOrder/transportOrder.vue'
-import addMornThanTransportOrder from '../components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue'
+import mornThanTransportOrder from "../components/moreThanMaterialTruck/transportOrder/transportOrder.vue";
+import addMornThanTransportOrder from "../components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue";
 //一车多趟运输执行进厂
-import mornThanENenfactory from '../components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue'
-import mornThanENgrossWeight from '../components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue'
-import mornThanENoutFactory from '../components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue'
-import mornThanENtareWeight from '../components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue'
-import mornThanENunload from '../components/moreThanMaterialTruck/sporadicEnfactory/unload.vue'
+import mornThanENenfactory from "../components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue";
+import mornThanENgrossWeight from "../components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue";
+import mornThanENoutFactory from "../components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue";
+import mornThanENtareWeight from "../components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue";
+import mornThanENunload from "../components/moreThanMaterialTruck/sporadicEnfactory/unload.vue";
 //一车多趟运输执行出厂
-import mornThanOUTenfactory from '../components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue'
-import mornThanOUTgrossWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue'
-import mornThanOUToutFactory from '../components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue'
-import mornThanOUTtareWeight from '../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue'
-import mornThanOUTload from '../components/moreThanMaterialTruck/sporadicOutfactory/load.vue'
+import mornThanOUTenfactory from "../components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue";
+import mornThanOUTgrossWeight from "../components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue";
+import mornThanOUToutFactory from "../components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue";
+import mornThanOUTtareWeight from "../components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue";
+import mornThanOUTload from "../components/moreThanMaterialTruck/sporadicOutfactory/load.vue";
 
 // 内转零星内转进厂展示界面
-import sporadicEnfactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/enFactory.vue'
-import sporadicgrossWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue'
-import sporadicLeavefactoryInward from '../components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue'
-import sporadicLoadInward from '../components/sporadicMaterial/inwardSporadicFactory/Load.vue'
-import sporadicTareWeightInward from '../components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue'
-import sporadicUnloadInward from '../components/sporadicMaterial/inwardSporadicFactory/unload.vue'
+import sporadicEnfactoryInward from "../components/sporadicMaterial/inwardSporadicFactory/enFactory.vue";
+import sporadicgrossWeightInward from "../components/sporadicMaterial/inwardSporadicFactory/grossWeight.vue";
+import sporadicLeavefactoryInward from "../components/sporadicMaterial/inwardSporadicFactory/LeaveFactory.vue";
+import sporadicLoadInward from "../components/sporadicMaterial/inwardSporadicFactory/Load.vue";
+import sporadicTareWeightInward from "../components/sporadicMaterial/inwardSporadicFactory/tareWeight.vue";
+import sporadicUnloadInward from "../components/sporadicMaterial/inwardSporadicFactory/unload.vue";
 
-Vue.use(Router)
+Vue.use(Router);
 const constantRouterMap = [
   {
-    path: '/',
-    name: 'main',
-    meta: {title: '首页', code: 'xtpzgl'},
+    path: "/",
+    name: "main",
+    meta: { title: "首页", code: "xtpzgl" },
     component: main,
-    redirect: {name: 'addSporadicTransportAppoint'},
+    redirect: { name: "addSporadicTransportAppoint" },
     children: [
       //零星物资运输预约
-      {path:'addSporadicTransportAppoint',name:'addSporadicTransportAppoint',meta:{code:'xtpzgl-jggl'},component:addSporadicTransportAppoint},
-      {path:'sporadicTransportAppoint',name:'sporadicTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:sporadicTransportAppoint},
-      {path: 'editSporadicTransportAppoint', name: 'editSporadicTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportAppoint},
+      {
+        path: "addSporadicTransportAppoint",
+        name: "addSporadicTransportAppoint",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSporadicTransportAppoint
+      },
+      {
+        path: "sporadicTransportAppoint",
+        name: "sporadicTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicTransportAppoint
+      },
+      {
+        path: "editSporadicTransportAppoint",
+        name: "editSporadicTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSporadicTransportAppoint
+      },
       //内转零星运输计划
-      {path:'addSporadicTransportPlan',name:'addSporadicTransportPlan',meta:{code:'xtpzgl-jggl'},component:addSporadicTransportPlan},
-      {path:'sporadicTransportPlan',name:'sporadicTransportPlan',meta:{code:'xtpzgl-yhgl'},component:sporadicTransportPlan},
+      {
+        path: "addSporadicTransportPlan",
+        name: "addSporadicTransportPlan",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSporadicTransportPlan
+      },
+      {
+        path: "sporadicTransportPlan",
+        name: "sporadicTransportPlan",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicTransportPlan
+      },
       //零星物资运输订单
-      {path:'addSporadicTransportOrder',name:'addSporadicTransportOrder',meta:{code:'xtpzgl-jggl'},component:addSporadicTransportOrder},
-      {path:'sporadicTransportOrder',name:'sporadicTransportOrder',meta:{code:'xtpzgl-yhgl'},component:sporadicTransportOrder},
-      {path: 'editSporadicTransportOrder', name: 'editSporadicTransportOrder', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportOrder},
+      {
+        path: "addSporadicTransportOrder",
+        name: "addSporadicTransportOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSporadicTransportOrder
+      },
+      {
+        path: "sporadicTransportOrder",
+        name: "sporadicTransportOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicTransportOrder
+      },
+      {
+        path: "editSporadicTransportOrder",
+        name: "editSporadicTransportOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSporadicTransportOrder
+      },
       //零星物资进厂
-      {path:'sporadicENenfactory',name:'sporadicENenfactory',meta:{code:'xtpzgl-yhgl'},component:sporadicENenfactory},
-      {path:'sporadicENgrossWeight',name:'sporadicENgrossWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicENgrossWeight},
-      {path:'sporadicENoutFactory',name:'sporadicENoutFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicENoutFactory},
-      {path:'sporadicENtareWeight',name:'sporadicENtareWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicENtareWeight},
-      {path:'sporadicENunload',name:'sporadicENunload',meta:{code:'xtpzgl-yhgl'},component:sporadicENunload},
+      {
+        path: "sporadicENenfactory",
+        name: "sporadicENenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicENenfactory
+      },
+      {
+        path: "sporadicENgrossWeight",
+        name: "sporadicENgrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicENgrossWeight
+      },
+      {
+        path: "sporadicENoutFactory",
+        name: "sporadicENoutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicENoutFactory
+      },
+      {
+        path: "sporadicENtareWeight",
+        name: "sporadicENtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicENtareWeight
+      },
+      {
+        path: "sporadicENunload",
+        name: "sporadicENunload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicENunload
+      },
       //零星物资出厂
-      {path:'sporadicOUTenfactory',name:'sporadicOUTenfactory',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTenfactory},
-      {path:'sporadicOUTgrossWeight',name:'sporadicOUTgrossWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTgrossWeight},
-      {path:'sporadicOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicOUToutFactory},
-      {path:'sporadicOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTtareWeight},
-      {path:'sporadicOUTload',name:'sporadicOUTload',meta:{code:'xtpzgl-yhgl'},component:sporadicOUTload},
+      {
+        path: "sporadicOUTenfactory",
+        name: "sporadicOUTenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicOUTenfactory
+      },
+      {
+        path: "sporadicOUTgrossWeight",
+        name: "sporadicOUTgrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicOUTgrossWeight
+      },
+      {
+        path: "sporadicOUToutFactory",
+        name: "sporadicOUToutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicOUToutFactory
+      },
+      {
+        path: "sporadicOUTtareWeight",
+        name: "sporadicOUTtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicOUTtareWeight
+      },
+      {
+        path: "sporadicOUTload",
+        name: "sporadicOUTload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicOUTload
+      },
 
       //钢材退货运输预约
-      {path:'addSteelReturnTransportAppoint',name:'addSteelReturnTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:addSteelReturnTransportAppoint},
-      {path:'steelReturnTransportAppoint',name:'steelReturnTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:steelReturnTransportAppoint},
-      {path: 'editSteelReturnTransportAppoint', name: 'editSteelReturnTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSteelReturnTransportAppoint},
+      {
+        path: "addSteelReturnTransportAppoint",
+        name: "addSteelReturnTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addSteelReturnTransportAppoint
+      },
+      {
+        path: "steelReturnTransportAppoint",
+        name: "steelReturnTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnTransportAppoint
+      },
+      {
+        path: "editSteelReturnTransportAppoint",
+        name: "editSteelReturnTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSteelReturnTransportAppoint
+      },
       //钢材退货运输订单
-      {path:'addSteelReturnTransportOrder',name:'addSteelReturnTransportOrder',meta:{code:'xtpzgl-jggl'},component:addSteelReturnTransportOrder},
-      {path:'steelReturnTransportOrder',name:'steelReturnTransportOrder',meta:{code:'xtpzgl-yhgl'},component:steelReturnTransportOrder},
-      {path: 'editSteelReturnTransportOrder', name: 'editSteelReturnTransportOrder', meta: {code: 'xtpzgl-yhgl'}, component: editSteelReturnTransportOrder},
+      {
+        path: "addSteelReturnTransportOrder",
+        name: "addSteelReturnTransportOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addSteelReturnTransportOrder
+      },
+      {
+        path: "steelReturnTransportOrder",
+        name: "steelReturnTransportOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnTransportOrder
+      },
+      {
+        path: "editSteelReturnTransportOrder",
+        name: "editSteelReturnTransportOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSteelReturnTransportOrder
+      },
       //钢材退货进厂
-      {path:'steelReturnEnfactory',name:'steelReturnEnfactory',meta:{code:'xtpzgl-yhgl'},component:steelReturnEnfactory},
-      {path:'steelReturnGrossWeight',name:'steelReturnGrossWeight',meta:{code:'xtpzgl-yhgl'},component:steelReturnGrossWeight},
-      {path:'steelReturnOutFactory',name:'steelReturnOutFactory',meta:{code:'xtpzgl-yhgl'},component:steelReturnOutFactory},
-      {path:'steelReturnTareWeight',name:'steelReturnTareWeight',meta:{code:'xtpzgl-yhgl'},component:steelReturnTareWeight},
-      {path:'steelReturnUnload',name:'steelReturnUnload',meta:{code:'xtpzgl-yhgl'},component:steelReturnUnload},
+      {
+        path: "steelReturnEnfactory",
+        name: "steelReturnEnfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnEnfactory
+      },
+      {
+        path: "steelReturnGrossWeight",
+        name: "steelReturnGrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnGrossWeight
+      },
+      {
+        path: "steelReturnOutFactory",
+        name: "steelReturnOutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnOutFactory
+      },
+      {
+        path: "steelReturnTareWeight",
+        name: "steelReturnTareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnTareWeight
+      },
+      {
+        path: "steelReturnUnload",
+        name: "steelReturnUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: steelReturnUnload
+      },
 
-       //一车多趟运输预约
-       {path:'addMornThanTransportAppoint',name:'addMornThanTransportAppoint',meta:{code:'xtpzgl-jggl'},component:addMornThanTransportAppoint},
-       {path:'mornThanTransportAppoint',name:'mornThanTransportAppoint',meta:{code:'xtpzgl-yhgl'},component:mornThanTransportAppoint},
-       //一车多趟运输订单
-       {path:'addMornThanTransportOrder',name:'addMornThanTransportOrder',meta:{code:'xtpzgl-jggl'},component:addMornThanTransportOrder},
-       {path:'mornThanTransportOrder',name:'mornThanTransportOrder',meta:{code:'xtpzgl-yhgl'},component:mornThanTransportOrder},
-       //一车多趟进厂
-       {path:'mornThanENenfactory',name:'mornThanENenfactory',meta:{code:'xtpzgl-yhgl'},component:mornThanENenfactory},
-       {path:'mornThanENgrossWeight',name:'mornThanENgrossWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanENgrossWeight},
-       {path:'mornThanENoutFactory',name:'mornThanENoutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanENoutFactory},
-       {path:'mornThanENtareWeight',name:'mornThanENtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanENtareWeight},
-       {path:'mornThanENunload',name:'mornThanENunload',meta:{code:'xtpzgl-yhgl'},component:mornThanENunload},
-       //一车多趟出厂
-       {path:'mornThanOUTenfactory',name:'mornThanOUTenfactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTenfactory},
-       {path:'mornThanOUTgrossWeight',name:'mornThanOUTgrossWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTgrossWeight},
-       {path:'mornThanOUToutFactory',name:'sporadicOUToutFactory',meta:{code:'xtpzgl-yhgl'},component:mornThanOUToutFactory},
-       {path:'mornThanOUTtareWeight',name:'sporadicOUTtareWeight',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTtareWeight},
-       {path:'mornThanOUTload',name:'mornThanOUTload',meta:{code:'xtpzgl-yhgl'},component:mornThanOUTload},
+      //一车多趟运输预约
+      {
+        path: "addMornThanTransportAppoint",
+        name: "addMornThanTransportAppoint",
+        meta: { code: "xtpzgl-jggl" },
+        component: addMornThanTransportAppoint
+      },
+      {
+        path: "mornThanTransportAppoint",
+        name: "mornThanTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanTransportAppoint
+      },
+      //一车多趟运输订单
+      {
+        path: "addMornThanTransportOrder",
+        name: "addMornThanTransportOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addMornThanTransportOrder
+      },
+      {
+        path: "mornThanTransportOrder",
+        name: "mornThanTransportOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanTransportOrder
+      },
+      //一车多趟进厂
+      {
+        path: "mornThanENenfactory",
+        name: "mornThanENenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENenfactory
+      },
+      {
+        path: "mornThanENgrossWeight",
+        name: "mornThanENgrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENgrossWeight
+      },
+      {
+        path: "mornThanENoutFactory",
+        name: "mornThanENoutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENoutFactory
+      },
+      {
+        path: "mornThanENtareWeight",
+        name: "mornThanENtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENtareWeight
+      },
+      {
+        path: "mornThanENunload",
+        name: "mornThanENunload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanENunload
+      },
+      //一车多趟出厂
+      {
+        path: "mornThanOUTenfactory",
+        name: "mornThanOUTenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTenfactory
+      },
+      {
+        path: "mornThanOUTgrossWeight",
+        name: "mornThanOUTgrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTgrossWeight
+      },
+      {
+        path: "mornThanOUToutFactory",
+        name: "sporadicOUToutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUToutFactory
+      },
+      {
+        path: "mornThanOUTtareWeight",
+        name: "sporadicOUTtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTtareWeight
+      },
+      {
+        path: "mornThanOUTload",
+        name: "mornThanOUTload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: mornThanOUTload
+      },
 
-       //内转零星内转
-       {path:'sporadicEnfactoryInward',name:'sporadicEnfactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicEnfactoryInward},
-       {path:'sporadicgrossWeightInward',name:'sporadicgrossWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicgrossWeightInward},
-       {path:'sporadicLeavefactoryInward',name:'sporadicLeavefactoryInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLeavefactoryInward},
-       {path:'sporadicLoadInward',name:'sporadicLoadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicLoadInward},
-       {path:'sporadicTareWeightInward',name:'sporadicTareWeightInward',meta:{code:'xtpzgl-yhgl'},component:sporadicTareWeightInward},
-       {path:'sporadicUnloadInward',name:'sporadicUnloadInward',meta:{code:'xtpzgl-yhgl'},component:sporadicUnloadInward},
+      //内转零星内转
+      {
+        path: "sporadicEnfactoryInward",
+        name: "sporadicEnfactoryInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicEnfactoryInward
+      },
+      {
+        path: "sporadicgrossWeightInward",
+        name: "sporadicgrossWeightInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicgrossWeightInward
+      },
+      {
+        path: "sporadicLeavefactoryInward",
+        name: "sporadicLeavefactoryInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicLeavefactoryInward
+      },
+      {
+        path: "sporadicLoadInward",
+        name: "sporadicLoadInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicLoadInward
+      },
+      {
+        path: "sporadicTareWeightInward",
+        name: "sporadicTareWeightInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicTareWeightInward
+      },
+      {
+        path: "sporadicUnloadInward",
+        name: "sporadicUnloadInward",
+        meta: { code: "xtpzgl-yhgl" },
+        component: sporadicUnloadInward
+      },
 
       //老厂零星物资运输预约
-      {path:'addOldSporadicAppoint',name:'addOldSporadicAppoint',meta:{code:'xtpzgl-jggl'},component:addOldSporadicAppoint},
-      {path:'oldSporadicAppoint',name:'oldSporadicAppoint',meta:{code:'xtpzgl-yhgl'},component:oldSporadicAppoint},
-      {path: 'editSporadicTransportAppoint', name: 'editSporadicTransportAppoint', meta: {code: 'xtpzgl-yhgl'}, component: editSporadicTransportAppoint},
+      {
+        path: "addOldSporadicAppoint",
+        name: "addOldSporadicAppoint",
+        meta: { code: "xtpzgl-jggl" },
+        component: addOldSporadicAppoint
+      },
+      {
+        path: "oldSporadicAppoint",
+        name: "oldSporadicAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicAppoint
+      },
+      {
+        path: "editSporadicTransportAppoint",
+        name: "editSporadicTransportAppoint",
+        meta: { code: "xtpzgl-yhgl" },
+        component: editSporadicTransportAppoint
+      },
       //零星物资运输订单
-      {path:'addOldSporadicOrder',name:'addOldSporadicOrder',meta:{code:'xtpzgl-jggl'},component:addOldSporadicOrder},
-      {path:'oldSporadicOrder',name:'oldSporadicOrder',meta:{code:'xtpzgl-yhgl'},component:oldSporadicOrder},
+      {
+        path: "addOldSporadicOrder",
+        name: "addOldSporadicOrder",
+        meta: { code: "xtpzgl-jggl" },
+        component: addOldSporadicOrder
+      },
+      {
+        path: "oldSporadicOrder",
+        name: "oldSporadicOrder",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicOrder
+      },
       //零星物资运输执行
-      {path:'oldSporadicInwardTenfactory',name:'oldSporadicInwardTenfactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardTenfactory},
-      {path:'oldSporadicInwardGrossWeight',name:'oldSporadicInwardGrossWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardGrossWeight},
-      {path:'oldSporadicInwardoutFactory',name:'oldSporadicInwardoutFactory',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardoutFactory},
-      {path:'oldSporadicInwardtareWeight',name:'oldSporadicInwardtareWeight',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardtareWeight},
-      {path:'oldSporadicInwardUnload',name:'oldSporadicInwardUnload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardUnload},
-      {path:'oldSporadicInwardload',name:'oldSporadicInwardload',meta:{code:'xtpzgl-yhgl'},component:oldSporadicInwardload},
-    ]    
+      {
+        path: "oldSporadicInwardTenfactory",
+        name: "oldSporadicInwardTenfactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardTenfactory
+      },
+      {
+        path: "oldSporadicInwardGrossWeight",
+        name: "oldSporadicInwardGrossWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardGrossWeight
+      },
+      {
+        path: "oldSporadicInwardoutFactory",
+        name: "oldSporadicInwardoutFactory",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardoutFactory
+      },
+      {
+        path: "oldSporadicInwardtareWeight",
+        name: "oldSporadicInwardtareWeight",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardtareWeight
+      },
+      {
+        path: "oldSporadicInwardUnload",
+        name: "oldSporadicInwardUnload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardUnload
+      },
+      {
+        path: "oldSporadicInwardload",
+        name: "oldSporadicInwardload",
+        meta: { code: "xtpzgl-yhgl" },
+        component: oldSporadicInwardload
+      }
+    ]
   }
 ];
 
 const router = new Router({
   routes: constantRouterMap
-})
+});
 //  before
 routerBefore(router, constantRouterMap);
 

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

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

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

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

src/views/appoint/router/index.js

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

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

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

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

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

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

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