Merge branch 'pre-production'

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',

src/views/basic/pda/basicPdaTTTT.vue

@@ -44,7 +44,7 @@
       <el-table-column prop="purchasingCompany" label="采购公司" width="180" align="center "/>
         <el-table-column label="商品图片" width="180" align="center"  >
           <template #default="props">
-              <img  :src="props.row.photo" class='el-Img'>
+              <img :src="props.row.photo" class='el-Img'>
         </template>
       </el-table-column>
       <el-table-column prop="buyingTime" label="购买时间" width="180" align="center "/>
@@ -125,15 +125,23 @@
     :on-success="ImgSuccess"
     :before-upload="beforeAvatarUpload"
     :headers="headers"
+    v-if='!img'
   > 
-
+    <template #trigger >
-    <template #trigger>
       <div class='img-icon'>
       <el-button type="primary">点击上传图片</el-button>
        <el-icon><UploadFilled /></el-icon>
       </div>
     </template>
     </el-upload>
+    <div v-else class='el-img'>
+      <div class='el-img-left'>
+        <el-icon><PictureFilled /></el-icon>
+        <span>{{ImgText}}</span>
+      </div>
+    
+    <el-icon><SuccessFilled /></el-icon>
+    </div>
     </el-form-item>
 
     <el-form-item label="型号">
@@ -203,11 +211,10 @@ const background = ref(true); // 是否开启背景颜色
 const disabled = ref(false); // 是否禁止使用页码功能
 const data = ref([]); // 表单数据
 const TabHeight = ref();//动态获取表格高度
-const AddLalog = ref(true)//提交弹窗
+const AddLalog = ref(false)//提交弹窗
-const AddForm = ref({
+const img=ref(false);//图片是否上传成功
-  name: '',
+const ImgText=ref('')
-  region: '',
+const AddForm = ref({ //表单信息
-  type: '',
 })
 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; 
+    }
+    }
 }
 </style>

src/views/basicdata/team/basicdataTeamGroup.vue

@@ -421,9 +421,13 @@ export default {
       this.getWarehouseList();
     },
     async getWarehouseList() {
-      let userDept = await getListUser();
+      // let userDept = await getListUser();
-      console.log('<><><>', userDept.data.data);
+      var value = localStorage.getItem('TWMS-userInfo');
-      let sole = await getUserDetail(userDept.data.data.userId);
+      let s=   JSON.parse(value)
+          // s.user_id
+      console.log(s,'=========================================='); // 输出: value
+      // console.log('<><><>', userDept.data.data);
+      let sole = await getUserDetail(s.content.user_id);
       console.log(',....t=用户信息s', sole);
       if (sole.data.data.roleName == '管理员') {
         // let dept =  await getDept();

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',