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

src/views/contractManagement/purchaseContractAdd.vue

@@ -76,6 +76,12 @@
         <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="seller" class="readonly">
@@ -175,14 +181,20 @@
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
+        <!--价格类型-->
+          <ws-form-item label="价格类型" span="1" prop="priceType">
+            <ws-select v-model="deptBudgetList.priceType" placeholder="请选择价格类型" @change="selectpriceType">
+              <ws-option v-for="item in priceTypeList" :key="item" :label="item" :value="item" />
+            </ws-select>
+          </ws-form-item>
         <!--合同单价（元/吨）-->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
           <ws-input @input="pricechange" v-model="deptBudgetList.unitContractPrice" placeholder="请输入合同单价"
             maxlength="100" size="small" />
         </ws-form-item>
 
         <!--合同总价-->
-        <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
+        <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
           <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
         </ws-form-item>
 
@@ -465,6 +477,7 @@
           },
         ],
         contractNoList: [],
+        priceTypeList: ['定价销售', '随行就市'],
         goodnameList: [],
         value1: '袋装',
         value2: '未回收',
@@ -546,6 +559,11 @@
       if (!this.restaurants4) this.restaurants4 = [];
     },
     methods: {
+      selectpriceType(e) {
+        if (e == '随行就市') {
+          this.deptBudgetList.deliverType = '1'
+        }
+      },
       feedbackLeaderChange(e){
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
@@ -1006,49 +1024,59 @@
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
-          this.$message({
-            message: '请输入合同单价！',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          isNaN(this.deptBudgetList.unitContractPrice) ||
-          (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
-            String(this.deptBudgetList.unitContractPrice).length -
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
-            2) ||
-          this.deptBudgetList.unitContractPrice <= 0 ||
-          this.deptBudgetList.unitContractPrice > 10000
-        ) {
-          this.$message({
-            message: '合同单价输入有误！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.totalContractPrice) {
+        if (!this.deptBudgetList.priceType) {
           this.$message({
-            message: '请输入合同总价！',
+            message: '请选择价格类型',
             type: 'warning',
           })
           return
         }
-        if (
-          isNaN(this.deptBudgetList.totalContractPrice) ||
-          (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
-            String(this.deptBudgetList.totalContractPrice).length -
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
-            2) ||
-          this.deptBudgetList.totalContractPrice <= 0 ||
-          this.deptBudgetList.totalContractPrice > 1000000000
-        ) {
-          this.$message({
-            message: '合同总价输入有误！',
-            type: 'warning',
-          })
-          return
+        if (this.deptBudgetList.priceType == '定价销售') {
+          if (!this.deptBudgetList.unitContractPrice) {
+            this.$message({
+              message: '请输入合同单价！',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            isNaN(this.deptBudgetList.unitContractPrice) ||
+            (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
+              String(this.deptBudgetList.unitContractPrice).length -
+              (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
+              2) ||
+            this.deptBudgetList.unitContractPrice <= 0 ||
+            this.deptBudgetList.unitContractPrice > 10000
+          ) {
+            this.$message({
+              message: '合同单价输入有误！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.deptBudgetList.totalContractPrice) {
+            this.$message({
+              message: '请输入合同总价！',
+              type: 'warning',
+            })
+            return
+          }
+          if (
+            isNaN(this.deptBudgetList.totalContractPrice) ||
+            (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
+              String(this.deptBudgetList.totalContractPrice).length -
+              (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
+                1) >
+              2) ||
+            this.deptBudgetList.totalContractPrice <= 0 ||
+            this.deptBudgetList.totalContractPrice > 1000000000
+          ) {
+            this.$message({
+              message: '合同总价输入有误！',
+              type: 'warning',
+            })
+            return
+          }
         }
         if (!this.newSelectedOptions) {
           this.$message({

src/views/contractManagement/purchaseContractEdit.vue

@@ -131,14 +131,18 @@
           <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
+        <!--价格类型-->
+          <ws-form-item label="价格类型" span="1" prop="priceType">          
+              {{ deptBudgetList.priceType }}
+          </ws-form-item>
         <!-- 合同单价（元/吨） -->
-        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice">
+        <ws-form-item class="readonly" label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
           <span v-if="deptBudgetList.unitContractPrice != 'null'">{{
             deptBudgetList.unitContractPrice
           }}</span>
         </ws-form-item>
         <!-- 合同总价（元） -->
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
           <ws-input v-model="deptBudgetList.totalContractPrice" maxlength="100" placeholder="请输入合同单价" size="small" />
         </ws-form-item>
         <!-- 货源所在地区 -->

src/views/contractManagement/purchaseContractExamine.vue

@@ -95,10 +95,13 @@
         <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
-        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice">
+        <ws-form-item label="价格类型" span="1" prop="priceType">
+          {{ deptBudgetList.priceType }}
+        </ws-form-item>
+        <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
           {{ deptBudgetList.unitContractPrice }}
         </ws-form-item>
-        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
+        <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
           {{ deptBudgetList.totalContractPrice }}
         </ws-form-item>
         <ws-form-item label="货源所在地区" span="1">

src/views/contractManagement/salesContractEdit.vue

@@ -165,17 +165,21 @@
             <ws-date-picker v-model="deptBudgetList.deliveryDateEnd" type="date" placeholder="请选择交货日期（止）"
               value-format="yyyy-MM-dd" />
           </ws-form-item>
-
+          <!--价格类型-->
+          <ws-form-item label="价格类型" span="1" prop="priceType">
+            <div class="unchanged">
+              {{ deptBudgetList.priceType }}
+            </div>
+          </ws-form-item>
           <!--合同单价（元/吨）-->
-          <ws-form-item label="合同单价（元/吨）" span="1" prop="contractNo">
+          <ws-form-item label="合同单价（元/吨）" span="1" prop="contractNo" v-if="deptBudgetList.priceType == '定价销售'">
             <div class="unchanged">
               {{ deptBudgetList.unitContractPrice }}
             </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
-
           <!--合同总价-->
-          <ws-form-item label="合同总价" span="1" prop="contractNo">
+          <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
           </ws-form-item>
           <!--签订日期-->

src/views/contractManagement/salesContractExamine.vue

@@ -139,13 +139,17 @@
               {{ deptBudgetList.deliveryDateEnd }}
             </div>
           </ws-form-item>
-          <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice">
+          <ws-form-item label="价格类型" span="1" prop="priceType">
+            <div class="unchanged">
+              {{ deptBudgetList.priceType }}
+            </div>
+          </ws-form-item>
+          <ws-form-item label="合同单价（元/吨）" span="1" prop="unitContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
             <div class="unchanged">
               {{ deptBudgetList.unitContractPrice }}
             </div>
           </ws-form-item>
-
-          <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice">
+          <ws-form-item label="合同总价（元）" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
             <div class="unchanged">
               {{ deptBudgetList.totalContractPrice }}
             </div>

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -115,7 +115,7 @@
             {{dataList.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="dataList.priceType != '随行就市'" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
@@ -123,9 +123,9 @@
             {{dataList.predictDate}}
           </el-form-item>
           	<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1">
+					<!-- <el-form-item label="预估运费（元/吨）" span="1">
               {{dataList.estimatedFreight}}
-					</el-form-item>
+					</el-form-item> -->
           <!--发货人-->
           <el-form-item label="发货人">
             {{dataList.agent}}
@@ -223,7 +223,7 @@
             {{dataList1.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype" v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3'>
             {{dataList1.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
@@ -231,9 +231,9 @@
             {{dataList1.predictDate}}
           </el-form-item>
           		<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
               {{dataList1.estimatedFreight}}
-          </el-form-item>
+          </el-form-item> -->
           <!--收货人-->
           <el-form-item label="收货人">
             <el-option
@@ -337,7 +337,7 @@
             {{dataList.waterContent}}
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype">
             {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
@@ -345,9 +345,9 @@
             {{dataList.predictDate}}
           </el-form-item>
           		<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
           {{dataList.estimatedFreight}}
-					</el-form-item>
+					</el-form-item> -->
           <!--发货人-->
           <el-form-item label="发货人">
             {{dataList.agent}}
@@ -484,6 +484,7 @@ export default {
         month: dayjs().format('MM')
       },
       contractList: [],
+      Pricetype:true,
       inOutTaskNo: '',
       inOutTaskNo1: '',
       dataList: { taskTypeKey: '1' },
@@ -673,11 +674,15 @@ export default {
 					})
 					.toPromise()
 					.then(response1 => {
-            for(let i = 0 ; i < response1.length ; i++){
-               if(response1[i].contractNo == this.dataList.contractNo){
-                 this.dataList.priceType = response1[i].priceType
-               }
-            }
+             for (let i = 0; i < response1.length; i++) {
+                if (response1[i].contractNo == this.dataList.contractNo) {
+                    if(response1[i].priceType == "随行就市"){
+                      this.Pricetype = false
+                    }else{
+                      this.Pricetype = true
+                    }
+                }
+             }
 					})
         })
         

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -109,10 +109,10 @@
 							value-format="yyyy-MM-dd" />
 					</el-form-item>
 						<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1">
+					<!-- <el-form-item label="预估运费（元/吨）" span="1">
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small" type="number"/>
-					</el-form-item>
+					</el-form-item> -->
 					<!--经办人-->
 					<el-form-item label="发货人">
             <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
@@ -204,7 +204,7 @@
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" >
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -215,10 +215,10 @@
 							value-format="yyyy-MM-dd" />
 					</el-form-item>
 							<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small" type="number" />
-					</el-form-item>
+					</el-form-item> -->
 					<!-- 经办人-->
 					<el-form-item label="收货人">
             <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable :filter-method="dataFilter1"
@@ -323,10 +323,10 @@
 							value-format="yyyy-MM-dd" />
 					</el-form-item>
 							<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small" type="number" />
-					</el-form-item>
+					</el-form-item> -->
 					<!--发货人-->
 					<el-form-item label="发货人">
             <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
@@ -709,6 +709,11 @@
 				if (this.dataList1.taskTypeKey != 3) {
 					for (let i = 0; i < this.contractNoList.length; i++) {
 						if (this.contractNoList[i].contractNo == e) {
+							if(this.contractNoList[i].priceType == "随行就市"){
+								this.Pricetype = false
+							}else{
+								this.Pricetype = true
+							}
 							getGoodsName({
 									contractId: this.contractNoList[i].id,
 									contractNo: this.contractNoList[i].contractNo
@@ -894,13 +899,13 @@
 						})
 						return
 					}
-				    if (isNaN(this.dataList.estimatedFreight)) {
-						this.$message({
-							message: '预估运费输入错误！',
-							type: 'warning'
-						})
-						return
-					}
+				    // if (isNaN(this.dataList.estimatedFreight)) {
+					// 	this.$message({
+					// 		message: '预估运费输入错误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					// if (!this.dataList.agent) {
 					//   this.$message({
 					//     message: '出库经办人不能为空！',
@@ -1044,13 +1049,13 @@
 						})
 						return
 					}
-					 if (isNaN(this.dataList1.estimatedFreight)) {
-						this.$message({
-							message: '预估运费输入错误！',
-							type: 'warning'
-						})
-						return
-					}
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
+					// 	this.$message({
+					// 		message: '预估运费输入错误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					// if (!this.dataList1.agent) {
 					//   this.$message({
 					//     message: '入库经办人不能为空！',
@@ -1117,13 +1122,13 @@
 						})
 						return
 					}
-					 if (isNaN(this.dataList1.estimatedFreight)) {
-						this.$message({
-							message: '预估运费输入错误！',
-							type: 'warning'
-						})
-						return
-					}
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
+					// 	this.$message({
+					// 		message: '预估运费输入错误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					if (!this.dataList1.predictDate) {
 						this.$message({
 							message: '预计入库日期不能为空！',
@@ -1303,13 +1308,13 @@
 						})
 						return
 					}
-					 if (isNaN(this.dataList1.estimatedFreight)) {
-						this.$message({
-							message: '预估运费输入错误！',
-							type: 'warning'
-						})
-						return
-					}
+					//  if (isNaN(this.dataList1.estimatedFreight)) {
+					// 	this.$message({
+					// 		message: '预估运费输入错误！',
+					// 		type: 'warning'
+					// 	})
+					// 	return
+					// }
 					// if (!this.dataList.agent) {
 					//   this.$message({
 					//     message: '出库经办人不能为空！',

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -223,7 +223,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -249,14 +249,14 @@
             />
           </el-form-item>
           <!--预估运费（元/吨）-->
-          <el-form-item label="预估运费（元/吨）" span="1">
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
             <el-input
               v-model="dataList.estimatedFreight"
               placeholder="请输入预估运费"
               maxlength="20"
               size="small"
             />
-          </el-form-item>
+          </el-form-item> -->
           <!--收货人-->
           <el-form-item label="发货人">
             <el-select
@@ -478,7 +478,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -505,14 +505,14 @@
             />
           </el-form-item>
           <!--预估运费（元/吨）-->
-          <el-form-item label="预估运费（元/吨）" span="1">
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
             <el-input
               v-model="dataList1.estimatedFreight"
               placeholder="请输入预估运费"
               maxlength="20"
               size="small"
             />
-          </el-form-item>
+          </el-form-item> -->
           <!--收货人-->
           <el-form-item label="收货人">
             <el-select
@@ -716,7 +716,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype">
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -741,14 +741,14 @@
             />
           </el-form-item>
           <!--预估运费（元/吨）-->
-          <el-form-item label="预估运费（元/吨）" span="1">
+          <!-- <el-form-item label="预估运费（元/吨）" span="1">
             <el-input
               v-model="dataList.estimatedFreight"
               placeholder="请输入预估运费"
               maxlength="20"
               size="small"
             />
-          </el-form-item>
+          </el-form-item> -->
           <!--发货人-->
           <el-form-item label="发货人">
             <el-select
@@ -907,6 +907,7 @@ export default {
       onChange: {},
       deptBudgetList1: [],
       gradeList: [],
+      Pricetype:true,
       rules: {
         netWeight: [
           {
@@ -1407,6 +1408,15 @@ export default {
         .toPromise()
         .then((response) => {
           this.contractNoList = response
+          for (let i = 0; i <  this.contractNoList.length; i++) {
+              if ( this.contractNoList[i].contractNo == this.dataList.contractNo) {
+                  if( this.contractNoList[i].priceType == "随行就市"){
+                    this.Pricetype = false
+                  }else{
+                    this.Pricetype = true
+                  }
+              }
+            }
         })
       //仓库名
       getwarehousename({

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -206,10 +206,10 @@
             />
           </el-form-item>
           		<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input  v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
-					</el-form-item>
+					</el-form-item> -->
           <!--发货人-->
           <el-form-item label="发货人">
             <el-select
@@ -386,7 +386,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="Pricetype">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -407,10 +407,10 @@
             />
           </el-form-item>
           		<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
-					</el-form-item>
+					</el-form-item> -->
           <!-- 经办人-->
           <el-form-item label="收货人">
             <el-select
@@ -605,10 +605,10 @@
             />
           </el-form-item>
           		<!--预估运费（元/吨）-->
-					<el-form-item label="预估运费（元/吨）" span="1" >
+					<!-- <el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
-					</el-form-item>
+					</el-form-item> -->
           <!--发货人-->
           <el-form-item label="出库发货人">
             <el-select
@@ -883,6 +883,11 @@ export default {
       if (this.dataList1.taskTypeKey != 3) {
         for (let i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
+            	if(this.contractNoList[i].priceType == "随行就市"){
+								this.Pricetype = false
+							}else{
+								this.Pricetype = true
+							}
             getGoodsName({
               contractId: this.contractNoList[i].id,
               contractNo: this.contractNoList[i].contractNo
@@ -1599,6 +1604,15 @@ export default {
         .toPromise()
         .then(response => {
           this.contractNoList = response
+          for (let i = 0; i < this.contractNoList.length; i++) {
+            if (this.contractNoList[i].contractNo == this.dataList.contractNo) {
+                if(this.contractNoList[i].priceType == "随行就市"){
+                  this.Pricetype = false
+                }else{
+                  this.Pricetype = true
+                }
+            }
+          }
         })
       // //临时仓库入库类型
       // pullDown({ constId: 'WARE1' })

src/views/warehouse/warehouseManagementAdd.vue

@@ -448,8 +448,7 @@
             .then(() => {
               this.$refs.deptBudgetList.validate((valid) => {
                 if (valid) {
-                  // this.deptBudgetList.otherPersonCharge=this.deptBudgetList.otherPersonCharge.toString()
-                  this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.toString()
+                  this.deptBudgetList.otherPersonPhone =this.deptBudgetList.otherPersonPhone?this.deptBudgetList.otherPersonPhone.toString():''
                   this.deptBudgetList.compId =
                     localStorage.getItem('ws-pf_compId')
                   this.deptBudgetList.warehousePositionInfoList =
@@ -552,7 +551,7 @@
                   this.deptBudgetList.warehousePositionInfoList =
                     this.freightspace
                   this.deptBudgetList.totalStorage = this.totalStorage
-                  this.deptBudgetList.otherPersonPhone = this.deptBudgetList.otherPersonPhone.toString()
+                  this.deptBudgetList.otherPersonPhone =this.deptBudgetList.otherPersonPhone?this.deptBudgetList.otherPersonPhone.toString():''
                   if (this.radio == 2) {
                     this.deptBudgetList.warehousetype == 2
                   }

src/views/warehouse/warehouseManagementGross.vue

@@ -2407,7 +2407,6 @@ export default {
             }
             this.deptBudgetList.inOutTypeKey = 6
           }
-          console.log(this.outContractNo[i])
           // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
           this.cost = this.outContractNo[i].contractPrice
           if (this.cost) {
@@ -2424,6 +2423,9 @@ export default {
           } else {
             this.isSelectType = true
           }
+          if(this.outContractNo[i].priceType=='随行就市'){
+             this.disabled1 = !this.disabled1
+          }
           if (this.outContractNo[i].deliverType == '1') {
             this.carstatus = true
           } else {
@@ -2440,7 +2442,6 @@ export default {
     contractNoChange1(e) {
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
-          console.log(this.outContractNo[i])
           if (this.outContractNo[i].inOutType == '采购入库') {
             this.deptBudgetList.inOutTypeKey = 1
           } else if (this.outContractNo[i].inOutType == '移库入库') {

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -710,6 +710,9 @@ export default {
           }else{
             this.isSelectType = true
           }
+          if(this.outContractNo[i].priceType=='随行就市'){
+             this.disabled1 = !this.disabled1
+          }
           if(this.outContractNo[i].tranCarInfoList){
             this.options2=this.outContractNo[i].tranCarInfoList
             this.tranCarInfoList=this.outContractNo[i].tranCarInfoList