From 45fcbf84867ea0fd27d9d6afa1a0dade3c0c9c04 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sat, 19 Nov 2022 14:51:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE=E4=B9=B0?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weishoumaiduanguanli/vehicle.vue          | 158 +++++------------
 .../weishoumaiduanguanli/vehicle.vue          | 160 +++++-------------
 2 files changed, 87 insertions(+), 231 deletions(-)

diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
index ec99d36508..b236b0ab40 100644
--- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>选择车辆页面</div>
+        <div>车辆查询</div>
         <div>
           <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -13,55 +13,27 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
-              <el-form-item label="功能:" class="searchlist">
-                <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-form-item label="品牌">
+                <el-select v-model="listQuery.params.brandSid" disabled class="addinputw" placeholder="请选择" filterable>
+                  <el-option v-for="item in carbrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="系列:" class="searchlist">
-                <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="变速箱:" class="searchlist">
-                <el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="驱动:" class="searchlist">
-                <el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="排放标准:" class="searchlist">
-                <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.modelNameAndCode" clearable class="addinputw" placeholder=""/>
               </el-form-item>
-              <el-form-item label="马力:" class="searchlist">
-                <el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" clearable class="addinputw" placeholder=""/>
               </el-form-item>
-              <el-form-item label="燃料:" class="searchlist">
-                <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-form-item label="颜色">
+                <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" clearable class="addinputw" filterable>
+                  <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="版本:" class="searchlist">
-                <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-form-item label="存放地点">
+                <el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="车型:" class="searchlist">
-                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable style="width: 150px"/>
-              </el-form-item>
-              <el-form-item label="采购订单编号:" class="searchlist">
-                <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable style="width: 150px"/>
-              </el-form-item>
-              <el-form-item label="快捷检索:" class="searchlist">
-                <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
-              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -70,7 +42,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">现车库存列表</div>
+          <div class="tit">现车列表</div>
 <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
         </div>
         <div class="">
@@ -122,7 +94,7 @@
 <script>
 import Pagination from '@/components/pagination'
 import req from '@/api/weishoumaiduan/unsold'
-import { typeValues } from '@/api/cheliang/dictcommons.js'
+import {brandDown, fetchByUseOrgSid, getPathSidByUserSid, typeValues} from '@/api/cheliang/dictcommons.js'
 
 export default {
   name: 'xianchechaxun',
@@ -131,38 +103,25 @@ export default {
   },
   data() {
     return {
-      vehicleType_list: [],
-      productLine_list: [],
-      gearboxType_list: [],
-      driveForm_list: [],
-      emissionStandard_list: [],
-      power_list: [],
-      fuelType_list: [],
-      vehicleVersion_list: [],
+      carbrand_list: [], // 品牌
+      carColor_list: [], // 颜色
+      location_list: [], // 存放地点
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       sids: [],
       list: [],
-      number: '',
       listLoading: false,
       listQuery: {
         current: 1,
         size: 5,
         params: {
           brandSid: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          modelName: '',
-          power: '',
-          productLine: '',
-          vehicleAlias: '',
-          vehicleType: '',
-          vehicleVersion: '',
+          modelNameAndCode: '',
+          vinNo: '',
+          carColorKey: '',
+          location: '',
           userSid: '',
-          orderingNo: '',
           vinNoList: []
         },
         total: 0
@@ -180,50 +139,26 @@ export default {
       }
     },
     init() {
-      this.shujuzidian()
-      this.getList()
-    },
-    shujuzidian() {
-      typeValues({ type: 'vehicleFunction' }).then((res) => {
-        if (res.success) {
-          this.vehicleType_list = res.data
+      typeValues({ type: 'bodyColor' }).then((resp) => {
+        if (resp.success) {
+          this.carColor_list = resp.data
         }
       })
-      typeValues({ type: 'productLine' }).then((res) => {
-        if (res.code === '200') {
-          this.productLine_list = res.data
-        }
-      })
-      typeValues({ type: 'driver' }).then((res) => {
-        if (res.code === '200') {
-          this.driveForm_list = res.data
-        }
-      })
-      typeValues({ type: 'horsepower' }).then((res) => {
-        if (res.code === '200') {
-          this.power_list = res.data
-        }
-      })
-      typeValues({ type: 'vehicleVersion' }).then((res) => {
-        if (res.code === '200') {
-          this.vehicleVersion_list = res.data
-        }
-      })
-      typeValues({ type: 'fuelType' }).then((res) => {
-        if (res.code === '200') {
-          this.fuelType_list = res.data
-        }
-      })
-      typeValues({ type: 'gearbox' }).then((res) => {
-        if (res.code === '200') {
-          this.gearboxType_list = res.data
-        }
-      })
-      typeValues({ type: 'emissionStandard' }).then((res) => {
-        if (res.code === '200') {
-          this.emissionStandard_list = res.data
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          brandDown({ useOrg: res.data }).then((resp) => {
+            if (resp.success) {
+              this.carbrand_list = resp.data
+            }
+          })
+          fetchByUseOrgSid({ sid: res.data }).then((respsone) => {
+            if (respsone.success) {
+              this.location_list = respsone.data
+            }
+          })
         }
       })
+      this.getList()
     },
     indexMethod(index) {
       var pagestart = (this.listQuery.current - 1) * this.listQuery.size
@@ -256,18 +191,11 @@ export default {
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
-      this.listQuery.params.driveForm = ''
-      this.listQuery.params.emissionStandard = ''
-      this.listQuery.params.fuelType = ''
-      this.listQuery.params.gearboxType = ''
-      this.listQuery.params.modelName = ''
-      this.listQuery.params.power = ''
-      this.listQuery.params.productLine = ''
-      this.listQuery.params.vehicleAlias = ''
-      this.listQuery.params.vehicleType = ''
-      this.listQuery.params.vehicleVersion = ''
+      this.listQuery.params.modelNameAndCode = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.carColorKey = ''
+      this.listQuery.params.location = ''
       this.listQuery.params.userSid = ''
-      this.listQuery.params.orderingNo = ''
       this.getList()
     },
     handleSelectionChange(row) {
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue
index 38dc88aa57..448b45ba83 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>选择车辆页面</div>
+        <div>车辆查询</div>
         <div>
           <el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@@ -13,55 +13,27 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
-              <el-form-item label="功能:" class="searchlist">
-                <el-select v-model="listQuery.params.vehicleType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-form-item label="品牌">
+                <el-select v-model="listQuery.params.brandSid" disabled class="addinputw" placeholder="请选择" filterable>
+                  <el-option v-for="item in carbrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="系列:" class="searchlist">
-                <el-select v-model="listQuery.params.productLine" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in productLine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="变速箱:" class="searchlist">
-                <el-select v-model="listQuery.params.gearboxType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in gearboxType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="驱动:" class="searchlist">
-                <el-select v-model="listQuery.params.driveForm" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in driveForm_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="排放标准:" class="searchlist">
-                <el-select v-model="listQuery.params.emissionStandard" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in emissionStandard_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.modelNameAndCode" clearable class="addinputw" placeholder=""/>
               </el-form-item>
-              <el-form-item label="马力:" class="searchlist">
-                <el-select v-model="listQuery.params.power" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in power_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-                </el-select>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" clearable class="addinputw" placeholder=""/>
               </el-form-item>
-              <el-form-item label="燃料:" class="searchlist">
-                <el-select v-model="listQuery.params.fuelType" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in fuelType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-form-item label="颜色">
+                <el-select v-model="listQuery.params.carColorKey" placeholder="请选择" clearable class="addinputw" filterable>
+                  <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="版本:" class="searchlist">
-                <el-select v-model="listQuery.params.vehicleVersion" placeholder="请选择" filterable clearable>
-                  <el-option v-for="item in vehicleVersion_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-form-item label="存放地点">
+                <el-select v-model="listQuery.params.location" class="addinputw" clearable placeholder="请选择" filterable>
+                  <el-option v-for="item in location_list" :key="item.sid" :label="item.warehouseName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="车型:" class="searchlist">
-                <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable style="width: 150px"/>
-              </el-form-item>
-              <el-form-item label="采购订单编号:" class="searchlist">
-                <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable style="width: 150px"/>
-              </el-form-item>
-              <el-form-item label="快捷检索:" class="searchlist">
-                <el-input v-model="listQuery.params.modelName" placeholder="" clearable style="width: 150px"/>
-              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@@ -70,7 +42,7 @@
           </div>
         </div>
         <div class="listtop">
-          <div class="tit">现车库存列表</div>
+          <div class="tit">现车列表</div>
           <!--          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
         </div>
         <div class="">
@@ -122,47 +94,34 @@
 <script>
 import Pagination from '@/components/pagination'
 import req from '@/api/weishoumaiduan/unsold'
-import { typeValues, brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons.js'
+import {brandDown, fetchByUseOrgSid, getPathSidByUserSid, typeValues} from '@/api/cheliang/dictcommons.js'
 
 export default {
-  name: 'vehicle',
+  name: 'xianchechaxun',
   components: {
     Pagination
   },
   data() {
     return {
-      vehicleType_list: [],
-      productLine_list: [],
-      gearboxType_list: [],
-      driveForm_list: [],
-      emissionStandard_list: [],
-      power_list: [],
-      fuelType_list: [],
-      vehicleVersion_list: [],
+      carbrand_list: [], // 品牌
+      carColor_list: [], // 颜色
+      location_list: [], // 存放地点
       isSearchShow: false,
       searchxianshitit: '隐藏查询条件',
       tableKey: 0,
       sids: [],
       list: [],
-      number: '',
       listLoading: false,
       listQuery: {
         current: 1,
         size: 5,
         params: {
           brandSid: '',
-          driveForm: '',
-          emissionStandard: '',
-          fuelType: '',
-          gearboxType: '',
-          modelName: '',
-          power: '',
-          productLine: '',
-          vehicleAlias: '',
-          vehicleType: '',
-          vehicleVersion: '',
+          modelNameAndCode: '',
+          vinNo: '',
+          carColorKey: '',
+          location: '',
           userSid: '',
-          orderingNo: '',
           vinNoList: []
         },
         total: 0
@@ -180,50 +139,26 @@ export default {
       }
     },
     init() {
-      this.shujuzidian()
-      this.getList()
-    },
-    shujuzidian() {
-      typeValues({ type: 'vehicleFunction' }).then((res) => {
-        if (res.success) {
-          this.vehicleType_list = res.data
+      typeValues({ type: 'bodyColor' }).then((resp) => {
+        if (resp.success) {
+          this.carColor_list = resp.data
         }
       })
-      typeValues({ type: 'productLine' }).then((res) => {
-        if (res.code === '200') {
-          this.productLine_list = res.data
-        }
-      })
-      typeValues({ type: 'driver' }).then((res) => {
-        if (res.code === '200') {
-          this.driveForm_list = res.data
-        }
-      })
-      typeValues({ type: 'horsepower' }).then((res) => {
-        if (res.code === '200') {
-          this.power_list = res.data
-        }
-      })
-      typeValues({ type: 'vehicleVersion' }).then((res) => {
-        if (res.code === '200') {
-          this.vehicleVersion_list = res.data
-        }
-      })
-      typeValues({ type: 'fuelType' }).then((res) => {
-        if (res.code === '200') {
-          this.fuelType_list = res.data
-        }
-      })
-      typeValues({ type: 'gearbox' }).then((res) => {
-        if (res.code === '200') {
-          this.gearboxType_list = res.data
-        }
-      })
-      typeValues({ type: 'emissionStandard' }).then((res) => {
-        if (res.code === '200') {
-          this.emissionStandard_list = res.data
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
+        if (res.success) {
+          brandDown({ useOrg: res.data }).then((resp) => {
+            if (resp.success) {
+              this.carbrand_list = resp.data
+            }
+          })
+          fetchByUseOrgSid({ sid: res.data }).then((respsone) => {
+            if (respsone.success) {
+              this.location_list = respsone.data
+            }
+          })
         }
       })
+      this.getList()
     },
     indexMethod(index) {
       var pagestart = (this.listQuery.current - 1) * this.listQuery.size
@@ -256,18 +191,11 @@ export default {
       this.listQuery.current = 1
       this.listQuery.size = 5
       this.listQuery.total = 0
-      this.listQuery.params.driveForm = ''
-      this.listQuery.params.emissionStandard = ''
-      this.listQuery.params.fuelType = ''
-      this.listQuery.params.gearboxType = ''
-      this.listQuery.params.modelName = ''
-      this.listQuery.params.power = ''
-      this.listQuery.params.productLine = ''
-      this.listQuery.params.vehicleAlias = ''
-      this.listQuery.params.vehicleType = ''
-      this.listQuery.params.vehicleVersion = ''
+      this.listQuery.params.modelNameAndCode = ''
+      this.listQuery.params.vinNo = ''
+      this.listQuery.params.carColorKey = ''
+      this.listQuery.params.location = ''
       this.listQuery.params.userSid = ''
-      this.listQuery.params.orderingNo = ''
       this.getList()
     },
     handleSelectionChange(row) {