Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue

@@ -70,6 +70,8 @@
             <el-form-item><span class="addinputInfo">{{ formobj.departmentValue }}</span></el-form-item>
           </el-col>
           <el-col :span="4" class="tlineheightb">
+            <div class="span-sty"><span>编码</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <div class="title">常用配置</div>
@@ -161,6 +163,12 @@
             <el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24" class="tlineheightb">
+            <div class="span-sty"><span>编码</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.configCode }}</span></el-form-item>
+          </el-col>
+        </el-row>
         <div class="title">
           更多配置
         </div>

anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue

@@ -70,6 +70,8 @@
             <el-form-item><span class="addinputInfo">{{ formobj.departmentValue }}</span></el-form-item>
           </el-col>
           <el-col :span="4" class="tlineheightb">
+            <div class="span-sty"><span>编码</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeCode }}</span></el-form-item>
           </el-col>
         </el-row>
         <div class="title">常用配置</div>
@@ -161,6 +163,12 @@
             <el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24" class="tlineheightb">
+            <div class="span-sty"><span>编码</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.configCode }}</span></el-form-item>
+          </el-col>
+        </el-row>
         <div class="title">
           更多配置
         </div>

anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangInfo.vue

@@ -289,7 +289,7 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb" style="display: flex;justify-content: flex-end;align-items: center">
-            <span>增值税票照片</span>
+            <span>发票照片</span>
           </el-col>
           <el-col :span="20">
             <el-form-item>