tijiao

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index','RMS','systemConfig','TMS']
-let devModules = ['all'];
+// let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
-// let devModules = ['index','SporadicManage','inward','RMS']
+let devModules = ['index','SporadicManage','inward','RMS']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

config/index.js

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

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/enFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=12",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=394&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/grossWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12",
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=405&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/outFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/tareWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12",
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=12&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=392&orderType=15&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicEnfactory/unload.vue

@@ -20,13 +20,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=12",
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=389&orderType=15",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=12&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=389&orderType=15&con=" + this.input;
     },
    }
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/enFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllEnFactoryResult?apiId=416&orderType=16&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/grossWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=13",
+        requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=398&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiMaoResult?apiId=422&orderType=16&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/load.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
+        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=16&con=" + this.input;
     },
    }
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/outFactory.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getLeaveFactoryResult?apiId=421&orderType=16&con=" + this.input;
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/sporadicOutfactory/tareWeight.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13",
+        requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=16",
       },
     };
   },
   methods: {
     onclick() {
-      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=13&con=" + this.input;
+      this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=401&orderType=16&con=" + this.input;
     },
   },
 };

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

@@ -17,7 +17,6 @@
           placeholder="请输入发货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectSupplier"
-          @input="oninputSupplier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.supplierName }}</div>
@@ -38,7 +37,6 @@
           placeholder="请输入收货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
-          @input="oninputConsignee"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -89,7 +87,6 @@
           placeholder="请输入承运商名称"
           :trigger-on-focus="false"
           @select="handleSelectCarrier"
-          @input="oninputCarrier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.carrierName }}</div>
@@ -108,6 +105,7 @@
           v-model="materialTimes"
           placeholder="趟次"
           :trigger-on-focus="false"
+          @input="onInputTimes()"
         >
         </el-input>
         </el-form-item>
@@ -175,6 +173,7 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.materialPriority"
+                  @input="onInputPriority(scope.row.materialPriority)"
                 ></el-input>
               </template>
               <!-- 物资件数 -->
@@ -182,12 +181,14 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
                 ></el-input>
               </template>
               <!-- 物资重量 -->
                <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
                   v-model.number="scope.row.orderMaterialWeight"
+                  @input="onInputWeight(scope.row.orderMaterialWeight)"
                 ></el-input>
               </template>           
             </template>
@@ -247,18 +248,6 @@
       >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="receiveOptions"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-      </div>
-      <div v-show="a == 2">
-        <dilTable
-          v-bind.sync="secend"
-          @radio-change="currentRadioChange2"
-        ></dilTable>
-      </div>
       <div v-show="a == 5">
         <dilTable
           v-bind.sync="line"
@@ -275,6 +264,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -362,9 +352,8 @@ export default {
       input: "",
       //物资模态框
       materialOptions:{
-          requestUrl:
-            "/api/v1/uc/selectAllMaterialName?apiId=395",
-           selectionType: "select",
+          requestUrl:"",
+          selectionType: "select",
       },
       line: {
         requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
@@ -395,6 +384,28 @@ export default {
     },
   },
   methods: {
+    onInputTimes(){
+      console.log(this.materialTimes)
+      if(!isNumber(this.materialTimes)){
+        this.$message.warning('趟次请输入数字')
+      }
+    },
+    onInputPriority(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('装卸货次序请输入数字')
+      }
+    },
+    onInputWeight(scope){
+      console.log(scope)
+      if(!isNumber(scope)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    onInputNumber(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('件数请输入数字')
+      }
+    },
     drawTable(){
       console.log('jll')
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=1"
@@ -518,40 +529,20 @@ export default {
       this.selectionList1 = selection;
     },
     onclick(a) {
-      if (a == 1) {
-        this.frist.requestUrl =
-          "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input;
-      } else if (a == 2) {
-        this.secend.requestUrl =
-          "/api/v1/uc/getSupplierMesByMaterialId?apiId=247" +
-          "&index=" +
-          this.input;
-      } else if (a == 5) {
-        this.option.requestUrl =
+      if (a == 5) {
+        this.line.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + this.input;
       }
     },
     ondrawer(num) {
+      this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&test=1";
       this.drawer = true;
       this.a = num;
     },
     // 返回
     onClickCancel() {
-      this.$router.push("/importedFuel/transportReserveRan");
-    },
-    currentRadioChange1(selection) {
-      console.log(selection);
-      this.receiveName = selection.consigneeCompanyName;
-      this.receiveId = selection.consigneeId;
-    },
-    currentRadioChange2(selection) {
-      this.supplierName = selection.supplierName;
-      this.supplierId = selection.supplierId;
-    },
-    currentRadioChange4(selection) {
-      this.unloadPointId = selection.warehouseId;
-      this.unloadPointName = selection.warehouseName;
+      this.$router.push("/mornThanTransportAppoint");
     },
     currentRadioChange5(selection) {
       console.log(selection)
@@ -560,24 +551,10 @@ export default {
       }else{
           this.lineName = selection.lineName+'  '+selection.lineDesk 
           this.lineId = selection.lineId;
-      }
-      
-    },
-    currentRadioChange3(selection) {
-      this.carriermapList = [];
-      this.carriermapList = selection;
-    },
-    jgao(){
-      this.$alert('有数据未填写')
-      return
+      }    
     },
     // 确认
     makeSure() {
-        console.log(this.supplierId,"this.supplierId")
-        console.log(this.consigneeId,"this.consigneeId")
-        console.log(this.carrierId,"this.carrierId")
-        console.log(this.lineId,"this.lineId")
-        console.log(this.tableData)
         if(this.supplierId==null||this.lineId==null||this.carrierId==null||this.consigneeId==null){
           this.$alert('存在空值')
           return

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

@@ -62,18 +62,22 @@ export default {
       option1: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15",
+          "",
         // 控制显示多选列
         selectionType: "select",
       },
       option2: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15",
+          "",
       },
       selection: [],
     };
   },
+  created(){
+      this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0",
+      this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1"
+  },
   methods: {
     //获取选中的订单
     selectionChange(selection) {
@@ -82,11 +86,11 @@ export default {
     onclick() {
       if (this.activeName == "first") {
         this.option1.requestUrl =
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&con=" +
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0&con=" +
           this.input;
       } else {
         this.option2.requestUrl =
-          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&con=" +
+          "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1&con=" +
           this.input;
       }
     },
@@ -100,9 +104,8 @@ export default {
         .post("/api/v1/ams/issueSporadicOrders", this.maplist)
         .then((res) => {
           if (res.data.code == "200") {
-            this.option1.requestUrl =
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&test=1"
-            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&test=1"
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0&test=1"
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1"
             this.$message({
               type: "success",
               message: "下发成功!",
@@ -120,10 +123,8 @@ export default {
         )
         .then((res) => {
           if (res.data.code == "200") {
-            this.option1.requestUrl =
-              "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&test=1";
-            this.option2.requestUrl =
-            "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&test=1"
+            this.option1.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=0&orderType=15&dispatchStatus=0&test=1"
+            this.option2.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&sporadicStatus=1"
             this.$message({
               type: "success",
               message: "删除成功!",

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/addTransportOrder.vue

@@ -36,26 +36,6 @@
           align="center"
           show-overflow-tooltip
         >
-          <template slot="scope" v-if="item.label !== '重量'">
-            <span>{{ item.label }}</span>
-          </template>
-          <!-- 插入输入框 -->
-          <template slot-scope="scope">
-            <template v-if="item.slot">
-              <!-- 物资重量 -->
-              <template v-if="item.prop == 'orderPlanWeight'">
-                <el-input
-                  class="textinput"
-                  @input="onInput"
-                  placeholder="请输入内容(必填)"
-                  v-model.number="scope.row.orderPlanWeight"
-                ></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">
@@ -120,7 +100,6 @@
     </div>
   </div>
 </template>
-
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
@@ -129,11 +108,12 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      //零星订单ID
+      sporadicOrderId:null,
+      //运输订单ID
+      orderId:null,
       //线路名称
       lineName:null,
-      lineId:null,
-      //线路表格单选缓存数据的
-      cacheLine:[],
       //已经选择车辆物资信息
       selectionList:[],
       //销售订单物资信息
@@ -147,49 +127,19 @@ export default {
       //当前选中的物资id
       materialId: null,
       //当前选中的物资名称
-      materialName: null,
-      //选中的线路名称
-      lineName: null,
-      //选中的线路id
-      lineId: null,
-      //是否打开选择线路的模态框
-      drawer:false,
+      materialName: null,   
       //是否打开选择车辆的模态框
       truckDrawer:false,
-      //是否打开收货地址的模态框
-      addressDrawer:false,
-      //线路的表格
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
-        selectionType: "radio",
-      },
       //车辆的表格
       truck: {
         requestUrl: "",
         selectionType: "select",
       },
-      //收货地址的表格
-      Address: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio",
-      },
-      addressText:null,
-      //线路表格的框计算输入的值
-      lineText:null,
       tableTop: [
         {
           prop: "capacityNumber",
           label: "车牌号",
-        },
-        {
-          prop: "materialName",
-          label: "物资名称",
-        },
-        {
-          prop: "orderPlanWeight",
-          label: "重量",
-          slot: true,
-        },
+        }
       ],
       truckText:null,
       //当前多选选中的车辆
@@ -205,7 +155,7 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=248&carrierSsoId=" + null;
     }
-    this.option.requestUrl = "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId;
+    this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=384&issueStatus=1&orderType=15&dispatchStatus=0" ;
   },
   methods: {
     onInput(val){
@@ -214,12 +164,10 @@ export default {
       }
     },
     //点击确定按钮的事件
-    makeSure(){
-      let state = false;
-      console.log(this.selectionList)
-      if(state){
-        this.axios.post('/api/v1/ams/dispatchTruckOrderBySale',{
-          saleOrderId:this.$route.params.saleOrderId,
+    makeSure(){   
+        this.axios.post('/api/v1/ams/addSporadicOrderTimes',{
+          orderId:this.orderId,
+          sporadicOrderId:this.sporadicOrderId,
           mapList:this.selectionList,
         }).then((res)=>{
           if(res.data.code == '200'){
@@ -227,63 +175,21 @@ export default {
             this.cancel();
           }
         })
-      }else{
-        this.$message.warning('重量请输入数字')
-      }
     },
     //点击取消按钮的事件
     cancel(){
-      this.$router.push('/saleOrder')
+      this.$router.push('/mornThanTransportOrder')
     },
     //点击删除按钮删除当前点击的对象
     deleteRow(index){
       this.selectionList.splice(index,1)
     },
-    //复制的方法
-    copyRow(index,row){
-      let arr = [];
-      for(var i = 0 ;i<this.selectionList.length; i++){
-        if(i == index){
-          arr.push(this.selectionList[i]);
-          arr.push({
-            capacityId:row.capacityId,
-            capacityNumber:row.capacityNumber,
-            carrierName:row.carrierName,
-            lineId:row.lineId,
-            lineName:row.lineName,
-            materialId:row.materialId,
-            materialName:row.materialName,
-            orderPlanWeight:row.orderPlanWeight,
-            saleDateOfReceipt:row.saleDateOfReceipt,
-            saleMaterialId:row.saleMaterialId,
-            saleOrderConsignee:row.saleOrderConsignee,
-            saleOrderConsigneeTel:row.saleOrderConsigneeTel,
-            saleShipperAddressName:row.saleShipperAddressName,
-            saleShippingAddressId:row.saleShippingAddressId,
-          }
-          )
-        }else{
-          arr.push(this.selectionList[i]);
-        }
-      }
-      this.selectionList = [];
-      this.selectionList = arr;
-    },
     //车辆模态框的确定事件
     AddTruckClick(){
-      console.log(this.selectTruck)
       this.selectTruck.forEach(e => {
-        // console.log(e)
         this.selectionList.push({
-          //销售订单与物资表主键
-          saleMaterialId:this.saleMaterialId,
           capacityId:e.capacityId,
           capacityNumber:e.capacityNumber,
-          carrierName:e.carrierName,
-          materialName:this.materialName,
-          materialId:this.materialId,
-          lineName:this.lineName,
-          lineId:this.lineId,
         })
       });
       this.truckDrawer = false;
@@ -306,24 +212,12 @@ export default {
     },
     //主界面表格单选
     currentRadioChange(row) {
-      this.materialId = row.materialId;
-      this.materialName = row.materialName;
-      this.saleMaterialId = row.saleMaterialId;
-    },
-    //线路表格的单选事件
-    currentRadioChange5(row){
-      this.cacheLine = row;
+      console.log(row)
+      this.sporadicOrderId = row.sporadicOrderId
+      this.orderId = row.orderId
     },
-    onClick(num) {
-      if (num == 1) {
-        this.drawer = true;
-      }else if(num == 2){
-        if(!this.materialId){
-          this.$message.warning('请选择物资后，在点击')
-        }else{
-          this.truckDrawer = true;
-        }
-      }
+    onClick() {
+        this.truckDrawer = true
     },
   },
 };

src/views/SporadicManage/components/moreThanMaterialTruck/transportOrder/transportOrder.vue

@@ -6,64 +6,12 @@
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <el-button type="primary" @click="Insert" v-if="activeName == 'option'">
+      <el-button type="primary" @click="Insert" v-if="activeName == 'first'">
         <i class="el-icon-plus"></i>新增
       </el-button>
-      <el-button type="primary" @click="Issue" v-if="activeName == 'option'">
-        <i class="el-icon-download"></i>下发
-      </el-button>
     </div>
     <div class="transportOrder_bottom">
       <el-tabs v-model="activeName">
-        <!-- 未下发 -->
-        <el-tab-pane label="未下发" name="option">
-          <dilTable
-            v-bind.sync="option"
-            ref="table"
-            @selection-change="selectionChange"
-          >
-            <el-table-column fixed="right" label="操作" width="150">
-              <template slot-scope="scope">
-                <el-button @click="detailclick(scope.row)" type="text">
-                  物资详情
-                </el-button>
-                <el-button
-                  type="text"
-                  @click="addTruck(scope.row, 1)"
-                  v-if="!scope.row.capacityNumber"
-                >
-                  添加运力
-                </el-button>
-                <el-button type="text" @click="addTruck(scope.row, 2)" v-else>
-                  修改
-                </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">
-                      <el-table-column
-                        v-for="(item, i) in tableHead"
-                        :key="i"
-                        :prop="item.prop"
-                        :label="item.label"
-                        :width="item.width"
-                      ></el-table-column>
-                    </el-table>
-                  </div>
-                </el-form>
-              </template>
-            </el-table-column>
-          </dilTable>
-        </el-tab-pane>
         <!-- 已下发 -->
         <el-tab-pane label="已下发" name="first">
           <dilTable v-bind.sync="first"></dilTable>
@@ -73,65 +21,7 @@
           <dilTable v-bind.sync="Received"></dilTable>
         </el-tab-pane>
       </el-tabs>
-    </div>
-
-    <!-- <el-dialog
-      title="请选择车辆"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      width="30%"
-      show-close
-      modal
-      lock-scroll
-    >
-     <el-drawer
-      title="请选择车辆信息"
-      :visible.sync="drawer"
-      :direction="direction"
-      :close-on-press-escape="false"
-      :destroy-on-close="true"
-      :wrapperClosable="false"
-      modal
-      show-close
-    >
-      <div class="drawer_top">
-        <el-input placeholder="请输入内容" v-model="inputText" clearable>
-        </el-input>
-        <el-button type="primary" class="btn" @click="inputClick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </div>
-      <div class="drawer_bottom">
-        <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
-    </el-dialog> -->
-    <el-drawer
-      title="请选择车辆信息"
-      :visible.sync="drawer"
-      :direction="direction"
-      :destroy-on-close="true"
-      :before-close="handleClose"
-    >
-      <div class="drawer_top">
-        <el-input placeholder="请输入内容" v-model="inputText" clearable>
-        </el-input>
-        <el-button type="primary" class="btn" @click="inputClick">
-          <i class="el-icon-search"></i>查询
-        </el-button>
-      </div>
-      <div class="drawer_bottom">
-        <dilTable
-          v-bind.sync="truck"
-          @radio-change="currentRadioChange"
-        ></dilTable>
-      </div>
-    </el-drawer>
+    </div> 
   </div>
 </template>
 
@@ -148,17 +38,10 @@ export default {
       //输入框的值
       input: "",
       //选项卡的当前选中的值
-      activeName: "option",
-      //未下发的表格
-      option: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + '',
-        selectionType: "select",
-      },
+      activeName: "first",
       //已下发的表格
       first: {
-        requestUrl:
-          "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" +'',
+        requestUrl:"",
       },
       //车辆信息的表格
       truck: {
@@ -167,7 +50,7 @@ export default {
         selectionType: "radio",
       },
       Received:{
-        requestUrl: "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" +'',
+        requestUrl: "",
       },
       //物资信息的数据
       tableData: [],
@@ -207,17 +90,18 @@ export default {
   },
   created(){
       this.carrierUserId = getCookie('userId')
-      console.log(this.carrierUserId)
-      this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId ,
-      this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId ,
-      this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId ,
-      this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId 
+      console.log("-----")
+      console.log(getCookie('orgCode'))
+      console.log("-----")
+      if(getCookie('orgCode') == "dagangadmin"){
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
+      }else{
+        this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + this.carrierUserId ,
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + this.carrierUserId 
+      }     
   },
   methods: {
-    handleClose(done){
-        this.determine();
-        done();
-    },
     onclick(){
       if(this.input != ''){
         this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&con="+this.input +"&carrierId=" + getCookie('userId');
@@ -225,97 +109,6 @@ export default {
         this.second.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.userCarrierId
       }     
     },
-    //下发
-    Issue() {
-      if (this.selectionList.length == 0) {
-        this.$message({
-          message: "请选择订单！",
-          type: "warning",
-        });
-      } else {
-        this.selectionList.forEach((e) => {
-          if (!e.capacityNumber) {
-            this.$message({
-              message: "订单号为: " + e.orderNumber + "没有车牌号！",
-              type: "warning",
-            });
-          } else {
-            this.axios.post("/api/v1/oms/dispatchOrder",{mapList:this.selectionList}).then((res) => {
-              if (res.data.code == "200") {
-                this.$message({
-                  message: "下发成功",
-                  type: "success",
-                });
-                this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
-                this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
-                this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
-                this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
-              }
-            });
-          }
-        });
-      }
-    },
-    //对话框点击确定，执行增加车牌号
-    determine() {
-      this.axios
-        .post("/api/v1/oms/updateOmstruckOrder", {
-          orderId: this.selectOrderId,
-          capacityId: this.capacityId,
-        })
-        .then((res) => {
-          if (res.data.code == "200") {
-            if (this.index == 1) {
-              this.$message({
-                message: "添加成功！",
-                type: "success",
-              });
-            } else if (this.index == 2) {
-              this.$message({
-                message: "修改成功！",
-                type: "success",
-              });
-            }
-            this.dialogVisible = false;
-            this.option.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=3&carrierId=" + this.carrierUserId +"&test=1",
-            this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + this.carrierUserId +"&test=1",
-            this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + this.carrierUserId +"&test=1" ,
-            this.truck.requestUrl = "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + this.carrierUserId +"&test=1"
-          }
-        });
-    },
-    //多选的选中的数据
-    selectionChange(selection) {
-      this.selectionList = [];
-      selection.forEach((element) => {
-        this.selectionList.push({
-          orderId: element.orderId,
-          capacityNumber: element.capacityNumber,
-          orderNumber: element.orderNumber,
-        });
-      });
-    },
-    //单选按钮选中的值
-    currentRadioChange(row) {
-      this.capacityId = row.carrierId;
-      this.capacityNumber = row.capacityNumber;
-    },
-    //打开模态窗口
-    // onDrawer() {
-    //   this.drawer = true;
-    // },
-    //弹出消息窗口
-    addTruck(row, index) {
-      this.index = index;
-      if (index == 1) {
-        this.selectOrderId = row.orderId;
-        this.drawer = true;
-      } else if (index == 2) {
-        this.selectOrderId = row.orderId;
-        this.capacityNumber = row.capacityNumber;
-        this.drawer = true;
-      }
-    },
     // 查看物资详情
     detailclick(row) {
       // 记录重复点击次数
@@ -341,16 +134,6 @@ export default {
       this.oldRow = row;
       this.materialDetails(row.orderId);
     },
-    //框计算
-    onclick() {
-      if (this.activeName == "option") {
-        this.option.requestUrl =
-          "/api/v1/oms/getOthersOrderMesToSend?apiId= &type=2&con=" +
-          this.input;
-      } else {
-        this.first.requestUrl = "con=" + this.input;
-      }
-    },
     //查看当前订单的物资信息
     materialDetails(orderId) {
       this.axios

src/views/SporadicManage/components/sporadicMaterial/sporadicOutfactory/load.vue

@@ -21,13 +21,13 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getUnloadResult?apiId=404&orderType=13",
+        requestUrl: "/api/v1/tms/getAllLoadResult?apiId=404&orderType=13&status=0",
       },
     };
   },
   methods: {
     onclick() {
-          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&con=" + this.input;
+          this.option.requestUrl = "/api/v1/tms/getUnloadResult?apiId=404&orderType=13&status=0&con=" + this.input;
     },
    }
 };

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

@@ -17,7 +17,6 @@
           placeholder="请输入发货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectSupplier"
-          @input="oninputSupplier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.supplierName }}</div>
@@ -38,7 +37,6 @@
           placeholder="请输入收货单位名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
-          @input="oninputConsignee"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -89,7 +87,6 @@
           placeholder="请输入承运商名称"
           :trigger-on-focus="false"
           @select="handleSelectCarrier"
-          @input="oninputCarrier"
         >
         <template slot-scope="{ item }">
           <div class="name">{{ item.carrierName }}</div>
@@ -160,6 +157,7 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.materialPriority"
+                  @input="onInputPriority(scope.row.materialPriority)"
                 ></el-input>
               </template>
               <!-- 物资件数 -->
@@ -167,12 +165,14 @@
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.orderMaterialNumber"
+                  @input="onInputNumber(scope.row.orderMaterialNumber)"
                 ></el-input>
               </template>
               <!-- 物资重量 -->
                <template v-if="item.prop == 'orderMaterialWeight'">
                 <el-input
                   v-model.number="scope.row.orderMaterialWeight"
+                  @input="onInputWeight(scope.row.orderMaterialWeight)"
                 ></el-input>
               </template>           
             </template>
@@ -232,18 +232,6 @@
       >
         <i class="el-icon-search"></i>查询
       </el-button>
-       <div v-show="a == 1">
-        <dilTable
-          v-bind.sync="receiveOptions"
-          @radio-change="currentRadioChange1"
-        ></dilTable>
-      </div>
-      <div v-show="a == 2">
-        <dilTable
-          v-bind.sync="secend"
-          @radio-change="currentRadioChange2"
-        ></dilTable>
-      </div>
       <div v-show="a == 5">
         <dilTable
           v-bind.sync="line"
@@ -260,6 +248,7 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -381,6 +370,22 @@ export default {
     },
   },
   methods: {
+    onInputPriority(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('装卸货次序请输入数字')
+      }
+    },
+    onInputWeight(scope){
+      console.log(scope)
+      if(!isNumber(scope)){
+        this.$message.warning('重量请输入数字')
+      }
+    },
+    onInputNumber(scope){
+      if(!isNumber(scope)){
+        this.$message.warning('件数请输入数字')
+      }
+    },
     drawTable(){
       console.log('jll')
       this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395&test=1"