完善销售订单详情页面

anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue

@@ -130,51 +130,127 @@
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
             </el-col>
           </el-row>
-          <!--          <div class="title">挂车信息</div>-->
-          <!--          <el-row>-->
-          <!--            <el-col :span="24">-->
-          <!--              <el-form-item><span></span></el-form-item>-->
-          <!--            </el-col>-->
-          <!--          </el-row>-->
-          <div class="title">价格信息</div>
+          <div class="title">价格信息(不含挂车)</div>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">单台整体指导价</div>
+            <el-col :span="6">
+              <div class="span-sty">销售指导价(元/台)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">主车单台销售合同价</div>
+            <el-col :span="6">
+              <div class="span-sty">销售合同价(元/台)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">其中主车或底盘(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">单台整体销售合同价</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">其中上装(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">台数</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车价合计</div>
+            <el-col :span="6">
+              <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="12">
-              <div class="span-sty">计划提车日期</div>
+            <el-col :span="6">
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <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>
+          <div v-if="formobj.isGc">
+            <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">挂车类型</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">外廓尺寸-长(m)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">销售合同价(元/台)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">数量</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">合同</div>
+                <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">同车型合格证</div>
+                <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></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.gc1.remarks }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
+              <div class="title">挂车2(对应单台主车)</div>
+              <el-row>
+                <el-col :span="6">
+                  <div class="span-sty">挂车类型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div class="span-sty">外廓尺寸-长(m)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div class="span-sty">销售合同价(元/台)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div class="span-sty">数量</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div class="span-sty">合同</div>
+                  <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div class="span-sty">同车型合格证</div>
+                  <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></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.gc2.remarks }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
           <div class="title">订金信息</div>
           <el-row>
             <el-col :span="12">
@@ -336,15 +412,17 @@ export default {
         billingType: '',
         billingTypeKey: '',
         busDepositFictitiousList: [],
-        busSalesOrderDeposit: [],
+        busSalesOrderDeposit: {},
         busSalesOrderDiscountList: [],
-        busSalesOrderInsurance: [],
-        busSalesOrderMakeup: [],
-        busSalesOrderModel: [],
-        busSalesOrderPrice: [],
+        busSalesOrderInsurance: {},
+        busSalesOrderMakeup: {},
+        busSalesOrderModel: {},
+        busSalesOrderPrice: {},
         busSalesOrderVehicleList: [],
-        busSalesOrderotherMessageDetailsVo: [],
+        busSalesOrderotherMessageDetailsVo: {},
         busSalesVehicleOrderList: [],
+        gc1: {},
+        gc2: {},
         companyInvoicingName: '',
         concatNo: '',
         createDate: '',
@@ -355,6 +433,7 @@ export default {
         insuranceInfoMessage: '',
         isInsurance: '',
         isTop: '',
+        isGc: false,
         licensePlateKey: '',
         licensePlateValue: '',
         mobile: '',
@@ -392,6 +471,34 @@ export default {
           } else {
             this.formobj.busSalesOrderModel.vinNo = ''
           }
+          if (this.formobj.gc1.contractFile.length > 0) {
+            const aa = []
+            this.formobj.gc1.contractFile.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.gc1.contractFile = aa
+          }
+          if (this.formobj.gc1.certFile.length > 0) {
+            const bb = []
+            this.formobj.gc1.certFile.forEach((e) => {
+              bb.push(e.url)
+            })
+            this.formobj.gc1.certFile = bb
+          }
+          if (this.formobj.gc2.contractFile.length > 0) {
+            const cc = []
+            this.formobj.gc2.contractFile.forEach((e) => {
+              cc.push(e.url)
+            })
+            this.formobj.gc2.contractFile = cc
+          }
+          if (this.formobj.gc2.certFile.length > 0) {
+            const ee = []
+            this.formobj.gc2.certFile.forEach((e) => {
+              ee.push(e.url)
+            })
+            this.formobj.gc2.certFile = ee
+          }
         }
       })
     },

anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue

@@ -130,51 +130,127 @@
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
             </el-col>
           </el-row>
-          <!--          <div class="title">挂车信息</div>-->
-          <!--          <el-row>-->
-          <!--            <el-col :span="24">-->
-          <!--              <el-form-item><span></span></el-form-item>-->
-          <!--            </el-col>-->
-          <!--          </el-row>-->
-          <div class="title">价格信息</div>
+          <div class="title">价格信息(不含挂车)</div>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">单台整体指导价</div>
+            <el-col :span="6">
+              <div class="span-sty">销售指导价(元/台)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleGuildPrice }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">主车单台销售合同价</div>
+            <el-col :span="6">
+              <div class="span-sty">销售合同价(元/台)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <div class="span-sty">其中主车或底盘(元)</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.finalPrice }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">单台整体销售合同价</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.singleFinalPrice }}</span></el-form-item>
+            <el-col :span="6">
+              <div class="span-sty">其中上装(元)</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderModel.topPrice }}</span></el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
-              <div class="span-sty">单台折让(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.bigDecimalSing }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">台数</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.quantity }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车价合计</div>
+            <el-col :span="6">
+              <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="12">
-              <div class="span-sty">计划提车日期</div>
+            <el-col :span="6">
+              <div class="span-sty">预计提车日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.busSalesOrderPrice.plannedPickUpDate }}</span></el-form-item>
             </el-col>
-            <el-col :span="12">
+            <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>
+          <div v-if="formobj.isGc">
+            <div class="title">挂车<span v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">1</span>(对应单台主车)</div>
+            <el-row>
+              <el-col :span="6">
+                <div class="span-sty">挂车类型</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerTypeValue }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">外廓尺寸-长(m)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.appearanceSizeLong }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">销售合同价(元/台)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.singleFinalPrice }}</span></el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <div class="span-sty">数量</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.gc1.trailerCount }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">合同</div>
+                <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc1.contractFile" /></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <div class="span-sty">同车型合格证</div>
+                <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc1.certFile" :key="index" :src="item" :preview-src-list="formobj.gc1.certFile" /></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.gc1.remarks }}</span></el-form-item>
+              </el-col>
+            </el-row>
+            <div v-show="formobj.gc2.singleFinalPrice !== '' && formobj.gc2.singleFinalPrice !== null">
+              <div class="title">挂车2(对应单台主车)</div>
+              <el-row>
+                <el-col :span="6">
+                  <div class="span-sty">挂车类型</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerTypeValue }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div class="span-sty">外廓尺寸-长(m)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.appearanceSizeLong }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div class="span-sty">销售合同价(元/台)</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.singleFinalPrice }}</span></el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <div class="span-sty">数量</div>
+                  <el-form-item><span class="addinputInfo">{{ formobj.gc2.trailerCount }}</span></el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div class="span-sty">合同</div>
+                  <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.contractFile" :key="index" :src="item" :preview-src-list="formobj.gc2.contractFile" /></el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="24">
+                  <div class="span-sty">同车型合格证</div>
+                  <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.gc2.certFile" :key="index" :src="item" :preview-src-list="formobj.gc2.certFile" /></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.gc2.remarks }}</span></el-form-item>
+                </el-col>
+              </el-row>
+            </div>
+          </div>
           <div class="title">订金信息</div>
           <el-row>
             <el-col :span="12">
@@ -336,15 +412,17 @@ export default {
         billingType: '',
         billingTypeKey: '',
         busDepositFictitiousList: [],
-        busSalesOrderDeposit: [],
+        busSalesOrderDeposit: {},
         busSalesOrderDiscountList: [],
-        busSalesOrderInsurance: [],
-        busSalesOrderMakeup: [],
-        busSalesOrderModel: [],
-        busSalesOrderPrice: [],
+        busSalesOrderInsurance: {},
+        busSalesOrderMakeup: {},
+        busSalesOrderModel: {},
+        busSalesOrderPrice: {},
         busSalesOrderVehicleList: [],
-        busSalesOrderotherMessageDetailsVo: [],
+        busSalesOrderotherMessageDetailsVo: {},
         busSalesVehicleOrderList: [],
+        gc1: {},
+        gc2: {},
         companyInvoicingName: '',
         concatNo: '',
         createDate: '',
@@ -355,6 +433,7 @@ export default {
         insuranceInfoMessage: '',
         isInsurance: '',
         isTop: '',
+        isGc: false,
         licensePlateKey: '',
         licensePlateValue: '',
         mobile: '',
@@ -392,6 +471,34 @@ export default {
           } else {
             this.formobj.busSalesOrderModel.vinNo = ''
           }
+          if (this.formobj.gc1.contractFile.length > 0) {
+            const aa = []
+            this.formobj.gc1.contractFile.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.gc1.contractFile = aa
+          }
+          if (this.formobj.gc1.certFile.length > 0) {
+            const bb = []
+            this.formobj.gc1.certFile.forEach((e) => {
+              bb.push(e.url)
+            })
+            this.formobj.gc1.certFile = bb
+          }
+          if (this.formobj.gc2.contractFile.length > 0) {
+            const cc = []
+            this.formobj.gc2.contractFile.forEach((e) => {
+              cc.push(e.url)
+            })
+            this.formobj.gc2.contractFile = cc
+          }
+          if (this.formobj.gc2.certFile.length > 0) {
+            const ee = []
+            this.formobj.gc2.certFile.forEach((e) => {
+              ee.push(e.url)
+            })
+            this.formobj.gc2.certFile = ee
+          }
         }
       })
     },