前端

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -92,7 +92,11 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号" width="140">
+        <el-table-column class="table_td" prop="processNo" label="运输任务编号/合同编号" width="140">
+          <template scope="scope">
+            <span v-if='processNo'>{{scope.row.processNo}}</span>
+            <span v-else>{{scope.row.contractNo}}</span>
+          </template>
         </el-table-column>
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
@@ -255,7 +259,8 @@ export default {
         { value: '汽运', type: 1 },
         { value: '火运', type: 2 },
         { value: '船运', type: 3 },
-        { value: '全部', type: 4 },
+        { value: '他运', type: 4 },
+        { value: '全部', type: 5 },
       ],
       // 提交类型
       submitType: true,

src/views/tranManagement/tranManagementthirdpartnarReceiving.vue

@@ -52,10 +52,10 @@
           }}{{ deptBudgetList.receiveArea }}
         </ws-form-item>
       </ws-info-table>
-      <div  class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
+      <div  v-show='status' class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
         汽运反馈
       </div>
-      <div class="liaison">
+      <div  v-show='status' class="liaison">
         <div
           style="width: 100% justify-content: space-between;align-items:center;"
           class="flex"
@@ -98,7 +98,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
+      <div v-show='status1' class='flex' style="font-size: 16px;justify-content: space-between;align-items:center;margin-top:10px;">
         火运反馈
       </div>
       <div v-show='status1' class="liaison">
@@ -459,9 +459,9 @@ export default {
     },
     submit() {
       var tranCarInfoList1=[],tranCarInfoList2=[],tranCarInfoList3=[],tranCarInfoList4=[]
-      if(this.checkList.indexOf('汽运')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('汽运')!=-1){
         for(let i = 0 ; i < this.freightspace.length ; i++){
-          if (!this.freightspace[i].unloadNetWeight) {
+          if (!String(this.freightspace[i].unloadNetWeight)) {
             this.$message({
               message: '卸车净重不能为空！',
               type: 'warning',
@@ -481,9 +481,9 @@ export default {
         }
         tranCarInfoList1=this.freightspace
       }
-      if(this.checkList.indexOf('火运')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('火运')!=-1){
         for(let i = 0 ; i < this.freightspace1.length ; i++){
-          if (!this.freightspace1[i].unloadNetWeight) {
+          if (!String(this.freightspace1[i].unloadNetWeight)) {
             this.$message({
               message: '卸车净重不能为空！',
               type: 'warning',
@@ -503,9 +503,9 @@ export default {
         }
         tranCarInfoList2=this.freightspace1
       }
-      if(this.checkList.indexOf('散船')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('散船')!=-1){
         for(let i = 0 ; i < this.freightspace2.length ; i++){
-          if (!this.freightspace2[i].unloadNetWeight) {
+          if (!String(this.freightspace2[i].unloadNetWeight)) {
             this.$message({
               message: '卸船净重不能为空！',
               type: 'warning',
@@ -525,9 +525,9 @@ export default {
         }
         tranCarInfoList3=this.freightspace2
       }
-      if(this.checkList.indexOf('集装箱船')!=-1){
+      if(this.deptBudgetList.threeTranType.indexOf('集装箱船')!=-1){
         for(let i = 0 ; i < this.freightspace3.length ; i++){
-          if (!this.freightspace3[i].unloadNetWeight) {
+          if (!String(this.freightspace3[i].unloadNetWeight)) {
             this.$message({
               message: '卸船净重不能为空！',
               type: 'warning',
@@ -586,8 +586,7 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           if(response.threeTranType){
-            this.checkList=response.threeTranType.split(',')
-            if(this.checkList.indexOf('汽运')!=-1){
+            if(response.threeTranType.indexOf('汽运')!=-1){
               this.status=true
               for (let i = 0; i < response.tranCarInfoList1.length; i++) {
                 if(response.tranCarInfoList1[i].unloadNetWeight){
@@ -601,7 +600,7 @@ export default {
             }else{
               this.status=false
             }
-            if(this.checkList.indexOf('火运')!=-1){
+            if(response.threeTranType.indexOf('火运')!=-1){
               this.status1=true
               for (let i = 0; i < response.tranCarInfoList2.length; i++) {
                 if(response.tranCarInfoList2[i].unloadNetWeight){
@@ -620,7 +619,7 @@ export default {
             }else{
               this.status1=false
             }
-            if(this.checkList.indexOf('散船')!=-1){
+            if(response.threeTranType.indexOf('散船')!=-1){
               this.status2=true
               for (let i = 0; i < response.tranCarInfoList3.length; i++) {
                 if(response.tranCarInfoList3[i].unloadNetWeight){
@@ -639,7 +638,7 @@ export default {
             }else{
               this.status2=false
             }
-            if(this.checkList.indexOf('集装箱船')!=-1){
+            if(response.threeTranType.indexOf('集装箱船')!=-1){
               this.status3=true
               for (let i = 0; i < response.tranCarInfoList4.length; i++) {
                 if(response.tranCarInfoList4[i].unloadNetWeight){