供应链：调整车型样式和修改合格证的type值；业务管理：调整车型配置详细页面，客户管理跳转客户档案传递customerSid参数

3 years ago · b8ac95bdcc
12 changed files with 49 additions and 30 deletions
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chexingchaxun/modelinquire.js
@ -54,8 +54,13 @@ export function brandDown(data) {
 // 车型配置详细信息
 export function selectExiCarConfig(data) {
  return request({
-    url: '/base/v1/basevehicle/selectExiCarConfig/' + data.modelSid + '/' + data.configSid + '/' + data.userSid,
-    method: 'get'
+    url: '/base/v1/basevehicle/selectExiCarConfig',
+    method: 'post',
+    params: {
+      modelSid:data.modelSid,
+      configSid:data.configSid,
+      vehModelConfigSid:data.vehModelConfigSid,
+    },
  })
 }
 // 现车车辆的分页列表
--- a/anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
@ -222,10 +222,7 @@ export default {
      immediate: false,
      handler(newVal, oldVal) {
        if (newVal.configSid !== '' && newVal.modelSid !== ''){
-          if (newVal.guidedPrice !== '' || newVal.guidedPrice !== null){
-            const guidedPrice_two = parseFloat(Number(newVal.guidedPrice) / 10000).toFixed(2)
-            this.guidedPrice = guidedPrice_two
-          }
+          this.guidedPrice = newVal.guidedPrice
          selectExiCarConfig({
            modelSid:newVal.modelSid,
            configSid:newVal.configSid,
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue
@ -65,7 +65,12 @@ export default {
      this.sid_list.modelSid = row.modelSid
      this.sid_list.configSid = row.configSid
      this.sid_list.vehModelConfigSid = row.vehModelConfigSid
-      this.sid_list.guidedPrice = row.price
+      if (row.price !== '' || row.price !== null){
+        this.sid_list.guidedPrice = row.price
+      }
+      if (row.price == '' || row.price == null){
+        this.sid_list.guidedPrice = ''
+      }
    }
  }
 }
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecarInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecarInfo.vue
@ -482,6 +482,7 @@ export default {
      this.FormLoading = true
      this.sid_list.modelSid = modelSid
      this.sid_list.configSid = modelConfigSid
+      this.sid_list.vehModelConfigSid = ''
      selectExiCarConfig(this.sid_list).then((response) => {
        this.FormLoading = false
        if (response.code === '200') {
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
@ -234,6 +234,7 @@ export default {
      list: [],
      sids: [],
      names: [],
+      row:[],
      YongHuid: [],
      merType: [],
      induslevel: [],
@ -402,6 +403,7 @@ export default {
      const aa = []
      const bb = []
      const cc = []
+      this.row = row
      console.log('112233', row)
      row.forEach((element) => {
        aa.push(element.sid)
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuziliao/kehudanganziliao.vue
@ -146,6 +146,7 @@ export default {
      imglist: [],
      listphoto: [],
      customerName: '',
+      customerSid:'',
      temp: {
        fileName: '',
        attachType: '',
@ -160,7 +161,8 @@ export default {
        params: {
          fileName: '',
          attachType: '',
-          linkSid: ''
+          linkSid: '',
+          customerSid:'',
        }
      },
      multipleSelection: []
@ -222,7 +224,8 @@ export default {
        params: {
          fileName: '',
          attachType: '',
-          linkSid: ''
+          linkSid: '',
+          customerSid:this.customerSid
        }
      }
      this.loadList()
@ -242,6 +245,8 @@ export default {
    },
    newpage(sid, name) {
      this.viewState = 2
+      this.customerSid = sid
+      this.queryParams.params.customerSid = sid
      this.loadList()
    },
    handleSelectionChange(val) {
--- a/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
@ -222,10 +222,7 @@ export default {
      immediate: false,
      handler(newVal, oldVal) {
        if (newVal.configSid !== '' && newVal.modelSid !== ''){
-          if (newVal.guidedPrice !== '' || newVal.guidedPrice !== null){
-            const guidedPrice_two = parseFloat(Number(newVal.guidedPrice) / 10000).toFixed(2)
-            this.guidedPrice = guidedPrice_two
-          }
+          this.guidedPrice = newVal.guidedPrice
          selectExiCarConfig({
            modelSid:newVal.modelSid,
            configSid:newVal.configSid,
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue
@ -48,7 +48,14 @@ export default {
      this.sid_list.modelSid = row.modelSid
      this.sid_list.configSid = row.modelConfigSid
      this.sid_list.vehModelConfigSid = row.vehModelConfigSid
-      this.sid_list.guidedPrice = row.guidedPrice
+      if (row.guidedPrice !== '' || row.guidedPrice !== null){
+        const guidedPrice_two = parseFloat(Number(row.guidedPrice) / 10000).toFixed(2)
+        this.sid_list.guidedPrice = guidedPrice_two
+      }
+      if (row.guidedPrice == '' || row.guidedPrice == null){
+        this.sid_list.guidedPrice = ''
+      }
+      // this.sid_list.guidedPrice = row.guidedPrice
    }
  }
 }
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
@ -98,7 +98,7 @@
                    @selection-change="handleSelectionChange">
            <el-table-column width="50px" type="selection" align="center"/>
            <el-table-column width="80px" fixed label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" fixed align="center" width="140px" class-name="small-padding fixed-width">
+            <el-table-column label="操作" fixed align="center" width="110px" class-name="small-padding fixed-width">
              <template slot-scope="{row}">
                <el-button size="mini" type="primary" @click="handlePeizhi(row)">车型配置</el-button>
              </template>
@ -108,12 +108,12 @@
                <span>{{ scope.row.brandName }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="车型" width="320px" align="center">
+            <el-table-column label="车型" width="250px" align="center">
              <template slot-scope="scope">
                <span class="bluezi" @click="handleCheck(scope.row)">{{ scope.row.vehicleAlias }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="车型归属" width="320px" align="center">
+            <el-table-column label="车型归属" width="140px" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.createOrgName }}</span>
              </template>
@ -128,7 +128,7 @@
                <span>{{ scope.row.fuelTypeValue }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="变速箱" align="center">
+            <el-table-column label="变速箱" width="240px" align="center">
              <template slot-scope="scope">
                <span>{{ scope.row.gearboxTypeValue }}</span>
              </template>
@ -138,7 +138,7 @@
                <span>{{ scope.row.emissionStandardValue }}</span>
              </template>
            </el-table-column>
-            <el-table-column label="车型照片" align="center" width="180px" class-name="small-padding fixed-width">
+            <el-table-column label="车型照片" align="center" width="120px" class-name="small-padding fixed-width">
              <template slot-scope="scope">
                <el-button size="mini" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
                <!--              <div class="upload_img">-->
@ -206,42 +206,42 @@ export default {
      btnList: [
        {
          type: 'primary',
-          size: 'medium',
+          size: 'small',
          icon: 'plus',
          btnKey: 'toAdd',
          btnLabel: '新增'
        },
        {
          type: 'primary',
-          size: 'medium',
+          size: 'small',
          icon: 'edit',
          btnKey: 'toEdit',
          btnLabel: '编辑'
        },
        {
          type: 'danger',
-          size: 'medium',
+          size: 'small',
          icon: 'del',
          btnKey: 'doDel',
          btnLabel: '删除'
        },
        {
          type: 'success',
-          size: 'medium',
+          size: 'small',
          icon: 'Import',
          btnKey: 'doImport',
          btnLabel: '导入'
        },
        {
          type: 'success',
-          size: 'medium',
+          size: 'small',
          icon: 'export',
          btnKey: 'build',
          btnLabel: '导出'
        },
        {
          type: 'info',
-          size: 'medium',
+          size: 'small',
          icon: 'cross',
          btnKey: 'doClose',
          btnLabel: '关闭'
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuAdd.vue
@ -173,7 +173,7 @@ export default {
          this.warehouse_list = res.data
        }
      })
-      typeValues({ type: 'whether' }).then((res) => {
+      typeValues({ type: 'certificate' }).then((res) => {
        if (res.success) {
          this.certificateType_list = res.data
        }
--- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/panku/pankuguanli.vue
@ -237,7 +237,7 @@ export default {
  },
  methods: {
    init() {
-      typeValues({ type: 'whether' }).then((res) => {
+      typeValues({ type: 'certificate' }).then((res) => {
        if (res.success) {
          this.certificateType_list = res.data
        }
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
@ -111,9 +111,9 @@
            </el-input>
          </el-col>
        </el-row>
-        <el-row class="last_btn">
-          <el-button type="primary" size="small" @click="handleCreate()">车辆检查表</el-button>
-        </el-row>
+<!--        <el-row class="last_btn">-->
+<!--          <el-button type="primary" size="small" @click="handleCreate()">车辆检查表</el-button>-->
+<!--        </el-row>-->
      </el-form>
    </div>
  </div>