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

src/views/contractManagement/salesContractAdd.vue

@@ -67,8 +67,10 @@
               placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-            <el-radio v-model="deptBudgetList.deliverType" label="1">我方送货</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" label="2">对方自提</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">我方送货</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">对方自提</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
           </ws-form-item>
           <!--买方电话-->
           <ws-form-item label="买方电话" span="1" prop="contractNo">
@@ -1433,7 +1435,11 @@
           }
         }
       },
-      selectpriceType(e) {},
+      selectpriceType(e) {
+        if(e=='随行就市'){
+          this.deptBudgetList.deliverType = '1'
+        }
+      },
       weightchange(e) {
         this.deptBudgetList.finalTradingVolume = e
       },