前端

src/views/houseSelfCollect/inspectInfo.vue

@@ -13,7 +13,7 @@
     </el-row>
     <div class="substance">
       <ws-form>
-        <div style="width: 50%; margin: 0 auto">
+        <div style="width: 80%; margin: 0 auto">
           <div class="title">基本信息</div>
           <ws-info-table>
             <ws-form-item label="仓库" span="1" prop="warehouseName">

src/views/taskManagement/tranManagementLook.vue

@@ -73,7 +73,17 @@
         :key="index"
         class="datafor"
       >
-        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})</div>
+        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})
+          <el-checkbox
+            class="endflag"
+            true-label="1"
+            disabled
+            false-label="0"
+            v-model="item.endFlag"
+            :label="1"
+            >粮款结算阶段</el-checkbox
+          >
+        </div>
         <!-- <div class="neifor"> -->
         <ws-info-table class="el-table">
           <!--运输方式-->

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -89,17 +89,17 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=" span="1">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=" span="1">
 						<el-input disabled @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input disabled @input="waterContentchange" v-model="dataList.waterContent"
 							placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -192,19 +192,19 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<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" />
@@ -300,19 +300,19 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -1069,86 +1069,6 @@
 						})
 						return
 					}
-					if (!this.dataList1.bulkDensity) {
-						this.$message({
-							message: '容重不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.bulkDensity < 500 ||
-						this.dataList1.bulkDensity > 1000
-					) {
-						this.$message({
-							message: '容重输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-						String(this.dataList1.bulkDensity).length -
-						(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-						0
-					) {
-						this.$message({
-							message: '容重需输入整数',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.waterContent) {
-						this.$message({
-							message: '水分不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.waterContent < 0 ||
-						this.dataList1.waterContent > 40
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.waterContent).indexOf('.') != -1 &&
-						String(this.dataList1.waterContent).length -
-						(String(this.dataList1.waterContent).indexOf('.') + 1) >
-						1
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.unitPrice) {
-						this.$message({
-							message: '单价不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						(this.dataList1.unitPrice &&
-							String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-							String(this.dataList1.unitPrice).length -
-							(String(this.dataList1.unitPrice).indexOf('.') + 1) >
-							2) ||
-						this.dataList1.unitPrice > 100000 ||
-						this.dataList1.unitPrice < 1
-					) {
-						this.$message({
-							message: '单价输入错误',
-							type: 'warning'
-						})
-						return
-					}
 					if (!this.dataList.predictDate) {
 						this.$message({
 							message: '预计出库日期不能为空！',
@@ -1598,7 +1518,7 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
-				debugger
+				// debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1
@@ -1775,7 +1695,6 @@
 		position: relative;
 		top: 50px;
 		width: 40%;
-		height: 2000px;
 		margin: 0 auto;
 		margin-right: 180px;
 	}

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -201,7 +201,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -212,7 +212,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -223,7 +223,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -454,7 +454,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -466,7 +466,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -478,7 +478,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -694,7 +694,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"
@@ -705,7 +705,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<="
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<="
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -716,7 +716,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               disabled
               v-model="dataList.unitPrice"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -170,7 +170,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -181,7 +181,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -192,7 +192,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item 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">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -375,7 +375,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -387,7 +387,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -399,7 +399,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item 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">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -582,7 +582,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.bulkDensity"
@@ -593,7 +593,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.waterContent"
@@ -604,7 +604,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item 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">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.unitPrice"
@@ -1271,7 +1271,8 @@ export default {
           })
           return
         }
-        if (!this.dataList1.bulkDensity) {
+        if( this.dataList.taskTypeKey != 3||this.dataList1.taskTypeKey != 3){
+          if (!this.dataList1.bulkDensity) {
           this.$message({
             message: '容重不能为空！',
             type: 'warning'
@@ -1351,6 +1352,8 @@ export default {
           })
           return
         }
+        }
+        
         if (!this.dataList.predictDate) {
           this.$message({
             message: '预计出库日期不能为空！',