Browse Source

前端 sdy

zhongtianhaoyuan 3 years ago
parent
commit
49362cb438

+ 13 - 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">
+          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px" v-show="dataList.priceType != '随行就市'">
             {{dataList.unitPrice}}
           </el-form-item>
           <!--预计出库日期-->
@@ -668,7 +668,19 @@ export default {
               this.dataList = response[0]
             }
           }
+          xialaNo({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+					})
+					.toPromise()
+					.then(response1 => {
+            for(let i = 0 ; i < response1.length ; i++){
+               if(response1[i].contractNo == this.dataList.contractNo){
+                 this.dataList.priceType = response1[i].priceType
+               }
+            }
+					})
         })
+        
     },
   }
 }

+ 1 - 7
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -204,7 +204,7 @@
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" v-show="Pricetype1">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" >
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -490,7 +490,6 @@
 				},
 				accessoryTFs: false,
 				Pricetype:true,//价格类型为随行就市隐藏单价
-				Pricetype1:true,//价格类型为随行就市隐藏单价
 			}
 		},
 		activated() {
@@ -696,11 +695,6 @@
 				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.Pricetype1 = false
-							}else{
-								this.Pricetype1 = true
-							}
 							getGoodsName({
 									contractId: this.contractNoList[i].id,
 									contractNo: this.contractNoList[i].contractNo

+ 10 - 3
src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -192,7 +192,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"
               v-model="dataList.unitPrice"
@@ -604,7 +604,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
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.unitPrice"
@@ -771,7 +771,9 @@ export default {
         }
       },
       accessoryTFs: false,
-      inOutFlag: 1
+      inOutFlag: 1,
+		Pricetype :true
+
     }
   },
   activated() {
@@ -868,6 +870,11 @@ export default {
       if (this.dataList.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