Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue

@@ -161,21 +161,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue

@@ -158,21 +158,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue

@@ -162,21 +162,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@@ -162,21 +162,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@@ -162,21 +162,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue

@@ -158,21 +158,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue

@@ -158,21 +158,21 @@
               <div class="span-sty">车价合计(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.priceSum }}</span></el-form-item>
             </el-col>
+            <el-col :span="12">
+              <div class="span-sty">单台折让(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="6">
-              <div class="span-sty">计划提车日期</div>
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="6">
-              <div class="span-sty">计划提车地点</div>
+            <el-col :span="18">
+              <div class="span-sty">预计提车地点</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpLocation }}</span></el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-          </el-row>
           <div v-if="formobj.isGc">
             <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
             <el-row>