From d6f1d58454398afbaa46a0ecc4f2733ac1b5e07f Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 15 Jan 2024 17:27:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../caigouqudaoselected.vue                   | 20 +++++++++++++++---
 .../caigouqudaotobeselected.vue               | 21 ++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
index aeea34d937..5d916e6078 100644
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
@@ -84,7 +84,7 @@
             </el-table-column>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
+                <span class="bluezi" @click="lookPeiZhi(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="配置简述" align="center">
@@ -123,6 +123,8 @@
     <!-- End 列表页面 -->
     <!-- 查看销售订单 -->
     <saleOrder v-show="viewState == 2" ref="divSale" @doback="resetState"/>
+    <!-- 查看车型配置标准页面 -->
+    <vehicleconfiguration v-show="viewState == 4" ref="divPeizhi" @doback="resetState"/>
     <!-- 选择采购渠道 -->
     <el-dialog :visible.sync="dialogVisible" width="50%">
       <el-form ref="form_obj" :model="formobj" class="formadd">
@@ -137,7 +139,7 @@
           <el-col :span="24">
             <el-form-item>
               <el-select v-model="formobj.purchaseOrderTypeValue" placeholder="请选择" filterable clearable @change="changePurchaseOrderType">
-                <el-option v-for="item in purchaseOrderType_list" :disabled="item.dictValue == '挂车'" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                <el-option v-for="item in purchaseOrderType_list" :disabled="item.dictValue == '挂车' || item.dictValue == '内购'" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -162,6 +164,7 @@ import ButtonBar from '@/components/ButtonBar'
 import { getOrgSidByPath, selectOrgLists, typeValues } from '@/api/cheliang/dictcommons'
 import { getStorage } from '@/utils/auth'
 import saleOrder from '@/components/publicPage/saleOrder'
+import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
 
 export default {
   name: 'caigouqudaoselected',
@@ -169,7 +172,8 @@ export default {
     Pagination,
     pageye,
     ButtonBar,
-    saleOrder
+    saleOrder,
+    vehicleconfiguration
   },
   data() {
     return {
@@ -414,6 +418,16 @@ export default {
       this.viewState = 2
       this.$refs['divSale'].showInfo({ sid: row.saleOrderSid })
     },
+    lookPeiZhi(row) {
+      this.viewState = 4
+      const aa = {
+        modelSid: row.modelSid,
+        configSid: row.configSid,
+        vehModelConfigSid: row.modelConfigSid,
+        guidedPrice: row.guidedPrice
+      }
+      this.$refs['divPeizhi'].showInfo(aa)
+    },
     resetState() {
       this.viewState = 1
     },
diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
index 503c14f201..046eb1d4af 100644
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
@@ -79,7 +79,7 @@
             </el-table-column>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.modelName }}</span>
+                <span class="bluezi" @click="lookPeiZhi(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="配置简述" align="center">
@@ -110,6 +110,8 @@
     <caigouqudaoselected v-show="viewState == 2" ref="divSelect" @doback="resetState"/>
     <!-- 查看销售订单 -->
     <saleOrder v-show="viewState == 3" ref="divSale" @doback="resetState"/>
+    <!-- 查看车型配置标准页面 -->
+    <vehicleconfiguration v-show="viewState == 4" ref="divPeizhi" @doback="resetState"/>
     <!-- 选择采购渠道 -->
     <el-dialog :visible.sync="dialogVisible" width="50%">
       <el-form ref="form_obj" :model="formobj" class="formadd">
@@ -124,7 +126,7 @@
           <el-col :span="24">
             <el-form-item>
               <el-select v-model="formobj.purchaseOrderTypeValue" placeholder="请选择" filterable clearable @change="changePurchaseOrderType">
-                <el-option v-for="item in purchaseOrderType_list" :disabled="item.dictValue == '挂车'" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
+                <el-option v-for="item in purchaseOrderType_list" :disabled="item.dictValue == '挂车' || item.dictValue == '内购'" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -149,6 +151,8 @@ import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import caigouqudaoselected from './caigouqudaoselected'
 import saleOrder from '@/components/publicPage/saleOrder'
+import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
+
 import { getStorage } from '@/utils/auth'
 
 export default {
@@ -158,7 +162,8 @@ export default {
     pageye,
     ButtonBar,
     caigouqudaoselected,
-    saleOrder
+    saleOrder,
+    vehicleconfiguration
   },
   data() {
     return {
@@ -409,6 +414,16 @@ export default {
       this.viewState = 3
       this.$refs['divSale'].showInfo({ sid: row.saleOrderSid })
     },
+    lookPeiZhi(row) {
+      this.viewState = 4
+      const aa = {
+        modelSid: row.modelSid,
+        configSid: row.configSid,
+        vehModelConfigSid: row.modelConfigSid,
+        guidedPrice: row.guidedPrice
+      }
+      this.$refs['divPeizhi'].showInfo(aa)
+    },
     resetState() {
       this.viewState = 1
     },

From bbe876c65b067759fde08f32e8ac3b5853ab0341 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 15 Jan 2024 17:32:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=B8=A0=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/purchasingchannels/caigouqudaoselected.vue        | 2 +-
 .../src/views/purchasingchannels/caigouqudaotobeselected.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
index 5d916e6078..15a7852215 100644
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaoselected.vue
@@ -422,7 +422,7 @@ export default {
       this.viewState = 4
       const aa = {
         modelSid: row.modelSid,
-        configSid: row.configSid,
+        modelConfigSid: row.configSid,
         vehModelConfigSid: row.modelConfigSid,
         guidedPrice: row.guidedPrice
       }
diff --git a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
index 046eb1d4af..533878f33b 100644
--- a/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/purchasingchannels/caigouqudaotobeselected.vue
@@ -418,7 +418,7 @@ export default {
       this.viewState = 4
       const aa = {
         modelSid: row.modelSid,
-        configSid: row.configSid,
+        modelConfigSid: row.configSid,
         vehModelConfigSid: row.modelConfigSid,
         guidedPrice: row.guidedPrice
       }