zhangyuewww 3 年之前
父節點
當前提交
15a24f83fe

+ 1 - 1
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -726,7 +726,7 @@ export default {
         })
         })
       xialaNo({
       xialaNo({
         compId: this.compId,
         compId: this.compId,
-        flag: 8,
+        flag: 7,
       })
       })
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {

+ 1 - 0
src/views/taskManagement/tranManagementTransportEdit.vue

@@ -746,6 +746,7 @@ export default {
         })
         })
       xialaNo({
       xialaNo({
         compId: this.compId,
         compId: this.compId,
+        flag: 7,
       })
       })
         .toPromise()
         .toPromise()
         .then((response) => {
         .then((response) => {

+ 10 - 2
src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -72,11 +72,19 @@
                 <el-input type="text" class="row-item" v-model="deptBudgetList.deliveryDateEnd" disabled></el-input>
                 <el-input type="text" class="row-item" v-model="deptBudgetList.deliveryDateEnd" disabled></el-input>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="合同编号" prop="contractNo">
+             <el-col :span="8">
+              <el-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
+              </el-form-item>
+              <el-form-item v-else label="合同编号" span="1" prop="contractNo">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
+             <el-col :span="8">
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
           </el-row>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <el-row class="myTest">
           <el-row class="myTest">

+ 3 - 1
src/views/tranManagement/tranManagementShippingLook.vue

@@ -56,7 +56,9 @@
               <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}
               <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}
               </ws-form-item>
               </ws-form-item>
               <!--合同编号-->
               <!--合同编号-->
-              <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+              <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+              <ws-form-item v-else label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
+              <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">{{ deptBudgetList.relatedContract }}</ws-form-item>
             </ws-info-table>
             </ws-info-table>
           </div>
           </div>
 
 

+ 7 - 1
src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -84,9 +84,15 @@
           {{ deptBudgetList.deliveryDateEnd }}
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         </ws-form-item>
         <!--合同编号-->
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
+         <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         </ws-form-item>
+        <ws-form-item v-else label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">
+          {{ deptBudgetList.relatedContract }}
+        </ws-form-item>
       </ws-info-table>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
       <div class="myTest">

+ 7 - 1
src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -70,9 +70,15 @@
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
         </ws-form-item>
-        <ws-form-item label="合同编号" span="1" prop="contractNo">
+        <ws-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         </ws-form-item>
+        <ws-form-item v-else label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <ws-form-item v-if="deptBudgetList.relatedContract" label="关联合同" span="1" prop="relatedContract">
+          {{ deptBudgetList.relatedContract }}
+        </ws-form-item>
       </ws-info-table>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
       <div class="myTest">

+ 9 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -70,9 +70,17 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="8">
             <el-col :span="8">
-              <el-form-item label="合同编号" span="1" prop="contractNo">
+              <el-form-item v-if="deptBudgetList.taskType=='移库'" label="移库编号" span="1" prop="contractNo">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
               </el-form-item>
               </el-form-item>
+              <el-form-item v-else label="合同编号" span="1" prop="contractNo">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
+              </el-form-item>
+            </el-col>
+             <el-col :span="8">
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
+                <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
+              </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
           <div class="small-title" style="font-size: 16px">派车</div>
           <div class="small-title" style="font-size: 16px">派车</div>

+ 7 - 1
src/views/tranManagement/tranManagementVehicleLook.vue

@@ -79,9 +79,15 @@
           deptBudgetList.deliveryDateEnd
           deptBudgetList.deliveryDateEnd
         }}</ws-form-item>
         }}</ws-form-item>
         <!--合同编号-->
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo">{{
+        <ws-form-item label="移库编号" v-if="deptBudgetList.taskType=='移库'" span="1" prop="contractNo">{{
           deptBudgetList.contractNo
           deptBudgetList.contractNo
         }}</ws-form-item>
         }}</ws-form-item>
+        <ws-form-item label="合同编号" v-else span="1" prop="contractNo">{{
+          deptBudgetList.contractNo
+        }}</ws-form-item>
+        <ws-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="contractNo">{{
+          deptBudgetList.relatedContract
+        }}</ws-form-item>  
       </ws-info-table>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">派车</div>
       <div class="small-title" style="font-size: 16px">派车</div>
        <div class="myTest">
        <div class="myTest">