前端 小程序样式 sdy

pages/erpbusiness/quality_testing.vue

@@ -89,6 +89,11 @@
 				<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
 			</view>
 		</view> -->
+		<view class='flex buttons'>
+			<view v-if='item.status=="已质检"&&managementType==1' @click.stop='del(item)' class='button'>删除</view>
+			<view v-if='item.status!="已称皮重"&&managementType==1' @click.stop='edit(item)' class='button'>编辑</view>
+			<view v-if='item.status=="已称毛重"&&managementType==3' @click.stop='quality_testing(item)' class='button'>质检</view>
+		</view>
 		</view>
 		
 		<view v-show="isContent">

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -1,311 +1,237 @@
 <template>
 	<view class="warp">
 		<view class="content1">
-			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
-				<u-form-item label="任务类型" prop="receivingAddress" label-width="140">
-					<u-input v-model="OutList.inOutType" input-align="right" placeholder="" disabled v-if="OutList.inOutType"/>
-					<u-input v-model="EnterList.inOutType" input-align="right" placeholder="" disabled v-else/>
+			<u-form :model="OutList" ref="uForm">
+				<u-form-item label="任务类型" prop="inOutType" label-width="140" class="uForm_item">
+					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
+					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
 				<view v-if="retreatList.judge == 3">
 					<!-- 退库 -->
-					<view class="title part2">{{retreatList.inOutType}}</view>
-					<view class='row'>
-						<view class="left">编号</view>
-						<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
+					<view class="uForm_item">
+						<view class="title part2">{{retreatList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">退库（{{retreatList.inOutTaskNo}}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{retreatList.sendWarehouse}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库类型</view>
+							<view class="right">{{retreatList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="retreatList.inOutType == '移库出库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{retreatList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="retreatList.inOutType != '移库出库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{retreatList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{retreatList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{retreatList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计出库日期</view>
+							<view class="right">{{retreatList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{retreatList.publisher}}</view>
+						</view>
 					</view>
-					<view class='row'>
-						<view class="left">仓库</view>
-						<view class="right">{{retreatList.sendWarehouse}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">出库类型</view>
-						<view class="right">{{retreatList.inOutType}}</view>
-					</view>
-					<view class='row' v-if="retreatList.inOutType == '移库出库'">
-						<view class="left">移库任务编号</view>
-						<view class="right">{{retreatList.moveTaskNo}}</view>
-					</view>
-					<view class='row' v-if="retreatList.inOutType != '移库出库'">
-						<view class="left">合同编号</view>
-						<view class="right">{{retreatList.contractNo}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">货名</view>
-						<view class="right">{{retreatList.goodsName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">重量(吨)</view>
-						<view class="right">{{retreatList.weight}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">预计出库日期</view>
-						<view class="right">{{retreatList.predictDate}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">出库经办人</view>
-						<view class="right">{{retreatList.publisher}}</view>
+
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150">
+							<u-input v-model="retreatList.grade" input-align="right" placeholder="" @click='show=true'
+								disabled />
+							<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
+								mode="selector">
+							</u-picker>
+						</u-form-item>
+						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
+							<u-input v-model="retreatList.bulkDensity" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
+							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
+						</u-form-item>
+
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
+							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
+						</u-form-item>
 					</view>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150">
-						<u-input v-model="retreatList.grade" input-align="right" placeholder="" @click='show=true'
-							disabled />
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
-							mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
-						<u-input v-model="retreatList.bulkDensity" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
-						<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
-					</u-form-item>
-					
-					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
-						<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
-					</u-form-item>
-					
+
+
 				</view>
 				<view v-if="OutList.judge == 1">
-					<!-- 出库 -->
-					<view class="title part2">{{OutList.inOutType}}</view>
-					<view class='row'>
-						<view class="left">编号</view>
-						<view class="right">出库（{{OutList.inOutTaskNo}})</view>
-					</view>
-					<view class='row'>
-						<view class="left">仓库</view>
-						<view class="right">{{OutList.sendWarehouse}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">出库类型</view>
-						<view class="right">{{OutList.inOutType}}</view>
-					</view>
-					<view class='row' v-if="OutList.inOutType == '移库出库'">
-						<view class="left">移库任务编号</view>
-						<view class="right">{{OutList.moveTaskNo}}</view>
+					<view class="uForm_item">
+						<!-- 出库 -->
+						<view class="title part2">{{OutList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">出库（{{OutList.inOutTaskNo}})</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{OutList.sendWarehouse}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库类型</view>
+							<view class="right">{{OutList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="OutList.inOutType == '移库出库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{OutList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="OutList.inOutType != '移库出库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{OutList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{OutList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{OutList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计出库日期</view>
+							<view class="right">{{OutList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{OutList.publisher}}</view>
+						</view>
 					</view>
-					<view class='row' v-if="OutList.inOutType != '移库出库'">
-						<view class="left">合同编号</view>
-						<view class="right">{{OutList.contractNo}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">货名</view>
-						<view class="right">{{OutList.goodsName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">重量(吨)</view>
-						<view class="right">{{OutList.weight}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">预计出库日期</view>
-						<view class="right">{{OutList.predictDate}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">出库经办人</view>
-						<view class="right">{{OutList.publisher}}</view>
+
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150" v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
+								disabled />
+							<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
+								mode="selector"></u-picker>
+						</u-form-item>
+						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
+							v-if="retreatList.inOutType != '退库'">
+							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
+							v-if="OutList.inOutType != '移库出库'">
+							<u-input v-model="OutList.businessDescribe" input-align="left" placeholder=""
+								type="textarea" class="textarea" />
+						</u-form-item>
+						<u-form-item v-if="retreatList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber"
+							label-width="170">
+							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
+						</u-form-item>
+
 					</view>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150" v-if="retreatList.inOutType != '退库'">
-						<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
-							disabled />
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
-							mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190" v-if="retreatList.inOutType != '退库'">
-						<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160" v-if="retreatList.inOutType != '退库'">
-						<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160" v-if="retreatList.inOutType != '退库'">
-						<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
-					</u-form-item>
-					<u-form-item  label="业务描述" prop="businessDescribe" label-width="160"label-position="top" v-if="OutList.inOutType != '移库出库'">
-						<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="" type="textarea" class="textarea" />
-					</u-form-item>
-					<u-form-item v-if="retreatList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
-						<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
-					</u-form-item>
+
 				</view>
 				<view v-if="EnterList.judge == 2">
-					<!-- 入库 -->
-					<view class="title part2">{{EnterList.inOutType}}</view>
-					<view class='row'>
-						<view class="left">编号</view>
-						<view class="right">入库（{{EnterList.inOutTaskNo}})</view>
-					</view>
-					<view class='row'>
-						<view class="left">仓库</view>
-						<view class="right">{{EnterList.warehouseName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">入库类型</view>
-						<view class="right">{{EnterList.inOutType}}</view>
-					</view>
-					<view class='row' v-if="EnterList.inOutType == '移库入库'">
-						<view class="left">移库任务编号</view>
-						<view class="right">{{EnterList.moveTaskNo}}</view>
-					</view>
-					<view class='row' v-if="EnterList.inOutType != '移库入库'">
-						<view class="left">合同编号</view>
-						<view class="right">{{EnterList.contractNo}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">货名</view>
-						<view class="right">{{EnterList.goodsName}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">重量(吨)</view>
-						<view class="right">{{EnterList.weight}}</view>
-					</view>
-					<view class='row'>
-						<view class="left">预计入库日期</view>
-						<view class="right">{{EnterList.predictDate}}</view>
+					<view class="uForm_item">
+						<!-- 入库 -->
+						<view class="title part2">{{EnterList.inOutType}}</view>
+						<view class='row'>
+							<view class="left">编号</view>
+							<view class="right">入库（{{EnterList.inOutTaskNo}})</view>
+						</view>
+						<view class='row'>
+							<view class="left">仓库</view>
+							<view class="right">{{EnterList.warehouseName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">入库类型</view>
+							<view class="right">{{EnterList.inOutType}}</view>
+						</view>
+						<view class='row' v-if="EnterList.inOutType == '移库入库'">
+							<view class="left">移库任务编号</view>
+							<view class="right">{{EnterList.moveTaskNo}}</view>
+						</view>
+						<view class='row' v-if="EnterList.inOutType != '移库入库'">
+							<view class="left">合同编号</view>
+							<view class="right">{{EnterList.contractNo}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">货名</view>
+							<view class="right">{{EnterList.goodsName}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">重量(吨)</view>
+							<view class="right">{{EnterList.weight}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">预计入库日期</view>
+							<view class="right">{{EnterList.predictDate}}</view>
+						</view>
+						<view class='row'>
+							<view class="left">出库经办人</view>
+							<view class="right">{{EnterList.publisher}}</view>
+						</view>
 					</view>
-					<view class='row'>
-						<view class="left">出库经办人</view>
-						<view class="right">{{EnterList.publisher}}</view>
+
+					<view class="uForm_item">
+						<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库' ">
+							<u-input v-model="EnterList.grade" input-align="right" placeholder="请选择品级"
+								@click='show=true' disabled />
+							<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show"
+								mode="selector">
+							</u-picker>
+						</u-form-item>
+						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="请输入容重占比" />
+						</u-form-item>
+						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
+						</u-form-item>
+						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
+							v-if="EnterList.inOutType != '移库入库'">
+							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
+						</u-form-item>
+						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
+								<u-input v-model="EnterList.businessDescribe" input-align="left"  placeholder="请输入业务描述"
+								type="textarea" class="textarea" maxlength="150"/>
+						</u-form-item>
+						<u-form-item v-if="OutList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
+							<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
+						</u-form-item>
 					</view>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库' ">
-						<u-input v-model="EnterList.grade" input-align="right" placeholder="请选择品级" @click='show=true'disabled />
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show" mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190" v-if="EnterList.inOutType != '移库入库'">
-						<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="请输入容重占比" />
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="waterContent" label-width="160" v-if="EnterList.inOutType != '移库入库'">
-						<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160" v-if="EnterList.inOutType != '移库入库'">
-						<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
-					</u-form-item>
-					<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
-						<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="请输入业务描述" type="textarea" class="textarea" />
-					</u-form-item>
-					<u-form-item v-if="OutList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
-						<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
-					</u-form-item>
-				</view>
-				<!-- <view v-if="type=='移库'">
-					<view class="title part2">移库入库</view>
-					<u-form-item label="编号" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="入库类型" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="移库任务编号" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="货名" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="预计入库时间" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="入库经办人" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="品级" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
-					</u-form-item>
-					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
-					</u-form-item>
+
 				</view>
-				<view v-if="type=='退库'">
-					<view class="title part2">出</view>
-					<u-form-item label="编号" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="出库类型" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="合同编号" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="货名" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="预计出库时间" prop="receivingAddress" label-width="180">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="出库经办人" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
-					</u-form-item>
-					<u-form-item label="品级" prop="receivingAddress" label-width="150">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" @click='show=true' disabled/>
-						<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show" mode="selector">
-						</u-picker>
-					</u-form-item>
-					<u-form-item label="容重(克/升)>=" prop="receivingAddress" label-width="190">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
-					</u-form-item>
-					<view class="title part2">可编辑项</view>
-					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
-					</u-form-item>
-					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
-						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
-					</u-form-item>
-				</view> -->
 			</u-form>
 		</view>
-		<u-popup v-model="show1" mode="center" class="popup">
-			<view >
-				<view>驳回原因</view>
-					<view style="width:80%;height: 300rpx;padding: 20rpx;border: 2rpx solid #D8DCE6;margin: 0 auto;">
-						<u-input v-model="rejectInfo" :type="textarea" :border="border" height="340rpx" focus />
-					</view>
-					<view class="flex">
-						<u-button @click="show1 = false" class="submit">取消</u-button>
+		<u-popup v-model="show1" mode="center" >
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">驳回原因</view>
+					<u-input v-model="rejectInfo" type="textarea" :border="border"   class="rejectInfoCss" placeholder="请输入驳回原因"/>
+				<view class="flex">
+					<u-button @click="show1 = false" class="submit">取消</u-button>
 					<u-button @click="rejectSubmit()" class="submit">确定</u-button>
-					</view>
-			</view>		
+				</view>
+			</view>
 		</u-popup>
 		<u-toast ref="uToast" />
-		<!-- <u-modal v-model="show" content="确定通过出入库任务？" showCancelButton></u-modal> -->
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="show1 = true">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-				<!-- <u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">{{OutList.taskStatus}}</u-button> -->
-			
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='show1 = true' type="error" class="btn1">驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 
@@ -319,19 +245,14 @@
 		data() {
 			return {
 				id: "",
-				OutList: {},//出
-				EnterList: {},//入
-				retreatList:{},//退
+				OutList: {}, //出
+				EnterList: {}, //入
+				retreatList: {}, //退
 				type: '移库',
 				show: false,
-				show1:false,
-				border:false,
-				rejectInfo:"",
-				purchaseOrder: {
-					freightUnitPrice: "123",
-					receivingAddress: '出库',
-					grade: "1"
-				},
+				show1: false,
+				border: false,
+				rejectInfo: "",//驳回原因
 				pjList: [{
 						type: '一等品'
 					},
@@ -345,23 +266,6 @@
 						type: '等外'
 					}
 				],
-				rules: {
-					freightUnitPrice: [{
-							validator: (rule, value, callback) => {
-								return !this.$u.test.isEmpty(value)
-							},
-							message: '运费不能为空',
-							trigger: ['change', 'blur']
-						},
-						{
-							validator: (rule, value, callback) => {
-								return this.$u.test.amount(value)
-							},
-							message: '数值类型，最多保留两位小数',
-							trigger: ['change', 'blur'],
-						}
-					]
-				}
 			}
 		},
 		onReady() {
@@ -390,13 +294,13 @@
 										res.data.data[i].inOutType == "暂存出库") {
 										this.OutList = res.data.data[i]
 										this.OutList.judge = 1
-									}else if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
+									} else if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
 										.inOutType == "暂存入库" || res
 										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
 										"贸易服务入库") {
 										this.EnterList = res.data.data[i]
 										this.EnterList.judge = 2
-									}else if(res.data.data[i].inOutType == "退库"){
+									} else if (res.data.data[i].inOutType == "退库") {
 										this.retreatList = res.data.data[i]
 										this.retreatList.judge = 3
 									}
@@ -432,9 +336,9 @@
 				}
 			},
 			rejectSubmit() {
-				if(!this.rejectInfo){
+				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
-				}else{
+				} else {
 					if (this.EnterList.taskTypeKey == 1) {
 						this.requestaudit(this.EnterList)
 					} else if (this.EnterList.taskTypeKey == 2) {
@@ -447,7 +351,7 @@
 						if (!this.deletetask) {
 							this.requestaudit(this.EnterList, 'repetition')
 						}
-					}	
+					}
 				}
 			},
 			requestadd(list, status) {
@@ -491,18 +395,17 @@
 </script>
 
 <style scoped lang="scss">
-	.content1,
-	.content2 {
-		background-color: #FFFFFF;
+	.content1 {
 		margin: 10rpx;
-		padding-bottom: 10rpx;
-		border-radius: 20rpx;
+		padding-bottom: 224rpx;
 
 		.title {
-			font-size: 28rpx;
+			height: 70rpx;
+			line-height: 60rpx;
+			font-size: 32rpx;
 			font-weight: 600;
 			color: #333333;
-			text-align: center;
+			border-bottom: 2rpx solid #EEEEEE;
 		}
 	}
 
@@ -517,9 +420,24 @@
 	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+
+		.btn1,
+		.btn2 {
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+
+		.btn1 {
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -534,12 +452,15 @@
 
 	.textarea {
 		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA ;
+		height: 100px;
 	}
 
 	.row {
 		display: flex;
 		justify-content: space-between;
-		border-bottom: 1px solid #EEEEEE;
+		// border-bottom: 1px solid #EEEEEE;
 		padding: 21rpx 0;
 
 		.right,
@@ -548,8 +469,27 @@
 			color: #333333;
 		}
 	}
+
 	//弹出框
-	.popup{
-		padding: 30rpx;
-		}
+	// .popup {
+	// 	padding: 30rpx;
+	// 	border-radius: 20rpx;
+	// }
+	.rejectInfoCss{
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA ;
+		height: 100px;
+		margin: 30rpx;
+	}
+
+	.uForm_item {
+		padding: 20rpx;
+		background-color: #FFFFFF;
+		margin: 20rpx;
+		border-radius: 20rpx;
+	}
+	.rejectText{
+		text-align: center;
+	}
 </style>

pages/task/audit/freight_setting_details.vue

@@ -11,23 +11,19 @@
 				<u-form-item label="货名" prop="goodsName" label-width="140">
 					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140" label-position='top'>
-					<u-input v-model="list.sendDetailedAddress" input-align="left" placeholder="" disabled />
+				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
+					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="" disabled />
 				</u-form-item>
-				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140" label-position='top'>
-					<u-input v-model="list.receiveDetailedAddress" input-align="left" placeholder="请输入收货地址" disabled />
+				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
+					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="请输入收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
 					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
 				</u-form-item>
 			</u-form>
 		</view>
-		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-		</view>
+		<u-button type="primary" class="submit" @click="passSubmit()">状态？？？？</u-button>
 	</view>
-
 </template>
 
 <script>
@@ -56,7 +52,7 @@
 				tranProcessInfo.flag = "1"
 				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-						that.$api.msg('审核通过成功')
+					that.$api.msg('审核通过成功')
 				})
 			}
 		}
@@ -88,8 +84,9 @@
 	}
 
 	.submit {
-		width: 40%;
+		width: 98%;
 		background: #22C572;
-		border-radius: 10rpx;
+		border-radius: 40rpx;
+		margin-top: 40rpx;
 	}
 </style>

pages/task/audit/freight_settlement_approval.vue

@@ -5,38 +5,40 @@
 				<view>合同编号</view>
 				<view>123456796</view>
 			</view>
-			<view class="car-container" v-for="(item,index) in list">
-				<view class="car-num title">{{item.carNo}}({{item.tranCarNo}})</view>
-				<view class="car-type-item">
-					<view class="left">装</view>
-					<view class="left">{{item.loadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">卸</view>
-					<view class="left">{{item.unloadingWeight}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">结</view>
-					<view class="left">{{item.settlementWeightchange}}吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">运</view>
-					<view class="left">{{item.transportPrice}}元/吨</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">扣</view>
-					<view class="left">{{item.deductionAmountchange}}元</view>
-				</view>
-				<view class="car-type-item">
-					<view class="left">付</view>
-					<view class="left">{{item.amountEdPayable}}元</view>
+			<view class="car-container">
+				<view v-for="(item,index) in list" style="border-bottom: 2rpx solid #EEEEEE;margin-top: 30rpx;">
+					<view class="car-num title">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-type-item">
+						<view class="left">装</view>
+						<view class="textInfo">{{item.loadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">卸</view>
+						<view class="textInfo">{{item.unloadingWeight}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">结</view>
+						<view class="textInfo">{{item.settlementWeightchange}}吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="left">运</view>
+						<view class="textInfo">{{item.transportPrice}}元/吨</view>
+					</view>
+					<view class="car-type-item">
+						<view class="center">扣</view>
+						<view class="textInfo">{{item.deductionAmountchange}}元</view>
+					</view>
+					<view class="car-type-item">
+						<view class="right">付</view>
+						<view class="textInfo">{{item.amountEdPayable}}元</view>
+					</view>
 				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click="rejectSubmit()" type="error" class="btn1">驳回</u-button>
+			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -131,14 +133,18 @@
 	.container {
 		margin: 10rpx;
 		padding: 20rpx 20rpx 140rpx 20rpx;
-		border-radius: 20rpx;
-		background: white;
+		// border-radius: 20rpx;
+		// background: white;
 	}
 
 	.content {
 		.top {
 			display: flex;
 			justify-content: space-between;
+			border-radius: 20rpx;
+			background: white;
+			padding: 30rpx 20rpx;
+			font-size: 36rpx;
 		}
 
 		.title {
@@ -146,21 +152,44 @@
 			font-weight: 600;
 			color: #333333;
 			text-align: left;
+			margin-bottom: 30rpx;
+		}
+		.car-container{
+			padding: 10rpx 20rpx;
+			border-radius: 20rpx;
+			background: white;
+			margin:30rpx 0 ;
+			// border-bottom: 2rpx solid #EEEEEE;
 		}
 
 		.car-type-item {
 			display: inline-flex;
 			// justify-content: center;
 			width: 33.33%;
+			margin-bottom: 40rpx ;
+		}
+		.title{
+			font-size: 36rpx;
 		}
 	}
-
 	.bottom-btn {
-		width: 92%;
+		width: 100%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom:0;
 		display: flex;
 		z-index: 2;
+		left: 0;
+		background-color: #f8f8f8;
+		flex-direction: column;
+		.btn1,.btn2{
+			width: 100%;
+			margin-bottom: 26rpx;
+			border-radius: 90rpx;
+		}
+		.btn1{
+			background: white;
+			color: #00C265;
+		}
 	}
 
 	.submit {
@@ -168,4 +197,26 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
+	.left{
+		background: #FEECE6;
+		color: #FE6430;
+	}
+	.center{
+		background: #EBEEFA;
+		color: #5C76DF;
+	}
+	.right{
+		background: #E9F8F0 ;
+		color: #22C572 ;
+	}
+	.left,.center,.right{
+		width: 50rpx;
+		height: 50rpx;
+		text-align: center;
+		line-height: 50rpx;
+		border-radius: 10rpx;
+	}
+	.textInfo{
+		margin: 6rpx 0 0 10rpx;
+	}
 </style>