添加汽运反馈 不在提醒

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -520,61 +520,61 @@ export default {
           }
         }
       }
-      this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              // this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-              this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.loadNetWeight =
-                this.deptBudgetList.loadNetWeight
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg
-              // this.tranCarInfoList.boxNo = this.arr.toString()
-              for (var i = 0; i < this.tranCarInfoList.length; i++) {
-                this.tranCarInfoList[i].id = this.freightspace[i].id
-                if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
-                  this.tranCarInfoList[i].temporaryDriverFlag = 1
-                  this.tranCarInfoList[i].tranType = this.tranType
-                }
-              }
-              var tranProcessInfo = {}
-              tranProcessInfo.id = this.deptBudgetList.id
-              tranProcessInfo.infoId = this.deptBudgetList.infoId
-              tranProcessInfo.processNo = this.deptBudgetList.processNo
-              tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-              feedback(tranProcessInfo)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('提交成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
-                  })
-                })
-            } else {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
-          })
-        })
-        .catch(() => {
-          return false
-        })
+      // this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning',
+      // })
+      //   .then(() => {
+      //     this.$refs.deptBudgetList.validate((valid) => {
+      //       if (valid) {
+      //         // this.deptBudgetList.totalStorage = this.totalStorage
+      //         this.tranCarInfoList = this.freightspace
+      //         this.tranCarInfoList.driver = this.deptBudgetList.driver
+      //         this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+      //         this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+      //         this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+      //         this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+      //         this.tranCarInfoList.loadNetWeight =
+      //           this.deptBudgetList.loadNetWeight
+      //         this.tranCarInfoList.tranType = this.tranType
+      //         this.tranCarInfoList.loadPoundImg =
+      //           this.deptBudgetList.loadPoundImg
+      //         // this.tranCarInfoList.boxNo = this.arr.toString()
+      //         for (var i = 0; i < this.tranCarInfoList.length; i++) {
+      //           this.tranCarInfoList[i].id = this.freightspace[i].id
+      //           if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+      //             this.tranCarInfoList[i].temporaryDriverFlag = 1
+      //             this.tranCarInfoList[i].tranType = this.tranType
+      //           }
+      //         }
+      //         var tranProcessInfo = {}
+      //         tranProcessInfo.id = this.deptBudgetList.id
+      //         tranProcessInfo.infoId = this.deptBudgetList.infoId
+      //         tranProcessInfo.processNo = this.deptBudgetList.processNo
+      //         tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+      //         tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+      //         // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+      //         feedback(tranProcessInfo)
+      //           .toPromise()
+      //           .then((response) => {
+      //             this.$message.success('提交成功')
+      //             this.deptBudgetList = {}
+      //             this.freightspace = {}
+      //             this.selectedOptions = ''
+      //             this.$router.push({
+      //               path: 'tranManagementTransporHairRespond',
+      //             })
+      //           })
+      //       } else {
+      //         // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+      //         return false
+      //       }
+      //     })
+      //   })
+      //   .catch(() => {
+      //     return false
+      //   })
     },
     getList() {
       seeCat({ id: this.deptBudgetList.id })

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -458,7 +458,9 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          this.freightspace = response.tranCarInfoList
+            if(response.tranCarInfoList){
+            this.freightspace = response.tranCarInfoList
+          }
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -6,94 +6,77 @@
         <h2 class="bg-left title">汽运装车反馈</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
-    <ws-form
-      class="position"
-      ref="deptBudgetList"
-      :rules="rules"
-      :model="deptBudgetList"
-    >
+    <ws-form class="position" ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
-        <ws-form-item label="任务编号" span="1" prop="processNo">
-          {{ deptBudgetList.processNo }}
-        </ws-form-item>
+        <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
         <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">
-          {{ deptBudgetList.goodsName }}
-        </ws-form-item>
+        <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
         <!--重量（吨）-->
-        <ws-form-item label="重量（吨）" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
-        </ws-form-item>
+        <ws-form-item label="重量（吨）" span="1" prop="weight">{{ deptBudgetList.weight }}</ws-form-item>
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
-        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
-          {{ deptBudgetList.sender }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货人"
+          span="1"
+          prop="sender"
+          class="readonly"
+        >{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
         <ws-form-item
           label="发货人电话"
           span="1"
           prop="senderPhone"
           class="readonly"
-        >
-          {{ deptBudgetList.senderPhone }}
-        </ws-form-item>
+        >{{ deptBudgetList.senderPhone }}</ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
         <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">
-          {{ deptBudgetList.receiver }}
-        </ws-form-item>
+        <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
         <!--收货人电话-->
-        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-          {{ deptBudgetList.receiverPhone }}
-        </ws-form-item>
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
-        </ws-form-item>
+        <ws-form-item
+          label="发货日期"
+          span="1"
+          prop="deliveryDateStart"
+        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
-        </ws-form-item>
+        <ws-form-item
+          label="最晚到货日期"
+          span="1"
+          prop="deliveryDateEnd"
+        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
+        <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="tranType">
-          {{ deptBudgetList.tranType }}
-        </ws-form-item>
+        <ws-form-item label="运输方式" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px; width: 50%;float: left;">装车详情</div>
-          <!-- 导入 -->
+      <!-- 导入 -->
       <div style="font-size: 16px; width: 50%;float: left;text-align: right;">
-      <el-upload style="margin-left: 8px;"
-          class=""
+        <el-upload
+          style="margin-left: 8px;"
+          class
           action="https://www.zthymaoyi.com/upload/admin"
           :show-file-list="false"
           :on-success="
@@ -102,10 +85,11 @@
           }
         "
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          >
-          <el-button  type="primary">导入</el-button>
+        >
+          <el-button type="primary">导入</el-button>
         </el-upload>
-        <el-upload style="margin-left: 8px;"
+        <el-upload
+          style="margin-left: 8px;"
           class="upload-demo"
           action="https://www.zthymaoyi.com/upload/admin"
           :show-file-list="false"
@@ -115,11 +99,10 @@
           }
         "
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          >
-          <el-button  type="primary">导入</el-button>
+        >
+          <el-button type="primary">导入</el-button>
         </el-upload>
-       
-    </div>
+      </div>
       <div class="liaison">
         <div
           style="width: 100%"
@@ -130,41 +113,33 @@
           <ws-info-table>
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">
               司机-{{ index + 1 }}
-              <span class="noservice" v-show="item.status == '未装车'">{{
-                  item.status
-                }}</span>
-                <span class="service" v-show="item.status == '已装车'">{{
-                  item.status
-                }}</span>
-                 <span class="serviced" v-show="item.status == '已送达'">{{
-                  item.status
-                }}</span>
+              <span class="noservice" v-show="item.status == '未装车'">
+                {{
+                item.status
+                }}
+              </span>
+              <span class="service" v-show="item.status == '已装车'">
+                {{
+                item.status
+                }}
+              </span>
+              <span class="serviced" v-show="item.status == '已送达'">
+                {{
+                item.status
+                }}
+              </span>
             </div>
             <div
               class="catNos catNosCor"
               v-show="item.temporaryDriverFlag != 0"
-            >
-              司机-{{ index + 1 }}(临)
-            </div>
+            >司机-{{ index + 1 }}(临)</div>
             <!--司机-->
-            <ws-form-item
-              label="姓名："
-              span="1"
-              prop="driver"
-              v-show="item.temporaryDriverFlag == 0"
-            >
-              <span v-show="item.temporaryDriverFlag == 0"
-                >{{ item.driver }}
-              </span>
+            <ws-form-item label="姓名：" span="1" prop="driver" v-show="item.temporaryDriverFlag == 0">
+              <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
             </ws-form-item>
             <!--司机-->
 
-            <ws-form-item
-              label="姓名："
-              span="1"
-              prop="driver"
-              v-show="item.temporaryDriverFlag != 0"
-            >
+            <ws-form-item label="姓名：" span="1" prop="driver" v-show="item.temporaryDriverFlag != 0">
               <el-select
                 v-show="item.temporaryDriverFlag != 0"
                 v-model="item.driver"
@@ -190,9 +165,7 @@
                 maxlength="20"
                 size="small"
               />
-              <span v-show="item.temporaryDriverFlag == 0"
-                >{{ item.driverPhone }}
-              </span>
+              <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
             </ws-form-item>
             <!--车牌号-->
             <ws-form-item label="车牌号：" span="1" prop="carNo">
@@ -203,14 +176,12 @@
                 maxlength="20"
                 size="small"
               />
-              <span v-show="item.temporaryDriverFlag == 0"
-                >{{ item.carNo }}
-              </span>
+              <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
             </ws-form-item>
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
               <ws-input
-                v-if="item.status == '已装车'||item.status == '已送达'" 
+                v-if="item.status == '已装车'||item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.loadNetWeight"
                 placeholder="请输入装车净重"
@@ -218,7 +189,7 @@
                 size="small"
                 style="width:80px"
               />
-               <ws-input
+              <ws-input
                 v-else
                 v-model="item.loadNetWeight"
                 placeholder="请输入装车净重"
@@ -229,35 +200,36 @@
             </ws-form-item>
             <!--装车日期-->
             <ws-form-item label="装车日期:" span="1" prop="sendDateStart">
-            <ws-date-picker
-              v-if="item.status == '已装车'||item.status == '已送达'" 
-              :disabled="readonly"
-              v-model="item.sendDateStart"
-              type="date"
-              class="picker"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
-               <ws-date-picker
-              v-else
-              v-model="item.sendDateStart"
-              type="date"
-              class="picker"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
-          </ws-form-item>
+              <ws-date-picker
+                v-if="item.status == '已装车'||item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.sendDateStart"
+                type="date"
+                class="picker"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+              <ws-date-picker
+                v-else
+                v-model="item.sendDateStart"
+                type="date"
+                class="picker"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+            </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <!-- slot-scope="scope" -->
-              <template >
+              <template>
                 <el-upload
                   action="https://www.zthymaoyi.com/upload/admin"
                   :show-file-list="false"
                   :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
                   class="avatar-uploader"
                   accept=".jpg, .jpeg, .png, .gif"
-                  ><img
+                >
+                  <img
                     width="18"
                     height="20"
                     style="
@@ -265,31 +237,33 @@
                       position: relative;
                     "
                     src="../../../public/img/fujian.png"
-                    alt=""
+                    alt
                   />
                 </el-upload>
-                 <!-- <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg" >1</span>
-                 <span
+                <span v-if="deptBudgetList.tranCarInfoList[index].loadPoundImg != null ">1</span>
+                <span
                   v-if="
-                    !deptBudgetList.tranCarInfoList[index].loadPoundImg 
+                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
                   "
-                  >未上传</span> -->
+                >未上传</span>
               </template>
             </ws-form-item>
-              <!--箱号-->
+            <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo">
-             <span>{{ item.caseNo }}</span>
+              <span>{{ item.caseNo }}</span>
             </ws-form-item>
-              <!--封号-->
+            <!--封号-->
             <ws-form-item label="封号:" span="1" prop="titleNo">
-             <span>{{ item.titleNo }}</span>
+              <span>{{ item.titleNo }}</span>
             </ws-form-item>
-               <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
-                  {{ item.signStatus }}
-                </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
-                  {{ item.signStatus }}
-                </div>
+            <div
+              v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'"
+              class="signStatus"
+            >{{ item.signStatus }}</div>
+            <div
+              v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'"
+              class="signStatus1"
+            >{{ item.signStatus }}</div>
             <span
               v-show="item.temporaryDriverFlag != 0"
               width="22"
@@ -297,49 +271,43 @@
               class="del"
               @click="del(index)"
               src="../../../public/img/del.png"
-              alt=""
-              >×</span
-            >
+              alt
+            >×</span>
           </ws-info-table>
         </div>
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
         <!--阶段状态-->
-         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
-          未完货
-        </span>
-        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+        <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">未完货</span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">
+          {{
           deptBudgetList.feedbackStatus
-        }}</span>
+          }}
+        </span>
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
         <div class="spans">添加临时用车</div></el-button
-      > -->
+      >-->
     </ws-form>
     <!-- 提交 -->
-    <div style="margin-left: 1300px;" >
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit(deptBudgetList)"
-        >提交</el-button
-      >
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="finished (deptBudgetList)"
-        >完货</el-button
-      >
+    <div style="margin-left: 1300px;">
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="finished (deptBudgetList)">完货</el-button>
     </div>
   </div>
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback, getbank ,state,importApplFileUrl} from '@/model/transport/index'
+import {
+  seeCat,
+  packList,
+  feedback,
+  getbank,
+  state,
+  importApplFileUrl
+} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -347,7 +315,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    mapDrag,
+    mapDrag
   },
   watch: {
     vesselId(val) {
@@ -355,13 +323,12 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
       deptBudgetList: {
-        totalStorage: 0,
-        
+        totalStorage: 0
       },
       options_: regionData,
       heightData: '600px',
@@ -374,7 +341,7 @@ export default {
       district: null,
       driverList: [],
       readonly: true,
-      fileTemp:{},
+      fileTemp: {},
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -383,21 +350,21 @@ export default {
           {
             required: true,
             message: '请输入仓库名称',
-            trigger: 'blur',
+            trigger: 'blur'
           },
           {
             min: 2,
             max: 20,
             message: '仓库名长度不符合要求，请输入2-20字符之内',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       tranType: 1,
       size: 10,
       value1: '',
       unitList: [],
-    
+
       freightspace1: [
         {
           accountTypeFlag: '1',
@@ -406,8 +373,8 @@ export default {
           compName: '',
           bankDeposit: '',
           addressUrlArray: [],
-          bankCard: '',
-        },
+          bankCard: ''
+        }
       ],
       freightspace: [
         {
@@ -415,36 +382,40 @@ export default {
           driverPhone: '',
           carNo: '',
           loadNetWeight: '',
-          loadPoundImg:''
-        },
-          
+          loadPoundImg: ''
+        }
+        // {loadPoundImg:{}},
       ],
       name: '',
       staffList: [],
       options: [],
       carModel: [],
       tranCarInfoList: {
-        loadPoundImg:''
+        loadPoundImg: ''
       },
       //上传
       accessoryTFs: false,
       fileList: [],
       appendixIdsAdd: '',
+      messageAddEventListener: ''
     }
   },
   activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
+  mounted() {
+    window.noMessege = this.noMessege
+  },
   computed: {
-    totalStorage: function () {
+    totalStorage: function() {
       var maxStorage = 0
       for (var i = 0; i < this.freightspace.length; i++) {
         maxStorage += Number(this.freightspace[i].maxStorage)
       }
       return maxStorage
     },
-    total: function () {
+    total: function() {
       if (this.deptBudgetList.tranCarInfoList != null) {
         var maxStorage = 0
         for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
@@ -456,24 +427,24 @@ export default {
       } else {
         return 0
       }
-    },
+    }
   },
   methods: {
-    uploadSuccessHandle1(e){
-console.log(document.getElementsByClassName("upload-demo"))
-
+    uploadSuccessHandle1(e) {
+      console.log(document.getElementsByClassName('upload-demo'))
     },
     uploadSuccessHandle(e) {
       console.log(e)
-      importApplFileUrl({file:e.url}) .toPromise()
-                .then((response) => {
-                  console.log(response)
-                })
+      importApplFileUrl({ file: e.url })
+        .toPromise()
+        .then(response => {
+          console.log(response)
+        })
     },
     dataFilter(val) {
       this.deptBudgetList.personCharge = val
       if (val) {
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -494,7 +465,7 @@ console.log(document.getElementsByClassName("upload-demo"))
         }
       }
     },
-    marker: function (item) {
+    marker: function(item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
     },
@@ -515,7 +486,7 @@ console.log(document.getElementsByClassName("upload-demo"))
         driver: '',
         driverPhone: '',
         carNo: '',
-        loadNetWeight: '',
+        loadNetWeight: ''
       })
     },
     del(index) {
@@ -541,29 +512,27 @@ console.log(document.getElementsByClassName("upload-demo"))
       this.accessoryTFs = false
     },
     //导入
-    import(){
-
-    },
-    finished(){
-       this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
+    import() {},
+    finished() {
+      this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               state(tranProcessInfo)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('完货成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
                   this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
+                    path: 'tranManagementTransporHairRespond'
                   })
                 })
             } else {
@@ -574,7 +543,53 @@ console.log(document.getElementsByClassName("upload-demo"))
         .catch(() => {
           return false
         })
-
+    },
+    noMessege() {
+      sessionStorage.setItem('qy-msg',"true")
+    },
+    validateFunc() {
+      this.$refs.deptBudgetList.validate(valid => {
+        if (valid) {
+          // this.deptBudgetList.totalStorage = this.totalStorage
+          this.tranCarInfoList = this.freightspace
+          this.tranCarInfoList.driver = this.deptBudgetList.driver
+          this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+          this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+          this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+          this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
+          this.tranCarInfoList.tranType = this.tranType
+          this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+          // this.tranCarInfoList.boxNo = this.arr.toString()
+          for (var i = 0; i < this.tranCarInfoList.length; i++) {
+            this.tranCarInfoList[i].id = this.freightspace[i].id
+            if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+              this.tranCarInfoList[i].temporaryDriverFlag = 1
+              this.tranCarInfoList[i].tranType = this.tranType
+            }
+          }
+          var tranProcessInfo = {}
+          tranProcessInfo.id = this.deptBudgetList.id
+          tranProcessInfo.infoId = this.deptBudgetList.infoId
+          tranProcessInfo.processNo = this.deptBudgetList.processNo
+          tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+          tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+          // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+          feedback(tranProcessInfo)
+            .toPromise()
+            .then(response => {
+              this.$message.success('提交成功')
+              this.deptBudgetList = {}
+              this.freightspace = {}
+              this.selectedOptions = ''
+              this.$router.push({
+                path: 'tranManagementTransporHairRespond'
+              })
+            })
+        } else {
+          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+          return false
+        }
+      })
     },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
@@ -582,101 +597,66 @@ console.log(document.getElementsByClassName("upload-demo"))
           if (!this.freightspace[i].driver) {
             this.$message({
               message: '司机姓名不能为空！',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
           if (!this.freightspace[i].driverPhone) {
             this.$message({
               message: '司机电话不能为空！',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
           if (!this.freightspace[i].carNo) {
             this.$message({
               message: '车牌号不能为空！',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
           if (!this.freightspace[i].loadNetWeight) {
             this.$message({
               message: '装载净重不能为空！',
-              type: 'warning',
+              type: 'warning'
             })
             return
           }
         }
       }
-      this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
-            if (valid) {
-              // this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-              this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-              this.tranCarInfoList.loadNetWeight =
-                this.deptBudgetList.loadNetWeight
-              this.tranCarInfoList.tranType = this.tranType
-              this.tranCarInfoList.loadPoundImg =
-                this.deptBudgetList.loadPoundImg 
-              // this.tranCarInfoList.boxNo = this.arr.toString()
-              for (var i = 0; i < this.tranCarInfoList.length; i++) {
-                this.tranCarInfoList[i].id = this.freightspace[i].id
-                if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
-                  this.tranCarInfoList[i].temporaryDriverFlag = 1
-                  this.tranCarInfoList[i].tranType = this.tranType
-                }
-              }
-              var tranProcessInfo = {}
-              tranProcessInfo.id = this.deptBudgetList.id
-              tranProcessInfo.infoId = this.deptBudgetList.infoId
-              tranProcessInfo.processNo = this.deptBudgetList.processNo
-              tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-              feedback(tranProcessInfo)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('提交成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporHairRespond',
-                  })
-                })
-            } else {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
+      if (sessionStorage.getItem('qy-msg')) {
+        this.validateFunc()
+      } else {
+        this.$alert(
+          '<div><strong>提交成功后提醒司机及时签订运输合同，确定提交装车信息？</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
+          '',
+          {
+            dangerouslyUseHTMLString: true,
+            distinguishCancelAndClose: true,
+            showCancelButton: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消'
+          }
+        )
+          .then(() => {
+            this.validateFunc()
           })
-        })
-        .catch(() => {
-          return false
-        })
+          .catch(() => {
+            return false
+          })
+      }
     },
+
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()
     },
     getList() {
       seeCat({ id: this.deptBudgetList.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
           //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if(response.tranCarInfoList.length > 0){
-                this.freightspace = response.tranCarInfoList
-          }
-         
+          this.freightspace = response.tranCarInfoList
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
@@ -686,14 +666,14 @@ console.log(document.getElementsByClassName("upload-demo"))
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.options = response
           this.staffList = response
         })
       //车型
       packList({ constId: 'TRAN5' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.carModel = response
         })
     },
@@ -737,11 +717,10 @@ console.log(document.getElementsByClassName("upload-demo"))
         }
       }
     },
-    uploadSuccessHandle1(e,index) {
-
+    uploadSuccessHandle1(e, index) {
       this.freightspace[index].loadPoundImg = e.url
-    },
-  },
+    }
+  }
 }
 </script>
 
@@ -787,7 +766,7 @@ console.log(document.getElementsByClassName("upload-demo"))
   height: 300px;
 }
 .el-form {
-  padding: 0 10%;
+  padding: 0 15%;
 }
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
@@ -945,8 +924,8 @@ console.log(document.getElementsByClassName("upload-demo"))
       display: none;
     }
   }
-  /deep/ .picker{
-     padding-right: 3px !important;
+  /deep/ .picker {
+    padding-right: 3px !important;
   }
 
   // .is-disabled {
@@ -1063,7 +1042,7 @@ console.log(document.getElementsByClassName("upload-demo"))
   width: 20%;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 40%;
+  width: 50%;
   background: #f6f7fc;
 }
 /deep/.liaison .flex {
@@ -1122,10 +1101,10 @@ console.log(document.getElementsByClassName("upload-demo"))
   border: 1px solid #5473e8;
   padding: 0 3px;
   margin-left: 18px;
-  color: #5473E8;
+  color: #5473e8;
   line-height: 24px;
 }
-.line{
+.line {
   height: 26px;
   margin-top: 6px;
   left: 2px;
@@ -1147,10 +1126,7 @@ console.log(document.getElementsByClassName("upload-demo"))
   background: #e5f1f7;
   color: #50cad4;
 }
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   padding: 0px;
 }
-/deep/.el-input--suffix .el-input__inner{
-  padding-right: 0px;
-}
 </style>