Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/firstOutsource/form.vue

@@ -35,7 +35,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="表单日期" prop="formDate">
-              <el-date-picker v-if="editStatus && hasReturnReceiptDetailFlag" clearable v-model="form.formDate"
+              <el-date-picker v-if="editStatus && hasReturnReceiptDetailFlag" :clearable="false" v-model="form.formDate"
                 type="date" value-format="YYYY-MM-DD" placeholder="请选择表单日期" style="width: 100%">
               </el-date-picker>
               <span v-else>{{ parseTime(form.formDate, "{y}-{m}-{d}") }}</span>

src/views/business/returnTurnover/index.vue

@@ -301,6 +301,10 @@ async function handleBatchTurnover() {
 		return
 	}
 	const carriers = selections.value.map(v => v.newCarrierName).join()
+	if(carriers == ""){
+		proxy.$modal.msgError('选中批次存在未绑定载具批次，请绑定载具')
+		return
+	}
 	const res = await checkCarriers({ carriers: carriers })
 	if (!res.data) {
 		proxy.$modal.msgError('请不要选择外协箱外协单进行批量周转')