修改

build/utils.js

@@ -16,11 +16,12 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['index','statisticalReport','appoint']
-// let devModules = ['index','appoint','sale','RMS','statisticalReport'];
+// let devModules = ['index','appoint','sale','RMS','statisticalReport','TMS','inward'];
 //let devModules = ['index','appoint','WMS'];
 // let devModules = ['index','statisticalReport']
 // let devModules = ['index','sale']
 let devModules = ['all']
+
 // let devModules = ['index','SporadicManage','RMS','statisticalReport']
 // let devModules = ['index','inward','statisticalReport']
 //  let devModules = ['index','WMS','appoint','TMS','inward','statisticalReport','sale']

config/index.js

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

src/views/RMS/components/capacity.vue

@@ -29,13 +29,13 @@
       >
         <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <!-- <el-button
+             <el-button
               type="text"
               size="small"
-              @click="updateCapacity(scope.row.capacityId)"
+              @click="updateCapacity(scope.row.capacityCarrierId)"
             >
-              修改
-            </el-button> -->
+              修改备注
+            </el-button> 
             <el-button
               type="text"
               size="small"
@@ -127,8 +127,9 @@ export default {
     toInsert1() {
       this.$router.push("/addOtherCapacity");
     },
-    updateCapacity(capacityId){
-      this.$router.push("/editCapacity/" + capacityId)
+    updateCapacity(capacityCarrierId){
+      // console.log("capacityCarrierId" +capacityCarrierId);
+      this.$router.push("/editCapacity/" + capacityCarrierId);
     },
     showCapacity(capacityId){
       this.$router.push("/showCapacity/" + capacityId)
@@ -137,6 +138,7 @@ export default {
       this.axios.delete("pass/v1/sysusers/" + userId) .then((res) => {
       });
     },
+    
     deleteCapacity(row) {
       console.log("row",row)
       let map = {

src/views/RMS/components/editCapacity.vue

@@ -1,16 +1,20 @@
 <template>
-  <!-- 修改运力信息 -->
-<div class="editCapacity">
-  <div id="contractDetails">
-    <page-title>编辑</page-title>
-    <div class="main">
-    </div>
-    <div class="contractTitle">
-      <div class="form_box" style="margin-right: 10rem">
-          <dil-form :formId="310" v-model="form1"></dil-form>
-      </div>
-    </div>
-<div class="elForm">
+   
+  <!-- 修改运力信息 -->
+  <div class="editCapacity">
+     
+    <div id="contractDetails">
+          <page-title>编辑</page-title>    
+      <div class="main">   </div>
+         
+      <div class="contractTitle">
+             
+        <div class="form_box" style="margin-right: 10rem">
+                    <dil-form :formId="380" v-model="form1"></dil-form>      
+        </div>
+           
+      </div>
+      <!-- <div class="elForm">
   <el-form
         :inline="true"
         class="demo-form-inline"
@@ -30,204 +34,186 @@
         </template>
         </el-autocomplete>
         </el-form-item>
-    </el-form>
-</div>
-    
-</div>
-    <div class="button_box">
-      <el-button type="primary" @click="onClickConfirm">确认</el-button>
-    </div>
-  </div>
-
+    </el-form> -->
+      <!-- </div> -->
+    </div>
+       
+    <div class="button_box">
+            <el-button type="primary" @click="onClickConfirm">确认</el-button>  
+       
+    </div>
+     
+  </div>
 </template>
 
 <script>
 import PageTitle from "@/components/Page/Title";
 import { getCookie } from "@/utils/util.js";
 export default {
-  components: { PageTitle },
-  data() {
-    return {
+  components: { PageTitle },
+  data() {
+    return {
       state: "",
-      userId:null,
+      userId: null,
       restaurants: [],
-      accessToken:null,
-      userCode:null,
-      carrierUserId:null,
-      carrierId:null,
-      carrierIds:null,
-      direction: 'rtl',
-      inputText:"",
-      form1: {},
-      carrierUserId:null,
-      carrierName:"",
-      options:{
-        requestUrl:"/api/v1/rms/getCarrierList?apiId=417",
-        selectionType:"radio",
-        mapList:[]
-      }
-    };
-  },
-  created(){
-      this.carrierUserId = getCookie("userId");
-      console.log(this.carrierUserId ,'carrierUserId')     
+      accessToken: null,
+      userCode: null,
+      carrierUserId: null,
+      carrierId: null,
+      capacityCarrierId:null,
+      carrierIds: null,
+      direction: "rtl",
+      inputText: "",
+      form1: {},
+      carrierUserId: null,
+      carrierName: "",
+      map:[],
+      options: {
+        requestUrl: "/api/v1/rms/getCarrierList?apiId=417",
+        selectionType: "radio",
+        mapList: [],
+      },
+    };
   },
+  // created(){
+  //     this.carrierUserId = getCookie("userId");
+  //     // console.log(this.carrierUserId ,'carrierUserId')
+  // },
   mounted() {
-   this.information();
-   this.axios.post(
-       "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
-      )
-      .then((res) => {
-        if(res.data.code == "200"){
-        console.log(res.data.data)
-        this.state = res.data.data.carrierName
-        this.carrierIds = res.data.data.carrierId
-        }      
-  })},
-  methods: {
+    this.information();
+  },
+  //   mounted() {
+  //    this.information();
+  //    this.axios.post(
+  //        "/api/v1/rms/getCarrierNameBySSOId?carrierSSOId=" + this.carrierUserId
+  //       )
+  //       .then((res) => {
+  //         if(res.data.code == "200"){
+  //         console.log(res.data.data)
+  //         this.state = res.data.data.carrierName
+  //         this.carrierIds = res.data.data.carrierId
+  //         }
+  //   })},
+  methods: {
     //承运商弹出层
-    handleSelect(item){    
-      this.carrierIds = item.carrierId
-      item.carrierName = this.state
-    },
-    //以下是承运商边输边查搜索
-    querySearch(queryString, cb) {
-        this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
-        if(res.data.code == "200"){
-          console.log(res.data.data)
-          var restaurants = res.data.data
-          console.log(restaurants,"restaurants");
-          var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
-           // 调用 callback 返回建议列表的数据
-          cb(results);
-        }
-        })     
-      },
-    createFilter(queryString) {
-        return (restaurants)  =>  {
-          return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
-        };
-      },
-    //以上是承运商边输边查搜索
-    currentRadioChange(selection){
-      this.mapList=selection,
-      console.log(this.mapList)
-      this.carrierName=this.mapList.carrierName
-    },
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
-    },
-    information() {
-      //编辑 
-    console.log(this.$route.params)            
-     
-      this.axios
-        .post(
-          "/api/v1/rms/getCapacityById/" +
-            this.$route.params.capacityId
-        )
-        .then((res) => {
-            console.log(res.data.data)
-          res.data.data.forEach((e) => {          
-            this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log( this.$route.params.capacityId);
-          }); 
-        this.axios
+    // handleSelect(item){
+    //   this.carrierIds = item.carrierId
+    //   item.carrierName = this.state
+    // },
+    // //以下是承运商边输边查搜索
+    // querySearch(queryString, cb) {
+    //     this.axios.post('/api/v1/uc/getCarrierMesByLike?index='+queryString).then((res)=>{
+    //     if(res.data.code == "200"){
+    //       console.log(res.data.data)
+    //       var restaurants = res.data.data
+    //       console.log(restaurants,"restaurants");
+    //       var results = queryString ? restaurants.filter(this.createFilter(queryString)) :restaurants;
+    //        // 调用 callback 返回建议列表的数据
+    //       cb(results);
+    //     }
+    //     })
+    //   },
+    // createFilter(queryString) {
+    //     return (restaurants)  =>  {
+    //       return (restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) > -1);
+    //     };
+    //   },
+    // //以上是承运商边输边查搜索
+    // currentRadioChange(selection){
+    //   this.mapList=selection,
+    //   // console.log(this.mapList)
+    //   this.carrierName=this.mapList.carrierName
+    // },
+    // onclick(){
+    //   this.options.requestUrl="/api/v1/rms/getCarrierList?apiId=417&con=" +this.inputText;
+    // },
+    information() {
+      //       //编辑
+      //     console.log(this.$route.params)
+      // console.log(this.$route.params)
+      this.axios
         .post(
-          "/api/v1/rms/getCarrierNameById/" +
-          this.$route.params.capacityId
+          "/api/v1/rms/getCapacityInfoById/" +
+            this.$route.params.capacityCarrierId
         )
         .then((res) => {
-          this.state=res.data.data.carrierName
-          console.log("carrierName",this.carrierName);
-        }); 
-        });
-    },
-    // 返回
-    onClickCancel() {
-      this.$router.go(-1);
-    },
-    // 确认
-    onClickConfirm() {
-      console.log(this.form1)
-       let RmsCapacity={
-         capacityId:this.form1.capacityId,
-         capacityTypeId:this.form1.capacityTypeId,
-         capacityNumber:this.form1.capacityNumber.toUpperCase(),
-         capacityCorlor:this.form1.capacityCorlor,
-         capacityOwneris:this.form1.capacityOwneris,
-         capacityVip:this.form1.capacityVip,
-         capacityBlacklist:this.form1.capacityBlacklist,
-         carrierId:this.carrierIds,
-       };if(
-         RmsCapacity.capacityNumber==null ||
-         RmsCapacity.capacityCorlor==null ||
-         RmsCapacity.capacityOwneris==null ||
-         RmsCapacity.capacityVip==null ||
-         RmsCapacity.capacityBlacklist==null 
-         //RmsCapacity.carrierId==null
-       )this.$message.error("存在空值！");  
-        console.log( this.$route.params.capacityId);
-        this.axios
-          .post(
-            "/api/v1/rms/updateCapacity",
-           RmsCapacity
-          )
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$message.success("修改成功")
-              this.$router.go(-1);           
-            }
-          });
-    },
-  },
+          console.log(res);
+          res.data.data.forEach((e) => {
+            console.log("from", this.form1);
+            this.form1 = e;
+          });
+        });
+    }, // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    }, // 确认
+    onClickConfirm() {
+      console.log(this.form1);
+      let map = {
+        remark: this.form1.remark,
+        userDep:this.form1.userDep,
+        capacityCarrierId:this.$route.params.capacityCarrierId 
+      };
+      if (
+        map.remark == null ||
+        map.userDep == null 
+      )
+        this.$message.error("不能存在空值");
+      this.axios.post("/api/v1/rms/updateCapacity", map).then((res) => {
+        if (res.data.code == "200") {
+          this.$message.success("修改成功");
+          this.$router.go(-1);
+        }else{
+          this.$message.success("修改失败");
+          this.$router.go(-1);
+        }
+      });
+    },
+  },
 };
 </script>
 <style lang='scss' scoped>
-.editCapacity{
-    .elForm{
-      margin-left: 40%;
-    }
-    .form_box {
+.editCapacity {
+  .elForm {
+    margin-left: 40%;
+  }
+  .form_box {
     width: 100%;
     margin-top: 30px;
     display: flex;
     justify-content: center;
-    .el-form-item{
+    .el-form-item {
       display: flex;
       justify-content: center;
-      .el-form-item__label{
+      .el-form-item__label {
         display: flex;
         align-items: center;
       }
-      .el-form-item__content{
-         .el-select{
-            width: 250px;
-          }
-          .el-input{
-            width: 250px;
-          }
+      .el-form-item__content {
+        .el-select {
+          width: 250px;
+        }
+        .el-input {
+          width: 250px;
+        }
       }
     }
- }
- .button_box{
+  }
+  .button_box {
     display: flex;
     justify-content: center;
-    .el-button{
+    .el-button {
       width: 80px;
       margin-right: 10px;
     }
- }
- .disableBox{
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 1.5rem;
-  margin-bottom: 1.25rem;
-}
+  }
+  .disableBox {
+    display: flex;
+    text-align: center;
+    align-items: center;
+    justify-content: center;
+    margin-top: 1.5rem;
+    margin-bottom: 1.25rem;
+  }
 }
- 
 </style>

src/views/RMS/router/index.js

@@ -87,7 +87,7 @@ const constantRouterMap = [
 		{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},  
-		{path: 'editCapacity/:capacityId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
+		{path: 'editCapacity/:capacityCarrierId', name: 'editCapacity', meta: {code: 'xtpzgl-yhgl'}, component: editCapacity},
 		{path: 'editCarDriver/:driverId', name: 'editCarDriver', meta: {code: 'xtpzgl-yhgl'}, component: editCarDriver},
 		{path: 'editCarrier/:carrierId', name: 'editCarrier', meta: {code: 'xtpzgl-yhgl'}, component: editCarrier},
 		{path: 'showCarrier/:carrierId', name: 'showCarrier', meta: {code: 'xtpzgl-yhgl'}, component: showCarrier},

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

@@ -2,13 +2,25 @@
   <!-- 新增运输作业页面 -->
   <div id="contractDetails">
     <page-title>运输预约</page-title>
-    <div style="text-align: center; font-size:20px; font-weight:bold; margin-top:15px; color:green">
+    <div
+      style="
+        text-align: center;
+        font-size: 20px;
+        font-weight: bold;
+        margin-top: 15px;
+        color: green;
+      "
+    >
       <span>燃料预约界面</span>
     </div>
-    <div style="text-align: center; font-size:15px; margin-top:15px; color:red">
-      <span>温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br>如选错厂区将会影响车辆上秤计量！！！</span>
+    <div
+      style="text-align: center; font-size: 15px; margin-top: 15px; color: red"
+    >
+      <span
+        >温馨提示：卸货到达钢请选择一厂，达兴二焦化请选择二厂<br />如选错厂区将会影响车辆上秤计量！！！</span
+      >
     </div>
-    <div class="orderType from" style="margin-top:15px">
+    <div class="orderType from" style="margin-top: 15px">
       <span class="text">卸货厂区：</span>
       <el-select
         class="select"
@@ -24,29 +36,26 @@
         >
         </el-option>
       </el-select>
+
       <span class="span"></span>
     </div>
     <div class="supplieUnit">
-      <el-form
-        :inline="true"
-        class="demo-form-inline"
-        label-width="80px"
-        >
+      <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-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>
+      </el-form>
     </div>
     <div class="material from">
       <span class="text">物资：</span>
@@ -55,7 +64,8 @@
     </div>
     <div class="remark from">
       <span class="text">船名：</span>
-      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true"> </el-input>
+      <el-input class="input" v-model="remark" @blur="onBlur" :disabled="true">
+      </el-input>
       <span class="span"></span>
     </div>
     <div class="forwardingUnit from">
@@ -63,6 +73,11 @@
       <el-input class="input" v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(4)">浏览</el-button>
     </div>
+    <div class="loadUnit from">
+      <span class="text">装货点：</span>
+      <el-input class="input" v-model="loadNames" disabled> </el-input>
+      <el-button type="primary" @click="ondrawer(8)">浏览</el-button>
+    </div>
     <div class="lineId from">
       <span class="text">选择路线：</span>
       <el-input class="input" v-model="lineName" disabled> </el-input>
@@ -212,6 +227,17 @@
           :drawer="drawer"
         ></dilTable>
       </div>
+      <div v-show="onDrawerNumber == 8">
+        <dilTable
+          v-bind.sync="loadName"
+          @radio-change="currentRadioChange8"
+          :isKuang="isKuang"
+          @func="func"
+          :isHeigth="isHeigth5"
+          :shiyHeigth="shiyHeigth5"
+          :drawer="drawer"
+        ></dilTable>
+      </div>
     </el-drawer>
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -227,30 +253,30 @@ export default {
   components: { PageTitle },
   data() {
     return {
-      stateSupplier:null,
+      stateSupplier: null,
       //限定first
-      isHeigth:true,
-      shiyHeigth:140,
+      isHeigth: true,
+      shiyHeigth: 140,
       //限定second
-      isHeigth1:true,
-      shiyHeigth1:140,
+      isHeigth1: true,
+      shiyHeigth1: 140,
       //限定third
-      isHeigth2:true,
-      shiyHeigth2:140,
+      isHeigth2: true,
+      shiyHeigth2: 140,
       //限定unloadPoint
-      isHeigth3:true,
-      shiyHeigth3:140,
+      isHeigth3: true,
+      shiyHeigth3: 140,
       //限定line
-      isHeigth4:true,
-      shiyHeigth4:140,
+      isHeigth4: true,
+      shiyHeigth4: 140,
       //限定purchaseOrder
-      isHeigth5:true,
-      shiyHeigth5:140,
+      isHeigth5: true,
+      shiyHeigth5: 140,
       isKuang: false,
       //采购订单号
       purchaseOrderNo: "",
       isMoreTrips: false,
-      purchaseOrgId:null,
+      purchaseOrgId: null,
       //订单类别
       orderTypeList: [
         {
@@ -304,8 +330,13 @@ export default {
       materialId: null,
       //是否需要打开模态窗口
       drawer: false,
+      // 装货点id
+      loadNameId: "",
+      // 装货点名称
+      loadNames: "",
       //卸货点id
       unloadPointId: "",
+
       //卸货点名称
       unloadPointName: "",
       //订单类别
@@ -340,6 +371,10 @@ export default {
         requestUrl: "",
         selectionType: "radio",
       },
+      loadName: {
+        requestUrl: "",
+        selectionType: "radio",
+      },
     };
   },
   watch: {
@@ -363,43 +398,53 @@ export default {
     onClick(index) {
       this.selectionList.splice(index, 1);
     },
-    onchange(){
-      if(this.orderType == 6){
-        this.purchaseOrgId = 1
-      }else{
-        this.purchaseOrgId = 2
+    onchange() {
+      if (this.orderType == 6) {
+        this.purchaseOrgId = 1;
+      } else {
+        this.purchaseOrgId = 2;
       }
-      this.getPurchaseOrderNo()
+      this.getPurchaseOrderNo();
     },
     onBlur() {
       this.getPurchaseOrderNo();
     },
     //发货单位弹出层
-    handleSelectSupplier(item){
-      this.supplierId = item.supplierId
-      this.supplierName = item.supplierName
+    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);
-        }
-      })  
-      },
+      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);
-        };
-      },
+      return (restaurantsSupplier) => {
+        return (
+          restaurantsSupplier.value
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        );
+      };
+    },
     getPurchaseOrderNo() {
       let map = {
         materialId: this.materialId,
         supplierId: this.supplierId,
-        purchaseOrgId: this.purchaseOrgId
+        purchaseOrgId: this.purchaseOrgId,
       };
       if (this.remark) {
         map.remark = this.remark;
@@ -414,9 +459,9 @@ export default {
                 message: "没有匹配的采购订单号!",
                 type: "warning",
               });
-              this.purchaseOrderNo = null
-              this.purchaseOrderId = null
-              this.remark = null
+              this.purchaseOrderNo = null;
+              this.purchaseOrderId = null;
+              this.remark = null;
               this.form1 = [];
             } else {
               this.remark = res.data.data.remark;
@@ -435,7 +480,9 @@ export default {
         if (this.onDrawerNumber == 1) {
           this.frist.requestUrl =
             "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-            this.input + "&supplierId=" + this.supplierId;;
+            this.input +
+            "&supplierId=" +
+            this.supplierId;
         } else if (this.onDrawerNumber == 2) {
           this.secend.requestUrl =
             "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -471,6 +518,13 @@ export default {
             this.input +
             "&i=" +
             new Date();
+        } else if (this.onDrawerNumber == 8) {
+          this.loadName.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374" +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
         }
       } else {
         if (this.onDrawerNumber == 1) {
@@ -510,20 +564,25 @@ export default {
             this.supplierId +
             "&i=" +
             new Date();
+        } else if (this.onDrawerNumber == 8) {
+          this.loadName.requestUrl =
+            "/api/v1/uc/getUnloadingMesByLike?apiId=374&i="+ new Date();
         }
       }
     },
     ondrawer(num) {
-      if(this.supplierId == null){
-          this.$message.warning("请先填写发货单位")
-          return
+      if (this.supplierId == null) {
+        this.$message.warning("请先填写发货单位");
+        return;
       }
       this.drawer = true;
       this.onDrawerNumber = num;
       if (num == 1) {
         this.frist.requestUrl =
           "/api/v1/uc/queryAPOMaterialByLike?apiId=244&startNum=050&index=" +
-          this.input + "&supplierId=" + this.supplierId;
+          this.input +
+          "&supplierId=" +
+          this.supplierId;
       } else if (num == 2) {
         this.secend.requestUrl =
           "/api/v1/uc/getSupplierMesByMaterialId?apiId=247&materialId=" +
@@ -548,13 +607,19 @@ export default {
           "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       } else if (num == 5) {
         this.line.requestUrl =
-          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date() + "&con=" + "采购燃料";
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" +
+          new Date() +
+          "&con=" +
+          "采购燃料";
       } else if (num == 6) {
         this.purchaseOrder.requestUrl =
           "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId=" +
           this.supplierId +
           "&i=" +
           new Date();
+      } else if (num == 8) {
+        this.loadName.requestUrl =
+          "/api/v1/uc/getUnloadingMesByLike?apiId=374&i=" + new Date();
       }
     },
     // 返回
@@ -564,7 +629,7 @@ export default {
     currentRadioChange1(selection) {
       this.materialName = selection.materialName;
       this.materialId = selection.materialId;
-      this.remark = null
+      this.remark = null;
       this.getPurchaseOrderNo();
     },
     currentRadioChange2(selection) {
@@ -580,6 +645,10 @@ export default {
       this.lineName = selection.lineName;
       this.lineId = selection.lineId;
     },
+    currentRadioChange8(selection) {
+      this.loadNames = selection.warehouseName;
+      this.loadNameId = selection.warehouseId;
+    },
     currentRadioChange6(selection) {
       console.log(selection);
       if (selection.orgId == 1) {
@@ -693,6 +762,7 @@ export default {
         supplierId: this.supplierId,
         purchaseOrderId: this.purchaseOrderId,
         unloadPointId: this.unloadPointId,
+        loadNameId: this.loadNameId,
         orderEntryTime: sjTime(this.form1.orderEntryTime),
         driverCapacityIdList: this.selectionList,
         orderType: this.orderType,
@@ -827,6 +897,20 @@ export default {
     margin-right: 20px;
   }
 }
+.loadUnit {
+  display: flex;
+  justify-content: center;
+  .text {
+    display: inline-block;
+    width: 170px;
+    text-align: right;
+  }
+  .input {
+    width: 250px;
+    margin-right: 20px;
+  }
+}
+
 .truckList1 {
   width: 100%;
   .truckList {
@@ -841,14 +925,16 @@ export default {
     }
   }
 }
-.drawer_top{
+.drawer_top {
   margin-top: -50px;
-  width: 100%;height: 60px;
+  width: 100%;
+  height: 60px;
   display: flex;
   align-items: center;
 }
-.drawer_table1{
-  width: 100%;height: 500px;
+.drawer_table1 {
+  width: 100%;
+  height: 500px;
 }
 .button_box {
   display: flex;

src/views/inward/components/truckOrder/decomposePlan.vue

@@ -195,7 +195,7 @@ export default {
         getCookie("userId");
     } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.second.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"物流储运中心";
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&indexText="+"物流储运中心";
     }else {
       this.second.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null
@@ -212,7 +212,7 @@ export default {
         getCookie("userId") + "&i=" + new Date();
     } else if(getCookie("orgCode") == "wuliuchuyunzhongxin"){
       this.second.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"物流储运中心" + "&i=" + new Date();
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&indexText="+"物流储运中心" + "&i=" + new Date();
     }else {
       this.second.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date();

src/views/sale/components/transport_order/saleSteelOrder.vue

@@ -276,8 +276,8 @@ export default {
       this.option2.requestUrl =
         "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&shipperId=1&carrierSsoId=" +
         getCookie("userId") +
-        "&t=" +
-        new Date();
+        "&t=";
+      new Date();
       this.option3.requestUrl =
         "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&shipperId=1&carrierSsoId=" +
         getCookie("userId") +

src/views/statisticalReport/components/loadCapacityDetail/loadCapacityDetail.vue

@@ -92,16 +92,13 @@ export default {
     getRequestUrl() {
       if (
         getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"
+        getCookie("orgCode") == "zidonghuabu"||
+        getCookie("orgCode")=="wuliuchuyunzhongxin"
       ) {
         this.option.requestUrl =
           "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
           new Date();
-      } else if (getCookie("orgCode") == "wuliuchunyunzhongxin") {
-        this.option.requestUrl =
-          "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
-          new Date();
-      } else {
+      }  else {
         this.option.requestUrl =
           "/api/v1/tms/getLoaderForResultDetail?apiId=480&userId=" +
           getCookie("orgCode") +
@@ -136,7 +133,7 @@ export default {
               endTime +
               "&i=" +
               new Date();
-          } else if (getCookie("orgCode") == "wuliuchunyunzhongxin") {
+          } else if (getCookie("orgCode") == "wuliuchuyunzhongxin") {
             this.option.requestUrl =
               "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=" +
               startTime +

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

@@ -1,50 +1,61 @@
 //化产焦炭统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-input
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-input
         v-model="inputReceiveName"
         style="width:200px"
         placeholder="输入收货单位"
         clearable="true"
       ></el-input>
       <el-button type="primary" @click="getReceiveName">查询</el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form> 
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -241,16 +252,4 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
-  .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
-  }
-}
 </style>

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

@@ -1,49 +1,61 @@
 //副产品统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-input
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-input
         v-model="inputReceiveName"
         style="width:200px"
         placeholder="输入收货单位"
+        clearable="true"
       ></el-input>
       <el-button type="primary" @click="getReceiveName">查询</el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form>       
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -239,16 +251,4 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
-  .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
-  }
-}
 </style>

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

@@ -1,43 +1,52 @@
 //钢材统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form> 
     <div class="table">
       <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
       <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
@@ -192,16 +201,4 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
-  .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
-  }
-}
 </style>

src/views/statisticalReport/components/sporadicReport/inwardSporadicReport.vue

@@ -52,7 +52,6 @@ export default {
   },
   methods: {
     func(res){
-        // console.log(res)
         var resultNetWeightTotalFirst = 0
         var resultNetWeightTotalSecond = 0
         var currentCapacityTotal = 0