Merge remote-tracking branch 'origin/dev' into dev

src/views/enterprise_management/basics_info_management/operation_vehicle/add.vue

@@ -9,8 +9,8 @@
     >
       <el-row>
         <el-col :span="6">
-          <el-form-item label="自编号" prop="GOODSSELFNUMBER">
-            <el-input v-model="data.form.GOODSSELFNUMBER" placeholder="请填写自编号" />
+          <el-form-item label="编号" prop="GOODSSELFNUMBER">
+            <el-input v-model="data.form.GOODSSELFNUMBER" placeholder="请填写编号" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -45,18 +45,6 @@
             <el-input v-model="data.form.OPERATING_CERTIFICATE" placeholder="请填写营运证号"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="运输企业" prop="TRANSPORT_ENTERPRISES">
-            <el-select v-model="data.form.TRANSPORT_ENTERPRISES">
-              <el-option
-                v-for="item in getTransportationEnterpriseList"
-                :key="item.BIANMA"
-                :label="item.NAME"
-                :value="item.NAME"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="运输类别" prop="TRANSPORT_TYPE">
             <el-select v-model="data.form.TRANSPORT_TYPE">
@@ -267,6 +255,9 @@
           <el-form-item label="车辆资料" prop="VEHICLE_MATERIAL">
             <el-input
               v-model="data.form.VEHICLE_MATERIAL"
+              placeholder="请填写车辆资料"
+              type="textarea"
+              :autosize="{ minRows: 3 }"
             />
           </el-form-item>
         </el-col>
@@ -282,7 +273,6 @@
 import { reactive, ref } from "vue";
 import {
   layoutFnGetVehicleColor,
-  layoutFnGetTransportationEnterprise,
   layoutFnGetTransportCategory,
   layoutFnGetBelongingDepartment,
   layoutFnGetFuelType,
@@ -357,7 +347,6 @@ const data = reactive({
   },
 });
 const getVehicleColorList = await layoutFnGetVehicleColor();
-const getTransportationEnterpriseList = await layoutFnGetTransportationEnterprise();
 const getTransportCategoryList = await layoutFnGetTransportCategory();
 const getBelongingDepartment = await layoutFnGetBelongingDepartment();
 const getFuelTypeList = await layoutFnGetFuelType();

src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue

@@ -145,15 +145,9 @@
             {{ serialNumber(pagination, $index) }}
           </template>
         </el-table-column>
-
-        <el-table-column prop="GOODSSELFNUMBER" label="自编号" />
+        <el-table-column prop="GOODSSELFNUMBER" label="编号" />
         <el-table-column prop="PLATE_NUMBER" label="车牌号"/>
-        <el-table-column prop="VEHICLE_COLOR" label="车辆颜色">
-          <template v-slot="{ row }">
-            <span v-if="row.VEHICLE_COLOR === 'vehiclecolor_001'">黄色</span>
-            <span v-else-if="row.VEHICLE_COLOR === 'vehiclecolor_002'">黑色</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="VEHICLE_COLOR" label="车辆颜色" />
         <el-table-column prop="FRAMES_NUMBER" label="车架号" />
         <el-table-column prop="CONTACT" label="联系人" width="140" show-overflow-tooltip />
         <el-table-column prop="CONTACT_NUMBER" label="联系电话" width="140" show-overflow-tooltip />
@@ -165,11 +159,6 @@
             {{ translationStatus(row.NAME, belongingDepartmentList)}}
           </template>
         </el-table-column>
-        <el-table-column prop="TRANSPORT_ENTERPRISES" label="运输企业" width="140" show-overflow-tooltip >
-          <template v-slot="{ row }">
-            <span v-if="row.TRANSPORT_ENTERPRISES === 'transportenterprises_001'">唐山中胜运输服务有限公司</span>
-          </template>
-        </el-table-column>
         <el-table-column label="操作" width="150">
           <template v-slot="{ row }">
             <el-button

src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue

@@ -56,28 +56,6 @@
       <el-descriptions-item label="到期日期">
         {{ data.EXPIRE_DATE }}
       </el-descriptions-item>
-      <el-descriptions-item label="运输企业">
-        {{ data.TRANSPORT_ENTERPRISES }}
-      </el-descriptions-item>
-    </el-descriptions>
-    <el-divider content-position="left">车辆状态</el-divider>
-    <el-descriptions :column="2" border>
-      <el-descriptions-item label="入网状态">
-        <span v-if="data.NETWORK_STATUS === 'networkstatus_001'"> 已入网 </span>
-      </el-descriptions-item>
-      <el-descriptions-item label="动态监管">
-        <span v-if="data.DYNAMIC_SUPERVISION === 'dynamicsupervision_001'">
-          未绑定
-        </span>
-      </el-descriptions-item>
-      <el-descriptions-item label="主动安全">
-        <span v-if="data.ACTIVE_SAFETY === 'activesafety_001'"> 已开启 </span>
-      </el-descriptions-item>
-      <el-descriptions-item label="行驶证状态">
-        <span v-if="data.DRIVINGPREMIT_STATUS === 'licensestatus_001'">
-          未到期
-        </span>
-      </el-descriptions-item>
     </el-descriptions>
     <el-divider content-position="left">详细信息</el-divider>
     <el-descriptions border>