Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/reportset/ReportSetFeign.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.reportcenter.api.reportset;
 
-import com.yxt.anrui.reportcenter.api.dailyreport.DailyReportFeignFallback;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/reportset/ReportSetService.java

@@ -67,6 +67,8 @@ public class ReportSetService extends MybatisBaseService<ReportSetMapper, Report
                 }
             }
             baseMapper.insert(reportSet);
+        }else{
+            baseMapper.deleteByUserSid(reportSetQuery.getUserSid());
         }
         return rb.success();
     }

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,
+        modelConfigSid: row.configSid,
+        vehModelConfigSid: row.modelConfigSid,
+        guidedPrice: row.guidedPrice
+      }
+      this.$refs['divPeizhi'].showInfo(aa)
+    },
     resetState() {
       this.viewState = 1
     },

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,
+        modelConfigSid: row.configSid,
+        vehModelConfigSid: row.modelConfigSid,
+        guidedPrice: row.guidedPrice
+      }
+      this.$refs['divPeizhi'].showInfo(aa)
+    },
     resetState() {
       this.viewState = 1
     },