提交

build/utils.js

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

config/index.js

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

src/views/RMS/components/addCapacity.vue

@@ -145,18 +145,18 @@ export default {
       var result = false;
       if (vehicleNumber.length == 7) {
         var express =
-          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
+          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使场领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
         result = express.test(vehicleNumber);
       }
       return result;
     },
     makeSure() {
       this.addLoading = true;
-      if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
-        this.$message.error("车牌号格式不正确");
-        this.addLoading = false;
-        return;
-      }
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
       if (this.carrierIds == null) {
         this.$message.error("请选择承运商");
         this.addLoading = false;
@@ -173,6 +173,7 @@ export default {
         carrierId: this.carrierIds,
         state: this.state,
       };
+      console.log(RmsCapacity)
       if (
         RmsCapacity.capacityNumber == null ||
         RmsCapacity.capacityCorlor == null ||

src/views/RMS/components/addCarrier.vue

@@ -35,7 +35,7 @@
     <el-upload
       class="upload-demo"
       ref="upload1"
-      action="http://172.16.33.166:8060/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -58,7 +58,7 @@
     <el-upload
       class="upload-demo"
       ref="upload2"
-      action="http://172.16.33.166:8060/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -81,7 +81,7 @@
     <el-upload
       class="upload-demo"
       ref="upload3"
-      action="http://172.16.33.166:8060/api/v1/rms/rmscarrier/uploadCarrier1"
+      action="https://wl.dasteel.cn:32322/api/v1/rms/uploadCarrier1"
       :before-upload="beforeUpload"
       :multiple="false"
       list-type="picture"
@@ -358,6 +358,9 @@ export default {
       justify-content: center;
       align-items: center;
       margin-right: 10px;
+      width: 40px;
+      position: relative;
+      left: 40px;
     }
     .input {
       width: 250px;
@@ -410,7 +413,7 @@ export default {
   }
   .site{
     position: relative;
-    left: 32px;
+    left: -50px;
   }
   span.text {
     position: relative;

src/views/RMS/components/addOtherCapacity.vue

@@ -140,20 +140,15 @@ export default {
           }
         });
     },
-    isVehicleNumber(vehicleNumber) {
-      // console.log(vehicleNumber);
-      var result = false;
-      if (vehicleNumber.length == 7) {
-        var express =
-          /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1}$/;
-        result = express.test(vehicleNumber);
-      }
-      return result;
-    },
     makeSure() {
       this.addLoading = true;
-      if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
-        this.$message.error("车牌号格式不正确");
+      // if (!this.isVehicleNumber(this.form1.capacityNumber.toUpperCase())) {
+      //   this.$message.error("车牌号格式不正确");
+      //   this.addLoading = false;
+      //   return;
+      // }
+      if(this.form1.capacityNumber.length<=2){
+        this.$message.error("车牌号必须大于三位");
         this.addLoading = false;
         return;
       }

src/views/RMS/components/capacity.vue

@@ -13,8 +13,8 @@
        <el-button type="primary" class="btn" @click="toInsert">
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button type="primary" class="btn" @click="toInsertOther">
-        <i class="el-icon-plus"></i>新增特殊运力
+      <el-button type="primary" class="btn" @click="toInsert1">
+        <i class="el-icon-plus"></i>新增特殊车牌
       </el-button>
       <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
 
@@ -117,6 +117,9 @@ export default {
      toInsert() {
       this.$router.push("/addCapacity");
     },
+    toInsert1() {
+      this.$router.push("/addOtherCapacity");
+    },
     updateCapacity(capacityId){
       this.$router.push("/editCapacity/" + capacityId)
     },

src/views/RMS/router/index.js

@@ -24,6 +24,7 @@ import addTruckCalculate from '../components/addTruckCalculate.vue'
 import capacity from '../components/capacity.vue'
 import carDriver from '../components/carDriver.vue'
 import carrier from '../components/carrier.vue'
+import addOtherCapacity from '../components/addOtherCapacity'
 
 import editCapacity from '../components/editCapacity.vue'
 import editCarDriver from '../components/editCarDriver.vue'
@@ -81,6 +82,7 @@ const constantRouterMap = [
 		{path: 'addRmsShipper', name: 'addRmsShipper', meta: {code: 'xtpzgl-yhgl'}, component: addRmsShipper},
 		{path: 'addSupplier', name: 'addSupplier', meta: {code: 'xtpzgl-yhgl'}, component: addSupplier},
 		{path: 'addTruckCalculate', name: 'addTruckCalculate', meta: {code: 'xtpzgl-yhgl'}, component: addTruckCalculate},
+		{path: 'addOtherCapacity', name: 'addOtherCapacity', meta: {code: 'xtpzgl-yhgl'}, component: addOtherCapacity},
 		{path: 'capacity', name: 'capacity', meta: {code: 'xtpzgl-yhgl'}, component: capacity},
 		{path: 'carDriver', name: 'carDriver', meta: {code: 'xtpzgl-yhgl'}, component: carDriver},
 		{path: 'carrier', name: 'carrier', meta: {code: 'xtpzgl-yhgl'}, component: carrier},

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/LeaveFactory.vue

@@ -61,6 +61,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/Load.vue

@@ -53,6 +53,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/enFactory.vue

@@ -61,6 +61,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/grossWeight.vue

@@ -54,6 +54,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/tareWeight.vue

@@ -54,6 +54,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

src/views/SporadicManage/components/oldAreaSporadic/inwardSporadicFactory/unload.vue

@@ -53,6 +53,10 @@ export default {
           value: 14,
           label: "中转",
         },
+        {
+          value: 19,
+          label: "退货",
+        },
         ]
     };
   },

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

@@ -98,6 +98,23 @@
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
+      >
+        <el-form-item label="趟次">
+         <el-input
+          class="inline-input"
+          v-model="materialTimes"
+          placeholder="趟次-非必填"
+          :trigger-on-focus="false"
+          @input="onInputTimes()"
+          @blur="onblur()"
+        >
+        </el-input>
+        </el-form-item>
+        </el-form>
+        <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
       >
         <el-form-item label="选择物资">      
         </el-form-item>
@@ -282,6 +299,10 @@ export default {
         {
           value:14,
           label:'中转'
+        },
+        {
+          value:19,
+          label:'退货'
         }
       ],
       orderType:null,
@@ -400,6 +421,16 @@ export default {
         this.$message.warning('趟次请输入数字')
       }
     },
+    onblur(){
+      this.isMoreTrips = false
+      if(this.materaialTimes <= 0){
+        this.$message.warning('趟次必须大于0')
+        this.materialTimes = null
+      }
+      if(this.materialTimes > 1 ){
+        this.isMoreTrips = true
+      }
+    },
     onInputPriority(scope){
       if(!isNumber(scope)){
         this.$message.warning('装卸货次序请输入数字')
@@ -426,6 +457,9 @@ export default {
       if(this.orderType == 14){
         this.inputLine = "零星中转"
       }
+      if(this.orderType == 19){
+        this.inputLine = "退货"
+      }
     },
     drawTable(){
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" +"&test=" + new Date()
@@ -517,7 +551,8 @@ export default {
             materialSpecification:e.materialSpecification,
             materialName:e.materialName,
             materialCode:e.materialCode,
-            materialId:e.materialId
+            materialId:e.materialId,
+            materialPriority:1
           }
           this.tableData.push(addmap)
         })
@@ -562,18 +597,12 @@ export default {
     },
     // 确认
     makeSure() {
-        let amOrder = {
-          supplierId:this.supplierId,
-          lineId:this.lineId,
-          carrierId: this.carrierId,
-          orderType:this.orderType,
-          receiveId: this.consigneeId,
-          userId:getCookie("orgCode"),
-          mapList: this.tableData,
-          isMoreTrips:Number(this.isMoreTrips)
+        if(this.isMoreTrips == false){
+          this.materialTimes = 1
+        }
+        if(Number(this.materialTimes) != 0){
+          this.isMoreTrips = true
         }
-        console.log(amOrder)
-        debugger
         this.disabled = true
         if(this.supplierId==null||this.lineId==null||this.consigneeId==null||this.carrierId==null){
           this.disabled = false
@@ -609,10 +638,13 @@ export default {
           orderType:this.orderType,
           receiveId: this.consigneeId,
           userId:getCookie("orgCode"),
+          orderTime:this.materialTimes,
           mapList: this.tableData,
           isMoreTrips:Number(this.isMoreTrips)
           
         };
+        console.log(amsOrder)
+        debugger
         this.axios.post("/api/v1/ams/addSporadicOrders", amsOrder).then((res) => {
           if (res.data.code == "200") {
             this.onClickCancel()

src/views/SporadicManage/router/index.js

@@ -44,7 +44,7 @@ import oldSporadicInwardTenfactory from '../components/oldAreaSporadic/inwardSpo
 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/tareWeight.vue'
+import oldSporadicInwardload from '../components/oldAreaSporadic/inwardSporadicFactory/Load.vue'
 import oldSporadicInwardUnload from '../components/oldAreaSporadic/inwardSporadicFactory/unload.vue'
 
 //钢材退货运输预约
@@ -177,7 +177,7 @@ const constantRouterMap = [
       {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},
     ]    
   }
 ];

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

@@ -565,7 +565,7 @@ export default {
               } 
             });
         })
-        .catch(() => {this.$message({ type: "info", message: "已取消删除",});});
+        .catch(() => {this.$message({ type: "info", message: "已取消",});});
     },
     //失焦事件后确定车牌号与承运商是否有绑定关系
     checkRelationship(index){
@@ -682,11 +682,16 @@ export default {
     makeSure(){
       //获取当前派车的数量和预估吨位的总和
       var sendCount = this.selectionList.length*this.uniteOrderPlanWeight;
-      //判断是否达到95%
-      var canDo = ((this.totalWeight+sendCount)/this.number).toFixed(2);
-      if(canDo>0.95){
-        var canSend = Math.floor(((this.number*0.95)-this.totalWeight)/this.uniteOrderPlanWeight);
+      //判断是否达到总重量减80吨的重量
+      var canDo = ((this.number-80)-(this.totalWeight+sendCount));
+      if(canDo<0&&this.number>=100){
+        var canSend = Math.floor(((this.number-80)-this.totalWeight)/this.uniteOrderPlanWeight);
+        if(canSend<0){
+          canSend = 0;
+        }
         this.$message.error('当前已派发吨数接近订单总吨数,最多还可派 ('+canSend+') 辆车!')
+      }else if(this.number<100&&this.totalWeight>20){
+        this.$message.error('当前可派发车数已用完!')
       }else{
         let state = false;
         var beReady = 0;
@@ -750,7 +755,7 @@ export default {
             this.cancel();
           }else{
             //若该销售订单的净重已达到97%!
-            this.$confirm("该销售订单的净重已达到97%! 是否仍然派车", "提示", {
+            this.$confirm("当前已派发吨数接近订单总吨数! 是否仍然派车", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",

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

@@ -681,11 +681,16 @@ export default {
     makeSure(){
       //获取当前派车的数量和预估吨位的总和
       var sendCount = this.selectionList.length*this.uniteOrderPlanWeight;
-      //判断是否达到95%
-      var canDo = ((this.totalWeight+sendCount)/this.number).toFixed(2);
-      if(canDo>0.95){
-        var canSend = Math.floor(((this.number*0.95)-this.totalWeight)/this.uniteOrderPlanWeight);
+      //判断是否达到总重量减80吨的重量
+      var canDo = ((this.number-80)-(this.totalWeight+sendCount));
+      if(canDo<0&&this.number>=100){
+        var canSend = Math.floor(((this.number-80)-this.totalWeight)/this.uniteOrderPlanWeight);
+        if(canSend<0){
+          canSend = 0;
+        }
         this.$message.error('当前已派发吨数接近订单总吨数,最多还可派 ('+canSend+') 辆车!')
+      }else if(this.number<100&&this.totalWeight>20){
+        this.$message.error('当前可派发车数已用完!')
       }else{
         let state = false;
         var beReady = 0;
@@ -740,6 +745,7 @@ export default {
     },
     //发送请求
     sendRequest(beReady){
+      console.log("send");
       if(beReady==this.selectionList.length){
           this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
           saleOrderId:this.$route.params.saleOrderId,
@@ -750,7 +756,7 @@ export default {
             this.cancel();
           }else{
             //若该销售订单的净重已达到97%!
-            this.$confirm("该销售订单的净重已达到97%! 是否仍然派车", "提示", {
+            this.$confirm("当前已派发吨数接近订单总吨数! 是否仍然派车", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",
               type: "warning",
@@ -931,7 +937,7 @@ export default {
             if(res.data.data==null){
               this.receiveCarrierId = null;
               this.receiveCarrierName = null;
-              this.$message.warning('该收货单位尚未注册为承运商!')
+              this.$message.warning('该账号未注册为承运商!')
             }else{
               this.receiveCarrierId = res.data.data.carrierId;
               this.receiveCarrierName = res.data.data.carrierName;

src/views/inward/app.js

@@ -19,11 +19,11 @@ import apollo from '@/config/apolloConfig.js'
 import DilCommonUI from "@/components/DilCommonUI";
 Vue.use(DilCommonUI);
 
-// import 'xe-utils' 
-// import VXETable from 'vxe-table'
-// import 'vxe-table/lib/style.css'
-// Vue.use(VXETable)
-// Vue.prototype.$XModal = VXETable.modal
+import 'xe-utils' 
+import VXETable from 'vxe-table'
+import 'vxe-table/lib/style.css'
+Vue.use(VXETable)
+Vue.prototype.$XModal = VXETable.modal
 
 
 // 关闭生产模式下给出的提示

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

@@ -3,11 +3,12 @@
     <div class="sale">
         <div class="top">
             <!-- 框计算 -->
-            <el-input
-                placeholder="请输入内容"
-                v-model="inputText"
-                clearable>
-            </el-input>
+            <span class="text">计时时间：</span>
+            <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
+            <span class="text">至</span>
+            <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+            </el-date-picker>
             <el-button type="primary" class="btn" @click="onclick">
                 <i class="el-icon-search"></i>查询
             </el-button>
@@ -16,36 +17,47 @@
             <dilTable v-bind.sync="option" ref="table1">
                 <el-table-column fixed="right" label="操作" width="180">
                 <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getRequirementMaterial1(scope.row)">
-                    运单详情
-                  </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 class="step">
+                        <el-button
+                        @click="getStepsList(scope.row)"
+                        type="text"
+                        size="small"
+                        >运输详情</el-button>
                     </div>
-                    </el-form>
+                  <!-- <el-button @click="" type="primary" style="margin-left: 16px;">
+                    运输详情
+                  </el-button> -->
                 </template>
-                </el-table-column> 
+                </el-table-column>
             </dilTable>
         </div>
+        <!-- 运输进程详情 -->
+        <el-drawer
+            :visible.sync="drawer"
+            :direction="direction">
+            <!-- 步骤条显示 -->
+            <div style="height: 200px;content-align:center" >
+                <el-table
+                :data="stepList"
+                style="width: 100%">
+                <el-table-column
+                    prop="linkName"
+                    label="计时状态"
+                    width="180">
+                </el-table-column>
+                <el-table-column
+                    prop="pointDate"
+                    label="时间"
+                    width="180">
+                </el-table-column>
+                </el-table>
+            </div>
+        </el-drawer>
     </div>
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
     data(){
         return{
@@ -55,8 +67,14 @@ export default {
                 requestUrl: "",
             },
             tableData: [],
+            startTime: null,
+            endTime: null,
             oldRow1: "",
             oldRowCount1: 1,
+            drawer: false,
+            direction: 'rtl',
+            orderId: 0,
+            stepList:[]
         }
     },
     created(){
@@ -66,9 +84,26 @@ export default {
             console.log("cookier"+getCookie("userId"))
             this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId");
         }
-        
     },
     methods:{
+        getStepsList(row){
+            console.log(row.orderId)
+            this.orderId = row.orderId
+            this.drawer = true
+            let map = {
+                orderId : this.orderId
+            }
+            this.axios.post("/api/v1/oms/getOrderResult",map)
+                .then((res) => {
+                    console.log(res)
+                if (res.status == 200) {
+                    this.stepList = res.data
+                } else {
+                    this.$message.error("展示失败！");
+                }
+            });
+            console.log(this.stepList)
+        },
         getRequirementMaterial1(row) {
         // 记录重复点击次数
         if (this.oldRow1 === row) {
@@ -94,7 +129,31 @@ export default {
         this.getMaterial(row.orderId);
         },
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId")+"&con="+this.inputText;
+            let startTime = null;
+            let endTime = null;
+            if (this.startTime) {
+                startTime = sjTime(this.startTime);
+            }
+            if (this.endTime) {
+                endTime = sjTime(this.endTime);
+            }
+            if (startTime && endTime) {
+                if (startTime < endTime) {
+                    console.log(startTime)
+                    console.log(endTime)
+                if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode") == "zidonghuabu"||getCookie("orgCode") == "wuliuchuyunzhongxin"){
+                    this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+                }else{
+                    this.option.requestUrl = "/api/v1/tms/getAllTimeTaskResult?apiId=458&orgCode="+getCookie("userId")+"&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+                }
+                } else {
+                this.startTime = null;
+                this.endTime = null;
+                this.$message.warning("开始时间要比结束时间早");
+                }
+            } else {
+               
+            }
         },
         getMaterial(orderId){
             console.log(orderId)
@@ -115,4 +174,18 @@ export default {
             }
         }
     }
+    .el-table th.el-table__cell>.cell {
+        display: inline-block;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        position: relative;
+        vertical-align: middle;
+        padding-left: 10px;
+        padding-right: 10px;
+        width: 100%;
+        text-align: center;
+    }
+    .step {
+    text-align: center;
+    }
 </style>

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

@@ -27,7 +27,7 @@
     </el-form>
       </div>
       <div class="form-box">
-        <dil-form :formId="300" v-model="form"></dil-form>
+        <dil-form :formId="377" v-model="form"></dil-form>
       </div>
 
       <div class="DueTime">
@@ -51,6 +51,51 @@
           </div>
           </el-form>
       </div>
+     <!--选择车辆类型--> 
+     <div class="capacity">
+      <div class="capacityName">
+         <el-form
+        :inline="true"
+        class="demo-form-inline"
+        label-width="80px"
+      >
+        <el-form-item label="选择车辆类型">    
+        </el-form-item>  
+        <el-form-item>
+         <el-input
+          el-input v-model="capacityTypeName" disabled>  
+       </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="ondrawer(3)" class="truckBtn"
+          >浏览</el-button>
+        </el-form-item>
+        </el-form>
+      </div>
+      <el-drawer
+      title="选择车辆类型"
+      :visible.sync="drawer2"
+      direction="rtl"
+      size="40%"
+      :show-close="false"
+      >
+      <div style="margin-left:-300px">
+        <el-input placeholder="请输入内容" v-model="inputCapacityType" style="margin-left:20px;width: 250px" clearable > </el-input
+      ><el-button type="primary" class="btn" @click="onclickCapacity">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      </div>
+      
+     
+      <!-- <el-button @click="open">取消</el-button> -->
+    
+      <div class="tablecls">
+      
+        <dilTable ref="options3" v-bind.sync="options3" @radio-change="selectionChange1" :drawer="aaadrawer">
+        </dilTable>
+      </div>
+      </el-drawer>
+</div> 
       <div class="materialDrawer">
          <el-form
         :inline="true"
@@ -256,10 +301,12 @@ export default {
       options: [],
       value: '',
       isOpenDueTime : true,
+      inputCapacityType:null,
       DueTime:null,
       // 件数与重量的开关
       value: false,
       //物资模态框开关
+      drawer2:false,
       table: false,
       //物资表格表头
       tableTop: [
@@ -304,11 +351,14 @@ export default {
       materialId: null,
       requireUnitName:null,
       inputMaterial:null,
+      inputCapacityType:null,
       shipperId:null,
       truckPoint1: "",
       drawer: false,
       selectionList1: [],
       form: {},
+      capacityTypeId: "",
+      capacityTypeName:"",
       materialTable: {
         requestUrl: "",
         selectionType: "select",
@@ -319,6 +369,11 @@ export default {
         selectionType: "radio",
         mapList2: []
       },
+      options3:{
+        requestUrl:"",
+        selectionType:"radio",
+        mapList3: []
+      },
       form:{}
     };
   },
@@ -380,6 +435,7 @@ export default {
     selectionChange(selection) {
       this.selectionList1 = [];
       this.selectionList1 = selection;
+      console.log("selection",selection)
     },
     unloadPoint(index) {
       this.getUnloadRequestUrl()
@@ -398,6 +454,9 @@ export default {
       if(num==1){
         this.table = true
         this.materialTable.requestUrl = "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date()
+      }else if(num==3){
+        this.drawer2 = true
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460"
       }else{
         this.drawer = true;
       }  
@@ -414,6 +473,14 @@ export default {
         this.inputMaterial = null
       }
     },
+    onclickCapacity(){
+      if(this.inputCapacityType == null){
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460"
+      }else{
+        this.options3.requestUrl = "/api/v1/uc/getCapacityType?apiId=460&index="+this.inputCapacityType
+        this.inputCapacityType = null
+      }
+    },
     //删除行
     deleteRow(index, rows) {
       // console.log(index)
@@ -490,6 +557,9 @@ export default {
       }
       this.materialId = selection.materialId;
     },
+    selectionChange1(radio){
+      this.capacityTypeName  = radio.capacityTypeName
+    },
     currentRadioChange2(selection) {
       console.log(selection);
       if (this.a == 2) {
@@ -585,7 +655,7 @@ export default {
         DueTime:DueTime,
         mapList:this.tableData,
         orgCode:getCookie("orgCode"),
-        remark:this.form.Tel + this.form.capacityType
+        remark:this.form.Tel + this.capacityTypeName+this.form.typeRemarks
       };
       console.log("requirement",requiremnet);
       this.axios
@@ -639,6 +709,15 @@ export default {
       margin-right: 70px;
     }
   }
+.capacity{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 2rem;
+  margin-bottom: 1.25rem;
+  margin-right: 10px;
+}
 .materialDrawer {
   display: flex;
   justify-content: center;

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

@@ -1,10 +1,11 @@
 // 制定计划
 <template>
   <div class="inwardPlan">
+    
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
-      <el-button type="primary" class="btn">
+      <el-button type="primary" class="btn" @click="bofang">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-badge :value="addPlanCount" class="item" v-if="activeName == 'second'">
@@ -17,7 +18,13 @@
         <i class="el-icon-plus"></i>制定计划
       </el-button>
       </el-badge>
-      
+      <!-- <audio 
+       id="audioId"
+       controls="controls"
+       preload="auto"
+       loop = "isloop"
+       src="/static/music/y682.mp3">
+      </audio> -->
       <el-button
         type="primary"
         class="btn"
@@ -26,6 +33,7 @@
       >
         <i class="el-icon-download"></i>下发
       </el-button>
+      
     </div>
     <template>
       <div>
@@ -219,6 +227,7 @@ export default {
     };
   },
   created(){
+      
       this.second.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=257&planStatus=0",
       this.third.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=1",
       this.fourth.requestUrl = "/api/v1/ams/getTruckPlanList?apiId=258&planStatus=4"  
@@ -240,6 +249,16 @@ export default {
     start(){
         this.timer = setInterval(this.getAddPlan,60000)
     },
+    bofang(){
+      let obj = new Object();
+      obj = document.getElementById('audioId');
+      console.log(obj)
+      if(obj.paused){
+        obj.play()
+      }else{
+        obj.paused
+      }
+    },
     getRequirementMaterial(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {

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

@@ -46,7 +46,7 @@ export default {
     };
   }, 
   created(){
-          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=452&startTime=null&endTime=null&i=' +new Date()
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459&startTime=null&endTime=null&i=' +new Date()
   },
   methods: {
     func(res){
@@ -61,7 +61,7 @@ export default {
         this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
-        this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=452&startTime=null&endTime=null&i=' +new Date();
+        this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459&startTime=null&endTime=null&i=' +new Date();
      
     },
     onclick() {
@@ -75,7 +75,7 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=441' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+          this.option.requestUrl = '/api/v1/tms/getInwardReport?apiId=459' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
         }else{
           this.startTime = null;
           this.endTime = null;