Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/salesContractAdd.vue

@@ -224,6 +224,12 @@
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
+          <!--结算重量方式-->
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly"
+          v-if="deptBudgetList.deliverType==1">
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按收货重量结算</el-radio>
+        </ws-form-item>
           <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
               size="small" />
@@ -457,6 +463,7 @@
           addressUrl: '',
           sourceGoods: '',
           placeDelivery: '',
+          settlementWeightMethod: '1',
         },
         pickerBeginDateBefore: {
           disabledDate: (time) => {

src/views/contractManagement/salesContractEdit.vue

@@ -230,6 +230,13 @@
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
+          <!--结算重量方式-->
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
+            </div>
+            <span class="unchangeable">*</span>
+          </ws-form-item>
           <!-- 最终实际交易量（吨） -->
           <ws-form-item label="最终实际交易量（吨）" span="1" prop="totalContractPrice">
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"

src/views/contractManagement/salesContractExamine.vue

@@ -200,7 +200,12 @@
               {{ deptBudgetList.signingDate }}
             </div>
           </ws-form-item>
-
+          <!--结算重量方式-->
+          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod">
+            <div class="unchanged">
+              {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按收货重量结算' }}
+            </div>
+          </ws-form-item>
           <ws-form-item label="最终实际交易量 (吨)" span="1" prop="finalTradingVolume">
             <div class="unchanged">
               {{ deptBudgetList.finalTradingVolume }}
@@ -208,7 +213,7 @@
           </ws-form-item>
         </ws-info-table>
 
-        <!--面试信息-->
+        <!--货物信息-->
         <div class="remark">
           <h3>货物信息</h3>
         </div>

src/views/taskManagement/tranManagementTransportAdd.vue

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

src/views/taskManagement/tranManagementTransportEdit.vue

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

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -72,11 +72,19 @@
                 <el-input type="text" class="row-item" v-model="deptBudgetList.deliveryDateEnd" disabled></el-input>
               </el-form-item>
             </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-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-row>
           <div class="small-title" style="font-size: 16px">联络员及航次</div>
           <el-row class="myTest">

src/views/tranManagement/tranManagementShippingLook.vue

@@ -56,7 +56,9 @@
               <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 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>
           </div>
 

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -84,9 +84,15 @@
           {{ deptBudgetList.deliveryDateEnd }}
         </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 }}
         </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>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -70,9 +70,15 @@
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
         </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 }}
         </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>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -70,9 +70,17 @@
               </el-form-item>
             </el-col>
             <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-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-row>
           <div class="small-title" style="font-size: 16px">派车</div>

src/views/tranManagement/tranManagementVehicleLook.vue

@@ -79,9 +79,15 @@
           deptBudgetList.deliveryDateEnd
         }}</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
         }}</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>
       <div class="small-title" style="font-size: 16px">派车</div>
        <div class="myTest">