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

build/utils.js

@@ -15,14 +15,12 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-
 // let devModules = ["index", "appoint", "statisticalReport"];
 let devModules = ["all"];
 
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];
-
 // let devModules = ['index','statisticalReport','inward']
 
 if (pathSrc.indexOf("node_modules") > -1) {

src/views/RMS/components/cargoDep.vue

@@ -53,7 +53,7 @@ export default {
       this.$router.push("/updateCargoDep/" +scope.row.cargoCarrierId)
     },
  
-    deleteCarDriver(scope){
+    deleteCargoDep(scope){
          let map={
          cargoCarrierId : scope.row.cargoCarrierId,
          userId:getCookie("userId"),
@@ -66,7 +66,7 @@ export default {
       })  
         .then(() => {
           this.axios
-            .post("/api/v1/rms/deleteCarDriver/"  + map)
+            .post("/api/v1/rms/deleteCargoDep" , map)
             .then((res) => {
               if (res.data.code == 200) {
                 this.$message({

src/views/TMS/components/importedShip/addLoadShip.vue

@@ -98,7 +98,6 @@ export default {
     currentRadioChange(row) {
       this.rowMap = row;
       this.batchInfactoryId=this.rowMap.batchInfactoryId;
-      console.log("addd", this.rowMap);
     },
 
     pipeiContarct() {

src/views/TMS/components/importedShip/addUnloadShip.vue

@@ -182,6 +182,7 @@ export default {
   }
   .button_box {
     margin-left: 45%;
+    width:160px;
   }
 }
 </style>

src/views/TMS/components/importedShip/shipmentInstructionText.vue

@@ -156,9 +156,20 @@
             class="tablePart6"
           >
             <tr>
-              <th style="width: 50px"></th>
-              <td style="width: 35%">{{ item.shipperName }}</td>
+               <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
             </tr>
+              <td style="width: 35%">{{ item.shipperName }}</td>
+          
           </table>
         </div>
         <div>

src/views/TMS/components/importedShip/updateShipmentInstructions.vue

@@ -56,7 +56,6 @@ export default {
     onClickConfirm() {
       let omsshipShipmentInstructions = {
         shipmentInstructionsId: this.$route.params.instructionsId,
-        // batchId: this.form1.batchId,
         instructionsTotalTonnage: this.form1.instructionsTotalTonnage,
         instructionTime: sjTime(this.form1.instructionTime),
       };

src/views/appoint/components/ship/attorneytext.vue

@@ -146,16 +146,25 @@
               margin-top: 5px;
               font-size: 25px;
               line-height: 40px;
+              table-layout: fixed;
             "
             width="1000px"
             class="tablePart6"
           >
             <tr>
-              <th style="width: 50px"></th>
-              <th style="width: 50px"></th>
-              <td style="width: 50px"></td>
-              <td style="width: 50px"></td>
-              <td style="width: 50px"></td>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <td style="width: 38%"></td>
+            </tr>
+            <tr>
+              <th style="width: 50px; border-collapse: collapse"></th>
               <td style="width: 38%; font-family: FangSong">
                 {{ item.shipperName }}
               </td>

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -3,7 +3,7 @@
     <div id="pdfDom">
       <div class="blank"></div>
       <div class="title">
-        <h1 align="center">{{ consigeeName }}</h1>
+        <h1 align="center">{{ shippername }}</h1>
         <h1 align="center">物资送货单</h1>
       </div>
       <div>
@@ -12,13 +12,13 @@
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto;font-size:20px;"
+          style="margin: auto; font-size: 20px"
           width="1000px"
           class="tablePart0"
         >
           <tr>
-            <th style="width :14.5%">销售订单号：</th>
-            <td style="width :85.5%">{{ saleNo }}</td>
+            <th style="width: 14.5%">销售订单号：</th>
+            <td style="width: 85.5%">{{ saleNo }}</td>
           </tr>
         </table>
       </div>
@@ -28,17 +28,17 @@
           border="1"
           cellpadding="10"
           cellspacing="0"
-          style="margin-top: 10px;text-align: center"
+          style="margin-top: 10px; text-align: center"
           width="1000px"
           class="tablePart1"
         >
           <tr>
-            <th style="width :5%;text-align: center;">序号</th>
-            <th style="width :21.5% ;text-align: center;">物资名称</th>
-            <th style="width :21.5% ;text-align: center;">规格型号</th>
-            <th style="width :14%">件数</th>
-            <th style="width :14%">理论重量</th>
-            <th style="width :19%">制单日期</th>
+            <th style="width: 5%; text-align: center">序号</th>
+            <th style="width: 21.5%; text-align: center">物资名称</th>
+            <th style="width: 21.5%; text-align: center">规格型号</th>
+            <th style="width: 14%">件数</th>
+            <th style="width: 14%">重量</th>
+            <th style="width: 19%">订单日期</th>
           </tr>
 
           <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
@@ -61,8 +61,8 @@
           class="tablePart2"
         >
           <tr>
-            <th style="width :14%">收货地点</th>
-            <td style="width :50%">
+            <th style="width: 19.25%">收货地点</th>
+            <td style="width: 50%">
               {{ province }}{{ district }}{{ town }}{{ deliveryAddress }}
             </td>
           </tr>
@@ -78,16 +78,19 @@
           class="tablePart3"
         >
           <tr>
-            <th style="width :10.5%">收货人</th>
-            <td style="width :20%">{{ consignee }}</td>
-            <th style="width :10.5%">电话</th>
-            <td style="width :26%">{{ consigneeTel }}</td>
+            <th style="width: 21.65%">收货人</th>
+            <td style="width: 20%">{{ consignee }}</td>
+            <th style="width: 10.5%">电话</th>
+            <td style="width: 26%">{{ consigneeTel }}</td>
           </tr>
         </table>
 
+
+     
+
         <!-- tablePart4 -->
         <table
-          border="1"
+          border="0"
           cellpadding="10"
           cellspacing="0"
           style="border-top: 0px"
@@ -95,26 +98,63 @@
           class="tablePart4"
         >
           <tr>
-            <th style="width :10.5%">承运商</th>
-            <td style="width :36.5%">{{ carrierName }}</td>
-            <th style="width :13%">车牌号</th>
-            <td style="width :40%">{{ capacityNumber }}</td>
+            <th style="width: 27.75%">承运商</th>
+            <td style="width: 36.5%">{{ carrierName }}</td>
+            <th style="width: 13%">车牌号</th>
+            <td style="width: 40%">{{ capacityNumber }}</td>
+          </tr>
+        </table>
+
+
+              <!-- tablePart9 -->
+        <table
+          border="1"
+          cellpadding="10"
+          cellspacing="0"
+          style="border-top: 0px"
+          width="1000px"
+          class="tablePart9"
+        >
+          <tr>
+            <th style="width: 7.62%">备注</th>
+            <td style="width: 20%"></td>
+           
           </tr>
         </table>
       </div>
+
+     
+
       <div>
         <!-- tablePart6 -->
         <table
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto;font-size:20px;margin-top: 10px;"
+          style="margin: auto; font-size: 20px; margin-top: 10px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
-            <th style="width :14.5%">发货单位：</th>
-            <td style="width :48.5%">{{ shippername }}</td>
+            <th style="width: 6.25%">发货单位：</th>
+            <td style="width: 53.5%">{{ shippername }}</td>
+          </tr>
+        </table>
+</div>
+
+          <div>
+        <!-- tablePart6 -->
+        <table
+          border="0"
+          cellpadding="10"
+          cellspacing="0"
+          style="margin: auto; font-size: 20px; margin-top: 10px"
+          width="1000px"
+          class="tablePart6"
+        >
+          <tr>
+            <th style="width: 6.25%">收货单位：</th>
+            <td style="width: 53.5%">{{ consigeeName }}</td>
           </tr>
         </table>
       </div>
@@ -124,12 +164,12 @@
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto;font-size:20px;margin-top: 10px;"
+          style="margin: auto; font-size: 20px; margin-top: 10px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
-            <th style="width :14.5%">签收人：</th>
+            <th style="width: 14.5%">签收人：</th>
           </tr>
         </table>
       </div>
@@ -139,12 +179,12 @@
           border="0"
           cellpadding="10"
           cellspacing="0"
-          style="margin: auto;font-size:20px;margin-top: 10px;"
+          style="margin: auto; font-size: 20px; margin-top: 10px"
           width="1000px"
           class="tablePart6"
         >
           <tr>
-            <th style="width :14.5%">签收时间：</th>
+            <th style="width: 14.5%">签收时间：</th>
           </tr>
         </table>
       </div>
@@ -185,8 +225,8 @@ export default {
           materialModel: "",
           materialNumber: 0,
           materialWeight: 0,
-          makeDate: ""
-        }
+          makeDate: "",
+        },
       ],
       carrierName: "",
       province: "",
@@ -197,7 +237,7 @@ export default {
       year: new Date().getFullYear(),
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
-      htmlTitle: "客户换票送货单"
+      htmlTitle: "客户换票送货单",
     };
   },
   created() {
@@ -217,7 +257,7 @@ export default {
       let orderNumber = this.$route.query.orderNumber;
       this.axios
         .post("/api/v1/tms/getDeliveryOrder?orderNumber=" + orderNumber)
-        .then(res => {
+        .then((res) => {
           console.log(res);
           this.orderNumber = res.data.orderNumber;
           this.carrierName = res.data.carrierName;
@@ -238,8 +278,8 @@ export default {
     },
     backScan() {
       this.$router.go(-2);
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -275,6 +315,11 @@ export default {
     border-top: 0px;
     text-align: center;
   }
+  .tablePart9 td,
+  th {
+    border-top: 0px;
+    text-align: center;
+  }
 }
 .blank {
   width: 100%;