diff --git a/src/option/basicdata/basicdataCarrier.js b/src/option/basicdata/basicdataCarrier.js index c69ead95..27c96a37 100644 --- a/src/option/basicdata/basicdataCarrier.js +++ b/src/option/basicdata/basicdataCarrier.js @@ -170,6 +170,15 @@ export default { // prop: "warehouseId", // type: "input", // }, + { + label: '承运商名称', + prop: 'carrierName', + type: 'input', + labelWidth: '150', + span: 11, + width: '150', + align: 'center', + }, { label: '负责人', prop: 'head', @@ -313,15 +322,7 @@ 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/basicPdaTTT.vue similarity index 99% rename from src/views/basic/pda/basicPdaTTTT.vue rename to src/views/basic/pda/basicPdaTTT.vue index d4902955..2305f234 100644 --- a/src/views/basic/pda/basicPdaTTTT.vue +++ b/src/views/basic/pda/basicPdaTTT.vue @@ -136,7 +136,7 @@
- + {{ImgText}}
@@ -323,7 +323,7 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => { } .el-Cart-button-left{ :deep( button){ - padding: 0 7px; + padding: 0 14px; min-width: 70px; display: flex; span{ @@ -496,6 +496,7 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => { display: flex; align-items: center; justify-content: space-between; + height: 30px; .el-img-left{ display:flex; align-items:center; diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 89e7221c..df684e08 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -194,14 +194,14 @@ export default { // }, // }, { - label: "姓名", - prop: "name", - type: "input", + label: '姓名', + prop: 'name', + type: 'input', search: true, - labelWidth:'150', - width:"100px", - align:'center', - span:11, + labelWidth: '150', + width: '100px', + align: 'center', + span: 11, }, { label: '手机号码', @@ -212,13 +212,13 @@ export default { width: '130px', align: 'center', span: 11, - rules: [ - { - required: true, - message: '请输入电话号码', - trigger: 'blur', - }, - ], + rules: [ + { + required: true, + message: '请输入电话号码', + trigger: 'blur', + }, + ], }, { label: '司机类型', @@ -440,7 +440,7 @@ export default { filterable: true, dicUrl: '/api/logpm-basicdata/carrier/dictionary', props: { - label: 'number', + label: 'carrierName', value: 'id', }, rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }], @@ -615,7 +615,7 @@ export default { }, methods: { rowSave(row, done, loading) { - console.log(row,'row信息'); + console.log(row, 'row信息'); add(row).then( () => { this.onLoad(this.page); @@ -801,40 +801,39 @@ export default { }); }, //查询人员绑定情况 - getpeople() { - getUserList(1, 100000, null, '').then(res => { - const data = res.data.data; - data.records.map(v => { - let value = { - label: v.name, - value: v.id, - }; - this.option.column[9].dicData.push(value); - }); - }); - }, + // getpeople() { + // getUserList(1, 100000, null, '').then(res => { + // const data = res.data.data; + // data.records.map(v => { + // let value = { + // label: v.name, + // value: v.id, + // }; + // this.option.column[9].dicData.push(value); + // }); + // }); + // }, }, }; - diff --git a/src/views/basicdata/vehicle/basicdataVehicle.vue b/src/views/basicdata/vehicle/basicdataVehicle.vue index d521c888..9cae32e1 100644 --- a/src/views/basicdata/vehicle/basicdataVehicle.vue +++ b/src/views/basicdata/vehicle/basicdataVehicle.vue @@ -206,6 +206,8 @@ export default { span: 11, prop: 'carrierName', type: 'input', + editDisplay: false, + addDisplay: false, }, { label: '绑定驾驶人', @@ -555,7 +557,7 @@ export default { filterable: true, dicUrl: '/api/logpm-basicdata/carrier/dictionary', props: { - label: 'number', + label: 'carrierName', value: 'id', }, rules: [{ required: true, message: '请选择承运商!', trigger: 'blur' }],