tijiao

build/utils.js

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

config/index.js

@@ -65,7 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:80",
+    // target: "http://172.16.33.166:80",
+    target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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