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 = ["index", "appoint"];
 
 // 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/domesticMine/wagonLoadAdd.vue

@@ -1,9 +1,8 @@
 <template>
-  <!-- 添加车皮装车实绩 -->
+  <!-- 国产矿导入-->
   <div class="addWagonLoad">
     <page-title>返回</page-title>
     <div class="cp">
-      <span >车皮号:</span>
       <el-upload style="margin: 8px;"
           class="upload-excel"
           action=""
@@ -11,15 +10,20 @@
           :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
-          <el-button  type="primary">导入</el-button>
+          <el-button  type="primary">导入车皮号(Excel)</el-button>
       </el-upload>
-      <span >当前导入数量：{{tableData.length}}</span>
+      <div style="margin-right:200px;">当前导入数量：{{tableData.length}}</div>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>下载Excel模板</el-button>
+    </div>
+    <div>
+      <span style="color:red">导入数据中的 品名、发货单位、车号、发站 是必须的</span>
     </div>
     <div class="table item">
       <el-table
         stripe
         :data="tableData"
-        style="width: 100%">
+        style="width: 100%"
+        id="domesticTable">
         <el-table-column
         type="index"
         width="50"
@@ -216,6 +220,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -274,7 +279,7 @@ export default {
       sendStationId:null,
       toTheStationId:1,
       sendStation:null,
-      toTheStation:"老区轨道衡"
+      toTheStation:"老区轨道衡",
     };
   },
   watch: {
@@ -523,10 +528,14 @@ export default {
         row.resultLoadingDate=sjTime(that.form1.resultLoadingDate);//装车日期
         row.resultRemarks=that.form1.resultRemarks;//备注
       })
-      console.log(that.tableData);
+      let data={
+        list:this.tableData,
+        userId:getCookie("userId")
+      }
+      console.log(data);
       //请求添加
       this.axios
-        .post("/api/v1/tms/addDomesticLoadResult", that.tableData)
+        .post("/api/v1/tms/addDomesticLoadResult", data)
         .then((res) => {
           console.log(res);
           if (res.data.code == "200") {
@@ -570,9 +579,30 @@ export default {
           if(rows.length>0){
             that.disable=false;
             that.tableData=[];
-            if((typeof rows[0]['车号'])=='undefined' || (typeof rows[0]['发站'])=='undefined' ){
-              that.$message({
-                message: "导入Excel格式错误，请参考下方表头格式!",
+            if((typeof rows[0]['车号'])=='undefined'){
+               that.$message({
+                message: "导入Excel格式错误，车号不能为空!",
+                type: "warning",
+              });
+              return;
+            }
+            if((typeof rows[0]['品  名'])=='undefined' && (typeof rows[0]['品名'])=='undefined' && (typeof rows[0]['物资'])=='undefined'){
+               that.$message({
+                message: "导入Excel格式错误，品名不能为空!",
+                type: "warning",
+              });
+              return;
+            }
+            if((typeof rows[0]['发货单位'])=='undefined'){
+               that.$message({
+                message: "导入Excel格式错误，发货单位不能为空!",
+                type: "warning",
+              });
+              return;
+            }
+            if((typeof rows[0]['发站']) =='undefined'){
+               that.$message({
+                message: "导入Excel格式错误，发站不能为空!",
                 type: "warning",
               });
               return;
@@ -581,6 +611,7 @@ export default {
           //绑定数据
           rows.forEach((row,index) => {
             let carNumber=row['车号'];
+            let currentRow=index+1;
             if((typeof carNumber)!="undefined" && carNumber.length == 7){
               //表格数据
               let temp={
@@ -599,15 +630,26 @@ export default {
               if(typeof temp.materialName=='undefined' || temp.materialName==null){
                 temp.materialName=row['物资'];
               }
+              //判断校验
+              if((typeof temp.wagonNo)=='undefined' ||
+                  (typeof temp.materialName)=='undefined'||
+                  (typeof temp.supplierName)=='undefined'||
+                  (typeof temp.sendStation)=='undefined'){
+                console.log("数据异常:");
+                console.log(row);
+                return;//退出当前循环，不导入表格
+              }
+              
               that.tableData.push(temp);
             }
             else{
-              console.log("车号"+carNumber+"不是7位数!");
+              console.log("第"+currentRow+ "行车皮号异常!");
+              return;
             }
         });
         };
         reader.readAsBinaryString(file.raw); //以二进制方式读取
-    }
+    },
   },
 };
 </script>

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

@@ -51,6 +51,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
  data(){
@@ -168,6 +169,7 @@ export default {
         arrivalStationId: this.toTheStationId,
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         resultRemarks: this.form1.resultRemarks,
+        userId:getCookie("userId"),
         resultType:3
       };
       console.log(tmstrainLoadingResult)

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

@@ -116,6 +116,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -202,8 +203,10 @@ export default {
       else{
         let map = {
           resultIdList:this.selecTionListMap,
-          purchaseOrderId:this.purchaseOrderId
+          purchaseOrderId:this.purchaseOrderId,
+          userId:getCookie("userId")
         }
+        console.log(map);
         let that=this;
         this.axios.post('/api/v1/tms/updateDomesticLoadResult',map).then((res)=>{
           console.log(res.data.data)

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

@@ -173,6 +173,7 @@ export default {
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         resultRemark: this.form1.resultRemark,
         unloadingPointId:this.unloadPointId,
+        insertUsername:getCookie("userId"),
         resultType: 3,
       };
       console.log(tmstrainWagonUnloadResult);

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

@@ -16,6 +16,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -62,6 +63,7 @@ export default {
         unloadingPointId: this.form1.unloadingPointId,
         resultBigTicketWeight: this.form1.resultBigTicketWeight,
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
+        updateUsername:getCookie("userId"),
         resultRemark: this.form1.resultRemark,
       };
       console.log(tmstrainWagonUnloadResult);
@@ -77,7 +79,7 @@ export default {
             "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
             tmstrainWagonUnloadResult
           )
-          .then(() => {
+          .then((res) => {
             if (res.data.code == "200") {
               this.$message({
                 type: "success",

src/views/TMS/components/importedEmergency/addWagonLoadEmergency.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 添加车皮装车实绩 -->
+  <!-- 海港-老区轨道衡新增装车  -->
   <div class="addWagonLoad">
     <page-title>返回</page-title>
     <div class="purchaseOrder_table">
@@ -55,6 +55,9 @@
       </el-upload>
       <span >当前导入数量：{{tableData.length}}</span>
     </div>
+    <div>
+      <span style="color:red">导入数据中的 车皮号 是必须的</span>
+    </div>
     <div class="table item"
         style="width:680px;
         height:300px;
@@ -242,6 +245,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -596,6 +600,7 @@ export default {
           arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
+          userId:getCookie("userId"),
           resultType:2,
         }
         console.log(map);
@@ -670,7 +675,9 @@ export default {
               that.tableData.push(temp);
             }
             else{
-              console.log("车皮号"+carNumber+"不是7位数!");
+              let errorNumb=index+1;
+              console.log("第"+errorNumb+ "行车皮号异常!");
+              return;
             }
         });
         };

src/views/TMS/components/importedEmergency/addWagonUnLoadEmergency.vue

@@ -91,6 +91,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -169,6 +170,7 @@ export default {
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         resultRemark: this.form1.resultRemark,
         unloadingPointId:this.unloadPointId,
+        insertUsername:getCookie("userId"),
         resultType: 2,
       };
       console.log(tmstrainWagonUnloadResult);

src/views/TMS/components/importedEmergency/editWagonLoadEmergency.vue

@@ -52,6 +52,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -179,12 +180,12 @@ export default {
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
-        resultMaterialNumber: this.form1.resultMaterialNumber,
-        resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks,
+        purchaseOrderNo:this.form1.purchaseOrderNo,
+        userId:getCookie("userId"),
         resultType:2
       };
-      console.log(tmstrainLoadingResult)
+      console.log(tmstrainLoadingResult);
       if (
         tmstrainLoadingResult.resultWagonNo == null ||
         tmstrainLoadingResult.sendStationId == null ||
@@ -199,12 +200,19 @@ export default {
             "/api/v1/tms/upadteTmstrainLoadingResultByResultId",
             tmstrainLoadingResult
           )
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "修改成功!",
-            });
-            this.$router.go(-1);
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$message({
+                type: "success",
+                message: "修改成功!",
+              });
+              this.$router.go(-1);
+            }else{
+               this.$message({
+                type: "error",
+                message: res.data.data,
+              });
+            }
           });
     },
   },

src/views/TMS/components/importedEmergency/editWagonUnLoadEmergency.vue

@@ -17,6 +17,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
  data(){
@@ -59,6 +60,7 @@ export default {
         unloadingPointId: this.form1.unloadingPointId,
         resultBigTicketWeight: this.form1.resultBigTicketWeight,
         resultRailHorizontalWeight: this.form1.resultRailHorizontalWeight,
+        updateUsername:getCookie("userId"),
         resultRemark: this.form1.resultRemark
       };
       if (tmstrainWagonUnloadResult.resultWagonNo==null
@@ -70,7 +72,7 @@ export default {
           "/api/v1/tms/upadteTmstrainWagonUnLoadResultByUnLoadingId",
           tmstrainWagonUnloadResult
         )
-       .then(() => {
+       .then((res) => {
           this.$message({
             type: "success",  
             message: "修改成功!",

src/views/TMS/components/importedMine/addWagonLoad.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 添加车皮装车实绩 -->
+  <!-- 万州港-达州新增装车 -->
   <div class="addWagonLoad">
     <page-title>返回</page-title>
     <div class="purchaseOrder_table">
@@ -55,6 +55,9 @@
       </el-upload>
       <span >当前导入数量：{{tableData.length}}</span>
     </div>
+    <div>
+      <span style="color:red">导入数据中的 车皮号 是必须的</span>
+    </div>
     <div class="table item"
         style="width:680px;
         height:300px;
@@ -242,6 +245,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -596,6 +600,7 @@ export default {
           arrivalStationId: this.toTheStationId,
           resultLoadingDate: sjTime(this.form1.resultLoadingDate),
           resultRemarks: this.form1.resultRemarks,
+          userId:getCookie("userId"),
           resultType:1,
         }
         console.log(map);
@@ -670,7 +675,9 @@ export default {
               that.tableData.push(temp);
             }
             else{
-              console.log("车皮号"+carNumber+"不是7位数!");
+              let errorNumb=index+1;
+              console.log("第"+errorNumb+ "行车皮号异常!");
+              return;
             }
         });
         };

src/views/TMS/components/importedMine/addWagonUnLoad.vue

@@ -94,6 +94,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime,isNumber } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -171,6 +172,7 @@ export default {
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         resultRemark: this.form1.resultRemark,
         unloadingPointId:this.unloadPointId,
+        insertUsername:getCookie("userId"),
         resultType: 1,
       };
       console.log(tmstrainWagonUnloadResult);

src/views/TMS/components/importedMine/editWagonLoad.vue

@@ -53,6 +53,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime, isNumber } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -176,11 +177,13 @@ export default {
         resultLoadingDate: sjTime(this.form1.resultLoadingDate),
         batchId: this.form1.batchId,
         capacityId: this.form1.capacityId,
-        resultMaterialNumber: this.form1.resultMaterialNumber,
         resultMaterialTheoryweight: this.form1.resultMaterialTheoryweight,
         resultRemarks: this.form1.resultRemarks,
+        purchaseOrderNo:this.form1.purchaseOrderNo,
+        userId:getCookie("userId"),
         resultType:1
       };
+      console.log(tmstrainLoadingResult);
       if (
         tmstrainLoadingResult.resultId ==null ||
         tmstrainLoadingResult.resultIsclear == null ||
@@ -202,6 +205,7 @@ export default {
                 type: "success",
                 message: "修改成功!",
               });
+                this.$router.go(-1);
             }else{
                this.$message({
                 type: "error",
@@ -209,7 +213,7 @@ export default {
               });
             }
 
-            this.$router.go(-1);
+          
           });
     },
   },

src/views/TMS/components/importedMine/editWagonUnLoad.vue

@@ -18,6 +18,7 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import {getCookie} from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
@@ -63,6 +64,7 @@ export default {
         resultArrivalDate: sjTime(this.form1.resultArrivalDate),
         resultUnloadTime: sjTime(this.form1.resultUnloadTime),
         unloadingPointId: this.form1.unloadingPointId,
+        updateUsername:getCookie("userId"),
         resultRemark: this.form1.resultRemark,
       };
       console.log(tmstrainWagonUnloadResult);

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/saleContract/addSaleOrderSteelSend.vue

@@ -169,7 +169,7 @@
 
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="loading">确定</el-button>
     </div>
   </div>
 </template>
@@ -188,6 +188,7 @@ export default {
       pos: 0,
       //加载
       selectLineLoading: false,
+      loading:false,
       //所有选中承运商Id和承运商名称暂存
       carrierIdAndName: [],
       //承运商下拉框中的值
@@ -522,6 +523,8 @@ export default {
     },
     //点击确定按钮的事件
     makeSure() {
+      this.loading=true;
+      return;
       if (this.canSend == -1) {
         this.$message.warning("电话号码格式不正确,请输入正确的电话号码!");
       } else {
@@ -572,6 +575,7 @@ export default {
                 } else {
                   this.$message.error("派单失败:" + res.data.data);
                 }
+                this.loading=false;
               });
           })
           .catch(() => {

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

@@ -158,7 +158,7 @@
 
     <div class="button_box">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
+      <el-button type="primary" @click="makeSure" :loading="isLoading">确定</el-button>
     </div>
   </div>
 </template>
@@ -171,6 +171,8 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      //是否正在加载
+      isLoading:false,
       //存放每一行记录的合并数
       spanArr: [],
       //pos是spanArr的索引
@@ -475,6 +477,7 @@ export default {
     },
     //点击确定按钮的事件
     makeSure() {
+      this.isLoading=true;
       //是否可发送请求
       if (this.canSend == -1) {
         this.$message.warning("电话号码格式不正确,请输入正确的电话号码!");
@@ -520,6 +523,7 @@ export default {
                 } else {
                   this.$message.error("派单失败:" + res.data.data);
                 }
+                this.isLoading=false;
               });
           })
           .catch(() => {

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

@@ -5,6 +5,46 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="113" v-model="form1" ref="from1"></dil-form>
+        <el-form>
+        <div class="preview-group">
+            <el-form-item label="承运单位:">
+                <el-select
+                v-model="carrierId"
+                filterable >
+                <el-option
+                  v-for="carrier in carriers"
+                  :key="carrier.id"
+                  :label="carrier.label"
+                  :value="carrier.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="提货单位:">
+                <el-select
+                v-model="downSwimPortId"
+                filterable >
+                <el-option
+                  v-for="carrier in carriers"
+                  :key="carrier.id"
+                  :label="carrier.label"
+                  :value="carrier.id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="到达港:">
+                <el-select
+                v-model="portId"
+                filterable >
+                <el-option
+                  v-for="port in ports"
+                  :key="port.portId"
+                  :label="port.portName"
+                  :value="port.portId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+        </div>
+        </el-form>
       </div>
       <div class="liulan">
         <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
@@ -53,6 +93,12 @@ export default {
   data() {
     return {
       input: "",
+      carrierId:"",//承运单位id
+      carriers:[],
+      downSwimPortId:"",//提货单位id
+      downSwimPorts:[],
+      portId:"",//到达港id
+      ports:[],
       drawer: false,
       direction: "rtl",
       options: {
@@ -85,8 +131,39 @@ export default {
   mounted() {
     this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
     this.$set(this.form1, "carrierId", 11);
+    this.getCarriers();
+    this.getPorts();
   },
   methods: {
+    //查询所有承运单位和提货单位
+    getCarriers(){
+      this.axios.get("/api/v1/tms/getPortName").then((res) => {
+          if (res.data.code == 200) {
+            //赋值
+            this.carriers=res.data.data;
+            this.downSwimPorts=res.data.data;
+          } else {
+            this.$message({
+              type: "warning",
+              message: res.data.data,
+            });
+          }
+        });
+    },
+    //查询所有港口
+    getPorts(){
+      this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
+          if (res.data.code == 200) {
+            //赋值
+            this.ports=res.data.data;
+          } else {
+            this.$message({
+              type: "warning",
+              message: res.data.data,
+            });
+          }
+        });
+    },
     getPersonInfo() {
       console.log(this.form1);
       console.log("我尽力了");
@@ -135,20 +212,21 @@ export default {
         return;
       }
       let AmsshipDeliveryAttorney = {
-        carrierId: this.form1.carrierId, //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
+        carrierId: this.carrierId, //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
         requesterGroupId: this.form1.requesterGroupId,
-        downSwimPortId: this.form1.downSwimPortId,
+        downSwimPortId: this.downSwimPortId,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyContactTelephone: this.form1.attorneyContactTelephone,
         batchId: this.batchIds,
         attorneyTime: sjTime(this.form1.attorneyTime),
         attorneyPdffile: this.form1.attorneyPdffile,
         noticeId: this.form1.noticeId,
-        portId: this.form1.portId,
+        portId: this.portId,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
         userId: getCookie("userId"),
         // resultMemo: this.form1.resultMemo,
       };
+      console.log(AmsshipDeliveryAttorney);
       //身份证校验
       function checkCardNo() {
         var value3 = AmsshipDeliveryAttorney.attorenyPickupIdcard;

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

@@ -45,6 +45,22 @@
     </div>
     <div class="form">
       <div class="form_box">
+        <el-form>
+          <div class="preview-group">
+              <el-form-item label="发货港口:">
+                 <el-select
+                 v-model="portId"
+                 filterable >
+                  <el-option
+                    v-for="port in ports"
+                    :key="port.portId"
+                    :label="port.portName"
+                    :value="port.portId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+          </div>
+        </el-form>
         <dil-form
           :formId="112"
           v-model="form1"
@@ -178,7 +194,8 @@ export default {
       a: 1,
       cargoPictureUrl: "",
       shippingCertificate: "",
-     
+      portId:"",
+      ports:[],
       materialType: "",
       receiver: "",
       input: "",
@@ -220,8 +237,23 @@ export default {
   mounted() {
     // this.$set(this.form1, "requesterGroupId", 1); //委托单位（requesterGroupId）承运单位（carrierId）转移到提货委托
     // this.$set(this.form1, "carrierId", 11);
+    this.getPorts();
   },
   methods: {
+    //查询所有港口
+    getPorts(){
+      this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
+          if (res.data.code == 200) {
+            //赋值
+            this.ports=res.data.data;
+          } else {
+            this.$message({
+              type: "warning",
+              message: res.data.data,
+            });
+          }
+        });
+    },
     upCLick(val) {
       this.num = val;
     },
@@ -349,7 +381,7 @@ export default {
         // requesterGroupId: this.form1.requesterGroupId,
         noticeCommerceMethod: this.form1.noticeCommerceMethod,
         noticeHandoverMethod: this.form1.noticeHandoverMethod,
-        portId: this.form1.portId,
+        portId: this.portId,
         noticePortConstructionFee: this.form1.noticePortConstructionFee,
         noticeDeliveryTime: sjTime(this.form1.noticeDeliveryTime),
         noticePileFreeDays: this.form1.noticePileFreeDays,
@@ -378,7 +410,7 @@ export default {
         cargoPictureUrl: this.cargoPictureUrl,
         userId: getCookie("userId"),
       };
-      console.log("mapaaa" + map);
+      console.log(map);
       //判断放货数量是否为数字
       if (
         map.noticeCommerceMethod == null ||

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/appoint/components/ship/modifyDeliveryAttroney.vue

@@ -5,7 +5,47 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="113" v-model="form1"></dil-form>
-      </div>
+          <el-form>
+            <div class="preview-group">
+                <el-form-item label="承运单位:">
+                    <el-select
+                    v-model="carrierId"
+                    filterable >
+                    <el-option
+                      v-for="carrier in carriers"
+                      :key="carrier.id"
+                      :label="carrier.label"
+                      :value="carrier.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="提货单位:">
+                    <el-select
+                    v-model="downSwimPortId"
+                    filterable >
+                    <el-option
+                      v-for="carrier in carriers"
+                      :key="carrier.id"
+                      :label="carrier.label"
+                      :value="carrier.id">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="到达港:">
+                    <el-select
+                    v-model="portId"
+                    filterable >
+                    <el-option
+                      v-for="port in ports"
+                      :key="port.portId"
+                      :label="port.portName"
+                      :value="port.portId">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+            </div>
+          </el-form>
+        </div>
     </div>
     <!-- 确定和取消 -->
     <div class="button_box">
@@ -23,15 +63,52 @@ export default {
   data() {
     return {
       form1: {},
+      carrierId:"",//承运单位id
+      carriers:[],
+      downSwimPortId:"",//提货单位id
+      downSwimPorts:[],
+      portId:"",//到达港id
+      ports:[],
       value2: undefined,
       value3: undefined,
       batchInfactoryId:null,
     };
   },
   mounted() {
+    this.getCarriers();
+    this.getPorts();
     this.information();
   },
   methods: {
+    //查询所有承运单位和提货单位
+    getCarriers(){
+      this.axios.get("/api/v1/tms/getPortName").then((res) => {
+          if (res.data.code == 200) {
+            //赋值
+            this.carriers=res.data.data;
+            this.downSwimPorts=res.data.data;
+          } else {
+            this.$message({
+              type: "warning",
+              message: res.data.data,
+            });
+          }
+        });
+    },
+    //查询所有港口
+    getPorts(){
+      this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
+          if (res.data.code == 200) {
+            //赋值
+            this.ports=res.data.data;
+          } else {
+            this.$message({
+              type: "warning",
+              message: res.data.data,
+            });
+          }
+        });
+    },
     information() {
       //编辑请车作业
       this.axios
@@ -42,6 +119,9 @@ export default {
           res.data.data.forEach((e) => {
             this.batchInfactoryId=e.batchInfactoryId;
             this.form1 = e;
+            this.carrierId=e.carrierId;
+            this.downSwimPortId=e.downSwimPortId;
+            this.portId = e.portId;
             console.log(this.form1.batchId);
           });
         });
@@ -54,13 +134,15 @@ export default {
     onClickConfirm() {
       let AmsshipDeliveryAttorney = {
         resultId: this.$route.params.attorneyId,
-        portId: this.form1.portId,
+        portId: this.portId,
         batchId:this.batchInfactoryId,
         attorneyContactTelephone:this.form1.attorneyContactTelephone,
         attorenyPickupIdcard: this.form1.attorenyPickupIdcard,
         attorneyPickupContactPerson: this.form1.attorneyPickupContactPerson,
-        downSwimPortId: this.form1.downSwimPortId,
+        downSwimPortId: this.downSwimPortId,
         attorneyTime: sjTime(this.form1.attorneyTime),
+        carrierId:this.carrierId,
+        requesterGroupId:this.form1.requesterGroupId
       };
 
       //身份证校验

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

@@ -41,6 +41,22 @@
 
     <div class="form">
       <div class="form_box">
+         <el-form>
+          <div class="preview-group">
+              <el-form-item label="发货港口:">
+                 <el-select
+                 v-model="portId"
+                 filterable >
+                  <el-option
+                    v-for="port in ports"
+                    :key="port.portId"
+                    :label="port.portName"
+                    :value="port.portId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+          </div>
+        </el-form>
         <dil-form :formId="112" v-model="form1"></dil-form>
       </div>
     </div>
@@ -159,6 +175,8 @@ export default {
     return {
       form1: {},
       a: 1,
+      portId:"",
+      ports:[],
       cargoPictureUrl: "",
       shippingCertificate: "",
       materialName: "",
@@ -200,9 +218,24 @@ export default {
     };
   },
   mounted() {
+    this.getPorts();
     this.information();
   },
   methods: {
+    //查询所有港口
+    getPorts(){
+      this.axios.post("/api/v1/rms/getPortName?index=").then((res) => {
+          if (res.data.code == 200) {
+            //赋值
+            this.ports=res.data.data;
+          } else {
+            this.$message({
+              type: "warning",
+              message: res.data.data,
+            });
+          }
+        });
+    },
     information() {
       this.axios
         .post("/api/v1/tms/selectByNoticeId/" + this.$route.params.noticeId)
@@ -210,6 +243,7 @@ export default {
           res.data.data.forEach((e) => {
             console.log("aaa", e);
             this.form1 = e;
+            this.portId=e.portId;
             this.batchId =  e.foreignShipName + e.materialName;
             this.batchIds=e.batchId;
             this.foreignShipName=e.foreignShipName;
@@ -324,7 +358,7 @@ export default {
         // requesterGroupId: this.form1.requesterGroupId,
         noticeCommerceMethod: this.form1.noticeCommerceMethod,
         noticeHandoverMethod: this.form1.noticeHandoverMethod,
-        portId: this.form1.portId,
+        portId: this.portId,
         noticePortConstructionFee: this.form1.noticePortConstructionFee,
         noticeDeliveryTime: sjTime(this.form1.noticeDeliveryTime),
         noticePileFreeDays: this.form1.noticePileFreeDays,

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%;