优化

src/pages/order/orderList.vue

@@ -108,7 +108,11 @@
 										>
 											推送订单
 										</view>
-										<view class="evaluate btn" @tap="orderDel(res.id)">
+										<view
+											v-if="res.orderStatusText === '待推送'"
+											class="evaluate btn"
+											@tap="orderDel(res.id)"
+										>
 											删除订单
 										</view>
 									</view>

src/pages/order/quotation.vue

 <template>
 	<view style="padding: 30rpx;">
 		<u-form :model="formData" ref="uFormRef" label-width="200">
-			<u-form-item label="发货人:" prop="attend">
+			<u-form-item label="发货人:" prop="attend">	
 				<u-input v-model="formData.attend" placeholder="请输入发货人" />
 			</u-form-item>
 			<u-form-item label="发货联系电话:" prop="tel">
@@ -36,14 +36,17 @@
 			<u-form-item label="收货联系电话:" prop="toCust">
 				<u-input v-model="formData.quotationTel" placeholder="请输入收货联系人" />
 			</u-form-item>
-			<u-form-item label="交货日期:" prop="deliveryDate">
+			<u-form-item label="预计交货时间:" prop="deliveryDate">
 				<u-input
 					:disabled="true"
 					v-model="formData.deliveryDate"
-					placeholder="请选择日期"
+					placeholder="请选择时间"
 					@tap="pickerDateShow = true"
 				/>
 			</u-form-item>
+			<u-form-item label="交货期:" prop="deliveryTime">
+				<u-input v-model="formData.deliveryTime" placeholder="请输入交货期" />
+			</u-form-item>
 			<u-form-item label="收货地址:" prop="deliveryAddr">
 				<u-input
 					:disabled="true"
@@ -52,6 +55,9 @@
 					@tap="pickerShow1 = true"
 				/>
 			</u-form-item>
+			<u-form-item label="合同报价:" prop="contractQuotation">
+				<u-input v-model="formData.contractQuotation" placeholder="请输入合同报价" />
+			</u-form-item>
 			<u-form-item label="订单号:" prop="noOrder">
 				<u-input type="number" v-model="formData.noOrder" placeholder="请输入订单号" />
 			</u-form-item>
@@ -116,7 +122,9 @@ let formData = ref({
 	quotationTel: '',
 	remarks: '',
 	noOrder: '',
-	guarantee: ''
+	guarantee: '',
+	contractQuotation: '',
+	deliveryTime: ''
 });
 
 
@@ -158,10 +166,12 @@ let rules = ref({
 		trigger: 'blur',
 	}],
 	deliveryAddr: [{ required: true, message: '请选择收货地址', trigger: 'blur' }],
-	deliveryDate: [{ required: true, message: '请选择交货日期', trigger: 'change' }],
+	deliveryDate: [{ required: true, message: '请选择交货时间', trigger: 'change' }],
 	noOrder: [{ required: true, message: '请输入订单号', trigger: 'blur' }],
 	pay: [{ required: true, message: '请输入付款方式', trigger: 'blur' }],
 	guarantee: [{ required: true, message: '请输入保修', trigger: 'blur' }],
+	deliveryTime: [{ required: true, message: '请输入交货期', trigger: 'blur' }],
+	contractQuotation: [{ required: true, message: '请输入合同报价', trigger: 'blur' }],
 });
 
 let guaranteeList = ref([