diff --git a/src/option/basicdata/basicdataCarrier.js b/src/option/basicdata/basicdataCarrier.js
index d3e661ce..c69ead95 100644
--- a/src/option/basicdata/basicdataCarrier.js
+++ b/src/option/basicdata/basicdataCarrier.js
@@ -164,6 +164,7 @@ export default {
prop: 'carrierPhone',
type: 'input',
},
+
// {
// label: "绑定仓库Id",
// prop: "warehouseId",
@@ -312,6 +313,15 @@ export default {
width: 'fit-content',
align: 'center',
},
+ {
+ label: '承运商名称',
+ prop: 'carrierName',
+ type: 'input',
+ labelWidth: '150',
+ span: 11,
+ width: 'fit-content',
+ align: 'center',
+ },
{
label: '自由车辆数',
prop: 'freeVehiclesNub',
diff --git a/src/views/basic/pda/basicPdaTTTT.vue b/src/views/basic/pda/basicPdaTTTT.vue
index 6c5ba6db..d4902955 100644
--- a/src/views/basic/pda/basicPdaTTTT.vue
+++ b/src/views/basic/pda/basicPdaTTTT.vue
@@ -44,7 +44,7 @@
-
+
@@ -125,15 +125,23 @@
:on-success="ImgSuccess"
:before-upload="beforeAvatarUpload"
:headers="headers"
+ v-if='!img'
>
-
-
+
点击上传图片
+
@@ -203,11 +211,10 @@ const background = ref(true); // 是否开启背景颜色
const disabled = ref(false); // 是否禁止使用页码功能
const data = ref([]); // 表单数据
const TabHeight = ref();//动态获取表格高度
-const AddLalog = ref(true)//提交弹窗
-const AddForm = ref({
- name: '',
- region: '',
- type: '',
+const AddLalog = ref(false)//提交弹窗
+const img=ref(false);//图片是否上传成功
+const ImgText=ref('')
+const AddForm = ref({ //表单信息
})
const value1 = ref('') //日期
const optionsvalue = ref('')//下拉框值
@@ -274,7 +281,12 @@ const imageUrl = ref('')
const ImgSuccess: UploadProps['onSuccess'] = (response,uploadFile) => {
console.log(response,uploadFile,'123123123123123122312123');
console.log('================================================================');
-
+ if(response.success===true){
+ img.value=true;
+ console.log(img.value);
+ ImgText.value = response.data.originalName
+
+ }
}
// 上传图片规则
const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
@@ -465,10 +477,37 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
}
}
:deep(.upload-demo){
+
width:100%;
.el-upload{
width:100%
}
+ ul{
+ margin-top:0;
+ }
+
}
+ // 图片上传成功
+ .el-img{
+ border: 1px solid #ccc;
+ width: 100%;
+ border-radius: 4px;
+ padding: 0 8px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .el-img-left{
+ display:flex;
+ align-items:center;
+ i{
+ margin-right:8px;
+ color:#ccc;
+ }
+ }
+ i{
+ color: #10d070;
+ margin-left: 6px;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue
index 1e0a8227..b8f19d58 100644
--- a/src/views/basicdata/vehicle/basicdataVehicle.vue
+++ b/src/views/basicdata/vehicle/basicdataVehicle.vue
@@ -197,6 +197,16 @@ export default {
align: 'center',
span: 11,
},
+ {
+ label: '承运商名称',
+ labelWidth: '150',
+ // width: 'fit-content',
+ width: '100px',
+ align: 'center',
+ span: 11,
+ prop: 'carrierName',
+ type: 'input',
+ },
{
label: '绑定驾驶人',
prop: 'vehicleOwners',