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

src/views/contractManagement/purchaseContractEdit.vue

@@ -62,6 +62,7 @@
         </ws-form-item>
         <!-- 交货方式 -->
         <ws-form-item label="结算方式" span="1" prop="settlementMethod">
+          
           <ws-input
             v-model="deptBudgetList.settlementMethod"
             maxlength="100"
@@ -80,7 +81,7 @@
           span="1"
           prop="sourceGoods"
         >
-          {{ deptBudgetList.deliverType }}
+          {{ deptBudgetList.deliverType1 }}
         </ws-form-item>
         <!-- 买方电话 -->
         <ws-form-item label="买方电话" span="1" prop="buyerPhone">
@@ -602,6 +603,7 @@ export default {
       examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
+         
           if (response.weight) {
             response.weight = String(response.weight)
           }
@@ -632,12 +634,18 @@ export default {
             ].code
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
+          if(this.deptBudgetList.deliverType == 1){
+            this.deptBudgetList.deliverType1 = "我方自提"
+          }else if(this.deptBudgetList.deliverType == 2){
+            this.deptBudgetList.deliverType1 = "对方送货" 
+          }
         })
       // 包装方式
       packList({ constId: 'CON1' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response
+          
         })
       // 验收方式
       this.getUnitList()
@@ -694,6 +702,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
+           
           this.unitList = response
           let currItem
           this.unitList.forEach((item, index, arr) => {
@@ -706,6 +715,7 @@ export default {
           if (currItem) {
             this.selectContract(currItem.constValue)
           }
+          
         })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件

src/views/contractManagement/purchaseContractExamine.vue

@@ -52,8 +52,8 @@
         <ws-form-item label="卖方" span="1" prop="seller"
           >{{ deptBudgetList.seller }}
         </ws-form-item>
-        <ws-form-item label="交货方式" span="1" prop="deliverType"
-          >{{ deptBudgetList.deliverType }}
+        <ws-form-item label="交货方式" span="1" prop="deliverType1"  
+          >{{ deptBudgetList.deliverType1 }}
         </ws-form-item>
         <ws-form-item label="买方电话" span="1" prop="buyerPhone"
           >{{ deptBudgetList.buyerPhone }}
@@ -64,7 +64,7 @@
         <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
           {{ deptBudgetList.sellerPhone }}
         </ws-form-item>
-        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
+        <ws-form-item label="验收方式" span="1" prop="acceptanceMethod" >
           {{ deptBudgetList.acceptanceMethod }}
         </ws-form-item>
         <ws-form-item label="重量（吨）" span="1" prop="weight">
@@ -263,6 +263,11 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          if(this.deptBudgetList.deliverType == 1){
+            this.deptBudgetList.deliverType1 = "我方自提"
+          }else if(this.deptBudgetList.deliverType == 2){
+            this.deptBudgetList.deliverType1 = "对方送货" 
+          }
         })
       // 包装方式
       packList({ constId: 'CON1' })

src/views/contractManagement/salesContractEdit.vue

@@ -77,7 +77,7 @@
           <!--交货方式-->
           <ws-form-item label="交货方式" span="1" prop="contractNo">
             <div class="unchanged">
-              {{ deptBudgetList.deliverType }}
+              {{ deptBudgetList.deliverType1 }}
             </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
@@ -689,6 +689,7 @@ export default {
             ].code
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
+          
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -725,6 +726,11 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          if(this.deptBudgetList.deliverType == 1){
+            this.deptBudgetList.deliverType1 = "我方自提"
+          }else if(this.deptBudgetList.deliverType == 2){
+            this.deptBudgetList.deliverType1 = "对方送货" 
+          }
           this.unitList = response
           let currItem
           this.unitList.forEach((item, index, arr) => {

src/views/contractManagement/salesContractExamine.vue

@@ -63,7 +63,7 @@
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="deliverType">
             <div class="unchanged">
-              {{ deptBudgetList.deliverType }}
+              {{ deptBudgetList.deliverType1 }}
             </div>
           </ws-form-item>
           <ws-form-item label="买方电话" span="1" prop="buyerPhone">
@@ -371,6 +371,11 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
+          if(this.deptBudgetList.deliverType == 1){
+            this.deptBudgetList.deliverType1 = "我方自提"
+          }else if(this.deptBudgetList.deliverType == 2){
+            this.deptBudgetList.deliverType1 = "对方送货" 
+          }
         })
       // 包装方式
       packList({ constId: 'CON1' })