1

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' })