qianduan

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 
 
 
- let devModules = ['all']
-// let devModules = ['index','inward','statisticalReport']
+//  let devModules = ['all']
+let devModules = ['index','TMS']
 //  let devModules = ['index','WMS','sale','TMS','inward','SporadicManage']
 // let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
 // let devModules = ['index','RMS'];

config/index.js

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

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -585,7 +585,7 @@ export default {
     },
     currentRadioChange6(selection) {
       console.log(selection);
-      if (selection.shipperId == 1) {
+      if (selection.orgId == 1) {
         this.orderType = 6;
       } else {
         this.orderType = 7;

src/views/TMS/components/importedMineral/addTransportAppoint.vue

@@ -0,0 +1,870 @@
+<template>
+  <!-- 新增运输作业页面 -->
+  <div id="contractDetails">
+    <page-title>运输预约</page-title>
+     <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+      <span>进口矿预约界面</span>
+    </div>
+    <div class="supplieUnit">
+      <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+        >
+        <el-form-item label="发货单位:">
+         <el-autocomplete
+          class="inline-input"
+          v-model="stateSupplier"
+          :fetch-suggestions="querySearchSupplier"
+          placeholder="请输入发货单位名称"
+          :trigger-on-focus="false"
+          @select="handleSelectSupplier"
+        >
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.supplierName }}</div>
+        </template>
+        </el-autocomplete>
+        </el-form-item>
+     </el-form>
+    </div>
+    <div class="material from">
+      <span class="text">物资：</span>
+      <el-input class="input" v-model="materialName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+    <div class="remark from">
+      <span class="text">船名：</span>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
+      <span class="span"></span>
+    </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="lineId from">
+      <span class="text">选择路线：</span>
+      <el-input class="input" v-model="lineName" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(5)">浏览</el-button>
+    </div>
+    <div class="lineId 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="contractTitle from">
+      <dil-form :formId="219" v-model="form1"></dil-form>
+    </div>
+    <div class="truckList1">
+      <div class="truckList from">
+        <span class="text">选择车辆：</span>
+        <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button
+        >
+      </div>
+    </div>
+      <!-- 物资和装卸点以及装卸货次序 -->
+    <div class="swtichTop">
+    <span class="titile">选择车辆前请选择物资单位！</span>
+    <div class="switch" v-if="selectionList.length > 0">
+      <el-tooltip placement="top">
+        <div slot="content">下面表格已有数据，不能进行更改！！！</div>
+        <el-switch
+          v-model="value"
+          active-text="件数"
+          inactive-text="重量"
+          disabled
+        >
+        </el-switch>
+      </el-tooltip>
+    </div>
+    <div class="switch" v-else>
+      <el-tooltip placement="top">
+        <div slot="content">当下面表格有数据之后，将不能进行更改！！！</div>
+        <el-switch v-model="value" active-text="件数" inactive-text="重量">
+        </el-switch>
+      </el-tooltip>
+    </div>
+    </div>
+    <div class="truckListTable">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" width="50" label="序号" align="center">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template slot="scope" v-if="item.th_name !== '重量'">
+            <span>{{ item.label }}</span>
+          </template>
+          <!-- 插入输入框 -->
+          <template slot-scope="scope">
+            <template v-if="item.slot">
+              <template v-if="item.prop == 'orderMaterialWeight'">
+                <el-input
+                  style="width: 250px"
+                  v-model.number="scope.row.orderMaterialWeight"
+                ></el-input>
+              </template>
+              <!-- 物资件数 -->
+              <template v-if="item.prop == 'orderMaterialNumber'">
+                <el-input
+                  class="textinput"
+                  v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
+                ></el-input>
+              </template>
+            </template>
+            <template v-else>
+              <span>{{ scope.row[item.prop] }}</span>
+            </template>
+          </template>
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="onClick(scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 模态窗口 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" size="40%">
+      <div class="drawer_top">
+        <el-input
+          placeholder="请输入内容"
+          v-model="input"
+          style="margin-top: 10px; margin-right: 10px; width: 250px"
+          clearable
+        ></el-input>
+        <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+      </div>
+      <div class="drawer_table1" v-show="onDrawerNumber == 1">
+        <dilTable
+          v-bind.sync="frist"
+          @radio-change="currentRadioChange1"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth"
+          :shiyHeigth="shiyHeigth"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 2">
+        <dilTable
+          v-bind.sync="secend"
+          @radio-change="currentRadioChange2"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth1"
+          :shiyHeigth="shiyHeigth1"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 3">
+        <dilTable
+          v-bind.sync="third"
+          @selection-change="currentRadioChange3"
+          :isHeigth="isHeigth2"
+          :shiyHeigth="shiyHeigth2"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 4">
+        <dilTable
+          v-bind.sync="unloadPoint"
+          @radio-change="currentRadioChange4"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth3"
+          :shiyHeigth="shiyHeigth3"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 5">
+        <dilTable
+          v-bind.sync="line"
+          @radio-change="currentRadioChange5"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth4"
+          :shiyHeigth="shiyHeigth4"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+      <div v-show="onDrawerNumber == 6">
+        <dilTable
+          v-bind.sync="purchaseOrder"
+          @radio-change="currentRadioChange6"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth5"
+          :shiyHeigth="shiyHeigth5"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
+    </el-drawer>
+    <div class="button_box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+<script>
+import PageTitle from "@/components/Page/Title";
+import { sjTime, isNumber, isIntegerNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      //限定first
+      isHeigth:true,
+      shiyHeigth:140,
+      //限定second
+      isHeigth1:true,
+      shiyHeigth1:140,
+      //限定third
+      isHeigth2:true,
+      shiyHeigth2:140,
+      //限定unloadPoint
+      isHeigth3:true,
+      shiyHeigth3:140,
+      //限定line
+      isHeigth4:true,
+      shiyHeigth4:140,
+      //限定purchaseOrder
+      isHeigth5:true,
+      shiyHeigth5:140,
+      isKuang: false,
+      //采购订单号
+      purchaseOrderNo: "",
+      isMoreTrips: false,
+      // 线路名称
+      lineName: "",
+      //线路id
+      lineId: null,
+      // 件数与重量的开关
+      value: false,
+      //船名
+      remark: null,
+      // 车辆表格表头
+      tableTop: [
+        {
+          prop: "capacityNumber",
+          label: "车牌号",
+          width: "140",
+        },
+        {
+          prop: "carrierName",
+          label: "承运商",
+          width: "140",
+        },
+        {
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        },
+      ],
+      //发货单位名称
+      supplierName: "",
+      stateSupplier:null,
+      restaurantsSupplier:null,
+      //车辆表格数据
+      selectionList: [],
+      // 表单
+      form1: {},
+      //采购订单id
+      purchaseOrderId: "",
+      //物资名称
+      materialName: "",
+      //发货单位名称
+      supplierName: "",
+      //发货单位id
+      supplierId: null,
+      //物资id
+      materialId: null,
+      //是否需要打开模态窗口
+      drawer: false,
+      //卸货点id
+      unloadPointId: "",
+      //卸货点名称
+      unloadPointName: "",
+      //订单类别
+      orderType: 5,
+      onDrawerNumber: 1,
+      direction: "rtl",
+      input: "",
+      frist: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      secend: {
+        requestUrl: "",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      third: {
+        requestUrl: "",
+        selectionType: "select",
+        mapList3: [],
+      },
+      unloadPoint: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      line: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      purchaseOrder: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
+      truckList:[]
+    };
+  },
+  watch: {
+    drawer(val) {
+      if (val) {
+        this.input = null;
+      }   
+    },
+    value() {
+      if (this.value) {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialNumber",
+          label: "件数",
+          slot: true,
+        });
+      } else {
+        this.tableTop.splice(this.tableTop.length - 1, 1);
+        this.tableTop.push({
+          prop: "orderMaterialWeight",
+          label: "重量",
+          slot: true,
+        });
+      }
+    },
+  },
+  created() {
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+        getCookie("userId");
+    } else {
+      this.third.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
+    }
+  },
+  methods: {
+    onClick(index) {
+      this.selectionList.splice(index, 1);
+    },
+    onBlur() {
+      this.getPurchaseOrderNo();
+    },
+      //发货单位弹出层
+    handleSelectSupplier(item){
+      this.supplierId = item.supplierId
+      this.supplierName = item.supplierName
+    },
+    //以下是发货单位边输边查搜索
+    querySearchSupplier(queryString, cb) {
+        this.axios.post('/api/v1/uc/getSupplierMesByLike?index='+this.stateSupplier).then((res)=>{
+        if(res.data.code == "200"){    
+          var restaurantsSupplier = res.data.data
+          var results = queryString ? restaurantsSupplier.filter(this.createFilterSupplier(queryString)) :restaurantsSupplier;
+          // 调用 callback 返回建议列表的数据
+          cb(results);
+        }
+      })  
+      },
+    createFilterSupplier(queryString) {
+        return (restaurantsSupplier) => {
+          return (restaurantsSupplier.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+        };
+      },
+    getPurchaseOrderNo() {
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+      };
+      if (this.remark) {
+        map.remark = this.remark;
+      }
+      console.log(this.map);
+      if (this.materialId && this.supplierId) {
+        this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
+          console.log(res);
+          if (res.data.code == "200") {
+            if (res.data.data == null) {
+              this.$message({
+                message: "没有匹配的采购订单号!",
+                type: "warning",
+              });
+              this.form1 = [];
+            } else {
+              console.log();
+              this.remark = res.data.data.remark;
+              this.purchaseOrderId = res.data.data.purchaseOrderId;
+              this.purchaseOrderNo = res.data.data.purchaseOrderNo;
+              // if (res.data.data.receiveUnitId == 1) {
+              //   this.orderType = 6;
+              // } else {
+              //   this.orderType = 7;
+              // }
+            }
+          } else {
+            this.$message.error("请求失败");
+          }
+        });
+      }
+    },
+    onclick() {
+      if (this.input) {
+        this.isKuang = true;
+        if (this.onDrawerNumber == 1) {
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+            this.input + "&supplierId=" + this.supplierId;
+        } else if (this.onDrawerNumber == 2) {
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&index=" +
+            this.input;
+        } else if (this.onDrawerNumber == 3) {
+          //判断是否是承运商查询车辆
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&index=" +
+              this.input;
+          } else {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&index=" +
+              this.input;
+          }
+        } else if (this.onDrawerNumber == 4) {
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&index=" + this.input;
+        } else if (this.onDrawerNumber == 5) {
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        }
+      } else {
+        if (this.onDrawerNumber == 1) {
+          this.frist.requestUrl =
+            "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&i=" +
+            new Date() + "&supplierId=" + this.supplierId;
+        } else if (this.onDrawerNumber == 2) {
+          this.secend.requestUrl =
+            "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+            this.materialId +
+            "&i=" +
+            new Date();
+        } else if (this.onDrawerNumber == 3) {
+          //判断是否是承运商查询车辆
+          if (getCookie("orgCode") == "chengyunshang") {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              getCookie("userId") +
+              "&i=" +
+              new Date();
+          } else {
+            this.third.requestUrl =
+              "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+              null +
+              "&i=" +
+              new Date();
+          }
+        } else if (this.onDrawerNumber == 4) {
+          this.unloadPoint.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+        } else if (this.onDrawerNumber == 5) {
+          this.line.requestUrl =
+            "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
+        } else if (this.onDrawerNumber == 6) {
+          this.purchaseOrder.requestUrl =
+            "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+            this.supplierId +
+            "&i=" +
+            new Date();
+        }
+      }
+    },
+    func(res) {
+      console.log(res);
+      this.isKuang = false;
+    },
+    refreshTable(){
+    },
+    ondrawer(num) {
+        console.log(this.supplierId)
+      if(this.supplierId == null){
+          this.$message.warning("请先选择发货单位")
+          return
+      }
+      if(num != 1 && this.materialId == null){
+          this.$message.warning("请先选择物资")
+          return
+      }
+      this.drawer = true;
+      this.onDrawerNumber = num;
+      this.refreshTable()
+      if (num == 1) {
+          this.frist.requestUrl =
+          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
+          this.input + "&supplierId=" + this.supplierId;   
+      } else if (num == 2) {
+        this.secend.requestUrl =
+          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
+          this.materialId;
+      } else if (num == 3) {
+        //判断是否是承运商查询车辆
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            getCookie("userId") +
+            "&i=" +
+            new Date();
+        } else {
+          this.third.requestUrl =
+            "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" +
+            null +
+            "&i=" +
+            new Date();
+        }
+      } else if (num == 4) {
+        this.unloadPoint.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
+      } else if (num == 5) {
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=辅料&i=" + new Date();
+      } else if (num == 6) {
+        this.purchaseOrder.requestUrl =
+          "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
+          this.supplierId +
+          "&i=" +
+          new Date();
+      }
+    },
+    // 返回
+    onClickCancel() {
+      this.$router.push("/transportReserveRan");
+    },
+    currentRadioChange1(selection) {
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.getPurchaseOrderNo();
+    },
+    currentRadioChange4(selection) {
+      this.unloadPointId = selection.warehouseId;
+      this.unloadPointName = selection.warehouseName;
+    },
+    currentRadioChange5(selection) {
+      this.lineName = selection.lineName;
+      this.lineId = selection.lineId;
+    },
+    currentRadioChange6(selection) {
+      this.materialName = selection.materialName;
+      this.materialId = selection.materialId;
+      this.supplierId = selection.supplierId;
+      this.supplierName = selection.supplierName;
+      this.purchaseOrderNo = selection.purchaseOrderNo;
+      this.purchaseOrderId = selection.purchaseOrderId;
+    },
+    currentRadioChange3(selection) {
+      this.selectionList = []
+      this.selectionList = selection;
+    },
+    // 确认
+    onClickConfirm() {
+      var state = 0;
+      if (
+        this.materialId &&
+        this.supplierId &&
+        this.form1.purchaseOrderId &&
+        this.unloadPointId &&
+        sjTime(this.form1.orderEntryTime) &&
+        this.lineId
+      ) {
+        state = 1;
+      } else {
+        if (!this.materialId) {
+          this.$message({
+            message: "请选择物资!",
+            type: "warning",
+          });
+          return;
+        } 
+         else if (!this.supplierId) {
+          this.$message({
+            message: "请选择发货单位!",
+            type: "warning",
+          });
+          return;
+        } else if (!this.purchaseOrderId) {
+          this.$message({
+            message: "没有匹配的采购订单号!",
+            type: "warning",
+          });
+          return;
+        } else if (!this.unloadPointId) {
+          this.$message({
+            message: "请选择卸货地点!",
+            type: "warning",
+          });
+          return;
+        } else if (!this.lineId) {
+          this.$message({
+            message: "请选择运输路线!",
+            type: "warning",
+          });
+          return;
+        } else if (!sjTime(this.form1.orderEntryTime)) {
+          this.$message({
+            message: "请选择预估进厂时间!",
+            type: "warning",
+          });
+          return;
+        }
+      }
+      if (this.selectionList.length == 0) {
+        this.$message({
+          message: "请选择车辆!",
+          type: "warning",
+        });
+        return;
+      } else {
+        this.selectionList.forEach((e) => {
+          if (e.orderMaterialWeight) {
+            if (isNumber(e.orderMaterialWeight)) {
+              if (isIntegerNumber(e.orderMaterialWeight)) {
+                state = 1;
+              } else {
+                this.$message({
+                  message: "重量只能是整数!",
+                  type: "warning",
+                });
+                return;
+              }
+            } else {
+              this.$message({
+                message: "重量只能是数字!",
+                type: "warning",
+              });
+              return;
+            }
+          }
+        });
+      }
+      let map = {
+        materialId: this.materialId,
+        supplierId: this.supplierId,
+        purchaseOrderId: this.purchaseOrderId,
+        unloadPointId: this.unloadPointId,
+        orderEntryTime: sjTime(this.form1.orderEntryTime),
+        driverCapacityIdList: this.selectionList,
+        orderType: 8,
+        lineId: this.lineId,
+        isMoreTrips: this.isMoreTrips,
+      };
+      this.axios.post("/api/v1/oms/addPurOrder", map).then((res) => {
+        if (res.data.code == "200") {
+          this.$message({
+            message: "添加成功!",
+            type: "success",
+          });
+          this.$router.push("/mineralTransportAppoint");
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.contractDetails {
+  width: 100%;
+}
+
+.el-drawer__container ::-webkit-scrollbar {
+  display: none;
+}
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.remark {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 100px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.lineId {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+  .span {
+    display: inline-block;
+    width: 70px;
+    height: 1px;
+  }
+}
+.swtichTop{
+  display: flex;
+  height: 40px;
+  align-content: center;
+  justify-content: center;
+  padding-right:20px ;
+  .titile{
+    color: red;
+    font-size: 14px;
+  }
+  .switch{
+    margin-right: -30px
+  }
+}
+.supplieUnit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 20px;
+  .el-input {
+    width: 250px;
+  }
+}
+.material {
+  display: flex;
+  justify-content: center;
+  margin-top: 20px;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.orderType {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 110px;
+    text-align: right;
+  }
+  .select {
+    width: 250px;
+  }
+  .span {
+    display: inline-block;
+    width: 30px;
+    height: 10px;
+  }
+}
+.contractTitle {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-input {
+      width: 250px;
+    }
+  }
+}
+.forwardingUnit {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+.truckList1 {
+  width: 100%;
+  .truckList {
+    width: 96%;
+    .text {
+      display: inline-block;
+      width: 120px;
+      text-align: right;
+    }
+    .truckBtn {
+      width: 250px;
+    }
+  }
+}
+.drawer_top{
+  margin-top: -50px;
+  width: 100%;height: 60px;
+  display: flex;
+  align-items: center;
+}
+.drawer_table1{
+  width: 100%;height: 500px;
+}
+.button_box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100px;
+}
+</style>

src/views/TMS/components/importedMineral/transportAppoint.vue

@@ -0,0 +1,262 @@
+<template>
+  <!-- 辅料运输预约 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input
+        class="input"
+        placeholder="请输入内容"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="insertClick">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="issue"
+        v-if="activeName == 'first'"
+      >
+        <i class="el-icon-plus"></i>下发
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName" tab-click="handleClick">
+      <!-- 未下发 -->
+      <el-tab-pane label="未下发" name="first">
+        <dilTable
+          v-bind.sync="option1"
+          ref="table"
+          @selection-change="selectionChange"
+        >
+          <el-table-column
+            fixed="right"
+            align="center"
+            label="操作"
+            width="120"
+          >
+            <template slot-scope="scope">
+              <el-button
+                @click="sendClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
+                下发
+              </el-button>
+              <el-button
+                @click="updateClick(scope.row.orderId)"
+                type="text"
+                size="small"
+              >
+                修改
+              </el-button>
+              <el-button
+                @click="
+                  deleteClick(scope.row.orderId, scope.row.capacityNumber)
+                "
+                type="text"
+                size="small"
+              >
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </dilTable>
+      </el-tab-pane>
+      <!-- 已下发 -->
+      <el-tab-pane label="已下发" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "first",
+      option1: {
+        // 表格请求数据的地址
+        requestUrl: "",
+        selectionType: "select",
+        mapList: [],
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl: "",
+      },
+    };
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        getCookie("userId");
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        getCookie("userId");
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        null;
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        null;
+    }
+  },
+  methods: {
+    handleClick(){
+      this.getRequestUrl()
+    },
+    getRequestUrl(){
+        //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        getCookie("userId") + "&i=" + new Date();
+    } else {
+      this.option1.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+        null + "&i=" + new Date();
+      this.option2.requestUrl =
+        "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+        null + "&i=" + new Date();
+    }
+    },
+    onclick() {
+      if (this.activeName == "first") {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=141&orderStatus=3&orderType=8&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      } else {
+        //判断是否是承运商
+        if (getCookie("orgCode") == "chengyunshang") {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input;
+        } else {
+          this.option1.requestUrl =
+            "/api/v1/oms/getAllTruckOrder?apiId=243&orderStatus=111&orderType=8&carrierSSOId=" +
+            null +
+            "&con=" +
+            this.input;
+        }
+      }
+    },
+    selectionChange(selection) {
+      this.mapList = selection;
+    },
+    issue() {
+      let mapvalue = {
+        mapList: this.mapList,
+      };
+      this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+        this.$message({
+          type: "success",
+          message: "下发成功!",
+        });
+        this.getRequestUrl()
+      });
+    },
+    // 下发
+    sendClick(orderId) {
+      let mapvalue = {
+        mapList: [{ orderId: orderId }],
+      };
+      this.$confirm("是否下发", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.axios.post("/api/v1/oms/dispatchOrder", mapvalue).then(() => {
+            this.$message({
+              type: "success",
+              message: "下发成功!",
+            });
+            this.getRequestUrl()
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消下发!",
+          });
+        });
+    },
+    // 删除
+    deleteClick(orderId, capacityNumber) {
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "删除成功!",
+          });
+          this.axios
+            .post("/api/v1/oms/deleteOrder", {
+              orderId: orderId,
+              capacityNumber: capacityNumber,
+            })
+            .then(() => {
+              this.getRequestUrl()
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消删除!",
+          });
+        });
+    },
+    //新增
+    insertClick() {
+      this.$router.push("/addMineralTransportAppoint");
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 20px;
+    }
+    .btn {
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/importedMineral/transportOrder.vue

@@ -0,0 +1,158 @@
+<template>
+  <!-- 辅料运输派单 -->
+  <div class="homeworkPath">
+    <div class="top">
+      <el-input
+        placeholder="请输入内容"
+        class="input"
+        v-model="input"
+        clearable
+      >
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="clickClose" v-if="activeName == 'option'">
+        <i class="el-icon-close"></i>关闭
+      </el-button>
+    </div>
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="未接收" name="option">
+        <dilTable v-bind.sync="option" @selection-change="selectionChange"> </dilTable>
+      </el-tab-pane>
+      <el-tab-pane label="已接收" name="first">
+        <dilTable v-bind.sync="option1"> </dilTable>
+      </el-tab-pane>
+      <el-tab-pane label="已拒绝" name="second">
+        <dilTable v-bind.sync="option2"> </dilTable>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name: "inplantTMS",
+  data() {
+    return {
+      input: "",
+      Time: "",
+      activeName: "option",
+      option: {
+        // 表格请求数据的地址
+        requestUrl:"",
+        selectionType: "select",
+      },
+      option1: {
+        // 表格请求数据的地址
+        requestUrl:"",
+      },
+      option2: {
+        // 表格请求数据的地址
+        requestUrl:"",
+      },
+      list:[],
+    };
+  },
+  watch:{
+    activeName(val){
+      if (getCookie("orgCode") == "chengyunshang") {
+        if(val == "option"){
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "first"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "second"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+        }
+      }else{
+        if(val == "option"){
+          this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "first"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&i="+new Date()+"&carrierSSOId=" + null;
+        }else if(val == "second"){
+          this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&i="+new Date()+"&carrierSSOId=" + null;
+        }
+      }
+      
+    }
+  },
+  created() {
+    //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + getCookie("userId");
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + getCookie("userId");
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + getCookie("userId");
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + null;
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + null;
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + null;
+    }
+  },
+  methods: {
+    getRequestUrl(){
+      //判断是否是承运商
+    if (getCookie("orgCode") == "chengyunshang") {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + getCookie("userId") +"&i="+new Date();
+    } else {
+      this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&carrierSSOId=" + null +"&i="+new Date();
+      this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=5&carrierSSOId=" + null +"&i="+new Date();
+      this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&carrierSSOId=" + null +"&i="+new Date();
+    }
+    },
+    onclick() {
+    if (getCookie("orgCode") == "chengyunshang") {
+       if(this.activeName == "option"){
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      }else if (this.activeName == "first") {
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + getCookie("userId");
+      }
+    }else{
+      if(this.activeName == "option"){
+        this.option.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=148&orderType=8&orderStatus=4&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      }else if (this.activeName == "first") {
+        this.option1.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=5&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      } else if (this.activeName == "second") {
+        this.option2.requestUrl = "/api/v1/oms/getTransportDispatch?apiId=241&orderType=8&orderStatus=6&con=" + this.input +"&i="+new Date() + "&carrierSSOId=" + null;
+      }
+    }
+      
+    },
+    clickClose(){
+      console.log(this.list)
+      if(this.list.length == 0){
+        this.$message.warning('请选择订单之后在关闭')
+      }else{
+        this.axios.post('/api/v1/oms/deleteOrders',{list:this.list}).then((res)=>{
+          if(res.data.code == "200"){
+            this.$message.success('关闭成功')
+            this.getRequestUrl()
+          }
+        })
+      }
+
+    },
+    selectionChange(selection){
+      this.list = [],
+      selection.forEach(e => {
+        this.list.push(e.orderId)
+      });
+    }
+  },
+};
+</script>
+<style lang='scss'>
+.homeworkPath {
+  .top {
+    padding: 40px;
+    .input {
+      width: 250px;
+      margin-right: 10px;
+    }
+  }
+}
+</style>

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -14,6 +14,7 @@
         class="select"
         v-model="orderType"
         placeholder="请选择"
+        @change="onchange()"
       >
         <el-option
           v-for="item in orderTypeList"
@@ -358,6 +359,14 @@ export default {
     onClick(index) {
       this.selectionList.splice(index, 1);
     },
+    onchange(){
+      if(this.orderType == 17){
+        this.purchaseOrgId = 1
+      }else{
+        this.purchaseOrgId = 2
+      }
+      this.getPurchaseOrderNo()
+    },
     onBlur() {
       this.getPurchaseOrderNo();
     },
@@ -365,12 +374,13 @@ export default {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
+        purchaseOrgId:this.purchaseOrgId
       };
       if (this.remark) {
         map.remark = this.remark;
       }
       console.log(this.map);
-      if (this.materialId && this.supplierId) {
+      if (this.materialId && this.supplierId && this.purchaseOrgId) {
         this.axios.post("/api/v1/oms/selectNewOrderId", map).then((res) => {
           console.log(res);
           if (res.data.code == "200") {
@@ -380,16 +390,13 @@ export default {
                 type: "warning",
               });
               this.form1 = [];
+              this.purchaseOrderNo = null;
+              this.purchaseOrderId = null
             } else {
               console.log();
               this.remark = res.data.data.remark;
               this.purchaseOrderId = res.data.data.purchaseOrderId;
               this.purchaseOrderNo=res.data.data.purchaseOrderNo;
-              // if (res.data.data.receiveUnitId == 1) {
-              //   this.orderType = 17;
-              // } else {
-              //   this.orderType = 18;
-              // }
             }
           } else {
             this.$message.error("请求失败");
@@ -511,7 +518,7 @@ export default {
     },
     currentRadioChange6(selection) {
       console.log(selection)
-      if (selection.shipperId == 1) {
+      if (selection.orgId == 1) {
         this.orderType = 17;
       } else {
         this.orderType = 18;

src/views/TMS/router/index.js

@@ -198,6 +198,15 @@ import receivingOld from '../components/purchaseChemicalMaterials/purchaseChemic
 import skinCountingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/skinCountingOld.vue'
 import woolCountingOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOLD/woolCountingOld.vue'
 
+import mineralTransportAppoint from '../components/importedMineral/transportAppoint.vue'
+import addMineralTransportAppoint from '../components/importedMineral/addTransportAppoint.vue'
+import mineralTransportOrder from '../components/importedMineral/transportOrder.vue'
+import mineralEnfactory from '../components/importedMineral/transportExcute/enfactory.vue'
+import mineralOutfactory from '../components/importedMineral/transportExcute/outfactory.vue'
+import mineralGrossResult from '../components/importedMineral/transportExcute/grossResult.vue'
+import mineralTareResult from '../components/importedMineral/transportExcute/tareResult.vue'
+import mineralUnload from '../components/importedMineral/transportExcute/unload.vue'
+import mineralQuality from '../components/importedMineral/transportExcute/qualityResult.vue'
 
 Vue.use(Router)
 
@@ -388,6 +397,16 @@ const constantRouterMap = [
       {path: 'receivingOld', name: 'receivingOld', meta: {code: 'xtpzgl-jggl'}, component: receivingOld},
       {path: 'skinCountingOld', name: 'skinCountingOld', meta: {code: 'xtpzgl-jggl'}, component: skinCountingOld},
       {path: 'woolCountingOld', name: 'woolCountingOld', meta: {code: 'xtpzgl-jggl'}, component: woolCountingOld},
+    
+      {path: 'mineralTransportAppoint', name: 'mineralTransportAppoint', meta: {code: 'xtpzgl-jggl'}, component: mineralTransportAppoint},
+      {path: 'addMineralTransportAppoint', name: 'addMineralTransportAppoint', meta: {code: 'xtpzgl-jggl'}, component: addMineralTransportAppoint},
+      {path: 'mineralTransportOrder', name: 'mineralTransportOrder', meta: {code: 'xtpzgl-jggl'}, component: mineralTransportOrder},
+      {path: 'mineralUnload', name: 'mineralUnload', meta: {code: 'xtpzgl-jggl'}, component: mineralUnload},
+      {path: 'mineralTareResult', name: 'mineralTareResult', meta: {code: 'xtpzgl-jggl'}, component: mineralTareResult},
+      {path: 'mineralGrossResult', name: 'mineralGrossResult', meta: {code: 'xtpzgl-jggl'}, component: mineralGrossResult},
+      {path: 'mineralOutfactory', name: 'mineralOutfactory', meta: {code: 'xtpzgl-jggl'}, component: mineralOutfactory},
+      {path: 'mineralEnfactory', name: 'mineralEnfactory', meta: {code: 'xtpzgl-jggl'}, component: mineralEnfactory},      
+      {path: 'mineralQuality', name: 'mineralQuality', meta: {code: 'xtpzgl-jggl'}, component: mineralQuality},
     ]
   }
 ];