Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -20,34 +20,33 @@
         </span>
       </div>
     </div>
-    <div class="matching">
-      <span class="text">是否知道采购订单号:</span>
-      <el-switch
-        v-model="matching"
-        active-color="#27d452"
-        inactive-color="#e1e3e6"
-      >
-      </el-switch>
-      <span class="span"></span>
+    <div class="matching item">
+          <span class="text">是否知道采购订单号:</span>
+          <el-switch
+            v-model="matching"
+            active-color="#27d452"
+            inactive-color="#e1e3e6"
+          >
+          </el-switch>
     </div>
-    <div class="material from">
+    <div class="material item">
       <span class="text">物资：</span>
       <el-input v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
 
-    <div class="forwardingUnit from">
+    <div class="forwardingUnit item">
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-    <div class="forwardingUnit from" v-if="matching">
+    <div class="forwardingUnit item" v-if="matching">
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
     <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
         <el-form-item label="发站:">
           <el-autocomplete
             class="inline-input"
@@ -63,7 +62,7 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:550px;">
+      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:500px;">
         <el-form-item label="到站:">
           <el-autocomplete
             class="inline-input"
@@ -90,7 +89,7 @@
       </el-input>
       <span class="span"></span>
     </div>
-    <div class="purchaseOrder from" v-if="matching" style="width:330px;margin-left:544px;padding-bottom:15px">
+    <div class="purchaseOrder from" v-if="matching" >
       <span class="text" style="width:140px">采购订单号：</span>
       <el-input
         v-model="purchaseOrderNo"
@@ -560,12 +559,12 @@ export default {
     }
   }
   .matching {
-    width: 100%;
+    width: 20rem;
     height: 3.125rem;
     display: flex;
     justify-content: center;
     align-items: center;
-    margin-left: 160px;
+    margin-left: 24rem;
     .text {
       width: 8.75rem;
     }
@@ -580,7 +579,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
-    margin-left: 27rem;
+    margin-left: 24rem;
     width: 20rem;
     .text {
       text-align: right;
@@ -592,7 +591,7 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
-    margin-left: 27rem;
+    margin-left: 24rem;
     width: 20rem;
     .text {
       text-align: right;
@@ -604,6 +603,8 @@ export default {
     justify-content: center;
     align-items: center;
     height: 3.75rem;
+    margin-left: 24rem;
+    width: 22rem;
     .text {
       text-align: right;
       width: 5.625rem;
@@ -622,6 +623,9 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
+    margin-left: 24rem;
+    width: 22rem;
+    margin-bottom: 15px;
     .span {
       display: inline-block;
       width: 1.875rem;
@@ -629,11 +633,12 @@ export default {
     }
   }
   .form {
-   display: flex;
+    display: flex;
+    width: 340px;
+    margin-left:25rem; 
+    margin-right: 20px;
     .form_box {
-      width: 340px;
-      margin-left: 37%; 
-      margin-right: 20px;
+      
       .el-form {
         .preview-group {
           .el-form-item {

src/views/TMS/components/domesticMine/wagonLoadbu.vue

@@ -8,30 +8,30 @@
       ></dilTable>
     </div>
 
-    <div class="material from">
+    <div class="material form">
       <span class="text">物资：</span>
       <el-input v-model="materialName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(1)">浏览</el-button>
     </div>
 
-    <div class="forwardingUnit from">
+    <div class="forwardingUnit form">
       <span class="text">发货单位：</span>
       <el-input v-model="supplierName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(2)">浏览</el-button>
     </div>
-    <div class="forwardingUnit from">
+    <div class="forwardingUnit form">
       <span class="text">卸货点：</span>
       <el-input v-model="unloadPointName" disabled> </el-input>
       <el-button type="primary" @click="ondrawer(3)">浏览</el-button>
     </div>
-    <div class="remark from">
-      <span class="text" style="margin-left: 60px; ">船名(备注)：</span>
-      <el-input v-model="remark" @blur="onBlur" style="width: 230px; margin-right:140px"> </el-input>
+    <div class="remark form">
+      <span class="text" >船名(备注)：</span>
+      <el-input v-model="remark" @blur="onBlur" > </el-input>
       <span class="span"></span>
     </div>
 
     <div class="form">
-      <div class="form_box">
+      <div class="form_box">  
       <dil-form :formId="361" v-model="form1" ref="from1"></dil-form>
       </div>
     </div>
@@ -345,10 +345,6 @@ export default {
       width: 1.875rem;
       height: 1.25rem;
     }
-    .el-input{
-      width: 13.5rem;
-      margin-right: 2.375rem;
-    }
   }
   .purchaseOrder {
     display: flex;
@@ -361,11 +357,10 @@ export default {
     }
   }
   .form {
-   display: flex;
+    display: flex;
+    width: 340px;
+    margin-left:23rem; 
     .form_box {
-      width: 340px;
-      margin-left: 37%; 
-      margin-right: 20px;
       .el-form {
         .preview-group {
           .el-form-item {

src/views/TMS/components/domesticMine/wagonPleaseAdd.vue

@@ -9,12 +9,12 @@
       </div>
     </div>
 
-    <div class="fromOther">
-      <el-form
+    <div class="formOther">
+      <div class="form_box">
+          <el-form
         :inline="true"
         class="demo-form-inline"
         label-width="80px"
-        style="margin-left: 525px"
       >
         <el-form-item label="发货单位">
           <el-autocomplete
@@ -25,13 +25,11 @@
             :trigger-on-focus="false"
             @select="handleSelectSupplier"
           >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.supplierName }}</div>
-            </template>
+              <template slot-scope="{ item }">
+                <div class="name">{{ item.supplierName }}</div>
+              </template>
           </el-autocomplete>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <el-form-item label="发站">
           <el-autocomplete
             class="inline-input"
@@ -46,8 +44,6 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
         <el-form-item label="到站">
           <el-autocomplete
             class="inline-input"
@@ -63,6 +59,8 @@
           </el-autocomplete>
         </el-form-item>
       </el-form>
+    
+      </div>
     </div>
     <div class="trainTransport">
       <!-- 确定和取消 -->
@@ -259,7 +257,7 @@ export default {
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
@@ -297,4 +295,36 @@ export default {
     }
   }
 }
+
+ .formOther {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .button_box {
+              margin-left: 42%;
+              margin-top: 55px;
+            }
+          }
+        }
+      }
+    }
+  }
 </style>

src/views/TMS/components/domesticMine/wagonPleaseEdit.vue

@@ -7,55 +7,53 @@
           <dil-form :formId="117" v-model="form1"></dil-form>
         </div>
     </div>
-    <div class="fromOther">
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
-        <el-form-item label="发货单位">
-          <el-autocomplete
-            class="inline-input"
-            v-model="stateSupplier"
-            :fetch-suggestions="querySearchSupplier"
-            placeholder="请输入发货单位名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSupplier"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.supplierName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
-        <el-form-item label="发站">
-          <el-autocomplete
-            class="inline-input"
-            v-model="sendStation"
-            :fetch-suggestions="querySearchSendStation"
-            placeholder="请输入发站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectSendStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
-      <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:525px;">
-        <el-form-item label="到站">
-          <el-autocomplete
-            class="inline-input"
-            v-model="toTheStation"
-            :fetch-suggestions="querySearchToTheStation"
-            placeholder="请输入到站名称"
-            :trigger-on-focus="false"
-            @select="handleSelectToTheStation"
-          >
-            <template slot-scope="{ item }">
-              <div class="name">{{ item.arrivalName }}</div>
-            </template>
-          </el-autocomplete>
-        </el-form-item>
-      </el-form>
+    <div class="formOther">
+      <div  class="form_box">
+          <el-form :inline="true" class="demo-form-inline" label-width="80px">
+            <el-form-item label="发货单位">
+              <el-autocomplete
+                class="inline-input"
+                v-model="stateSupplier"
+                :fetch-suggestions="querySearchSupplier"
+                placeholder="请输入发货单位名称"
+                :trigger-on-focus="false"
+                @select="handleSelectSupplier"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.supplierName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="发站">
+              <el-autocomplete
+                class="inline-input"
+                v-model="sendStation"
+                :fetch-suggestions="querySearchSendStation"
+                placeholder="请输入发站名称"
+                :trigger-on-focus="false"
+                @select="handleSelectSendStation"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.arrivalName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+            <el-form-item label="到站">
+              <el-autocomplete
+                class="inline-input"
+                v-model="toTheStation"
+                :fetch-suggestions="querySearchToTheStation"
+                placeholder="请输入到站名称"
+                :trigger-on-focus="false"
+                @select="handleSelectToTheStation"
+              >
+                <template slot-scope="{ item }">
+                  <div class="name">{{ item.arrivalName }}</div>
+                </template>
+              </el-autocomplete>
+            </el-form-item>
+          </el-form>
+      </div>
     </div> 
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -245,7 +243,7 @@ export default {
     display: flex;
     .form_box {
       width: 340px;
-      margin-left: 35%;
+      margin-left: 36%;
       margin-top: 30px;
       margin-right: 20px;
       .el-form {
@@ -273,5 +271,36 @@ export default {
     margin-top: 55px;
   }
 }
+.formOther {
+    display: flex;
+    .form_box {
+      width: 340px;
+      margin-left: 35%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+            .button_box {
+              margin-left: 42%;
+              margin-top: 55px;
+            }
+          }
+        }
+      }
+    }
+  }
 </style>
 </style>

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -278,13 +278,23 @@ export default {
 
     //other
     click(row) {
-     
-        this.pathOption.orderNumber=row.orderNumber;
-        this.pathOption.capacityNumber=row.capacityNumber;
-        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
-        this.pathOption.endPointName=row.deliveryAddress,
-        this.value7=true;
-
+        let that = this;
+        that.axios
+          .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
+          .then(res => {
+            console.log(res.data);
+            if (res.data.data == "-1") {
+              this.$message.error("运输订单未关闭的自提车辆无权查看!");
+            } else if (res.data.data.startAndEndRoutes != null) {
+              that.pathOption.orderNumber=row.orderNumber;
+              that.pathOption.capacityNumber=row.capacityNumber;
+              that.pathOption.startPointName="达钢集团"+row.outGatepostName,
+              that.pathOption.endPointName=row.deliveryAddress,
+              that.value7=true;
+            } else {
+              this.$message.error("车辆没有开启GPS");
+            }
+          });
     },
     historyclick(row){