Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/weishoumaiduan/unsold.js

@@ -19,6 +19,15 @@ export default {
       headers: { 'Content-Type': 'application/json' }
     })
   },
+  // 删除
+  delete: function(params) {
+    return request({
+      url: '/base/v1/basevehicleactualsales/delete',
+      method: 'DELETE',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
   // 保存修改记录
   saveOrUpdate: function(params) {
     return request({

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue

@@ -144,13 +144,13 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '【新增】车辆调价申请'
+      this.viewTitle = '【新增】车辆未售买断申请'
     },
     showEdit(row) {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
-      this.viewTitle = '【编辑】车辆调价申请'
+      this.viewTitle = '【编辑】车辆未售买断申请'
       console.log('编辑回显', row.sid)
       req.fetchBySid(row.sid).then((resp) => {
         const data = resp.data

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue

@@ -45,7 +45,7 @@
         </div>
         <el-table :key="tableKey" :data="formobj.voList" :index="index" border style="width: 100%">
           <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="left" header-align="center">
+          <el-table-column label="车架号" align="center" header-align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.vinNo }}</span>
             </template>
@@ -55,12 +55,12 @@
               <span>{{ scope.row.modelName }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库日期" header-align="center" width="150">
+          <el-table-column label="入库日期" header-align="center" align="center" width="150">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundDate }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="入库价" header-align="center" width="200">
+          <el-table-column label="入库价" header-align="center" align="center" width="200">
             <template slot-scope="scope">
               <span>{{ scope.row.inboundPrice }}</span>
             </template>

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue

@@ -139,7 +139,8 @@ export default {
           vinNo: '',
           applyEndDate: '',
           applyStartDate: '',
-          nodeState: ''
+          nodeState: '',
+          userSid: window.sessionStorage.getItem('userSid')
         },
         current: 1,
         size: 10,
@@ -234,7 +235,8 @@ export default {
           vinNo: '',
           applyEndDate: '',
           applyStartDate: '',
-          nodeState: ''
+          nodeState: '',
+          userSid: window.sessionStorage.getItem('userSid')
         },
         current: 1,
         size: 10,
@@ -271,13 +273,15 @@ export default {
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
         })
-        // req.delBySids(this.sids).then(resp => {
-        //   loading.close()
-        //   this.$message({ type: 'success', message: resp.msg, showClose: true })
-        //   this.loadList()
-        // }).catch(e => {
-        //   loading.close()
-        // })
+        req.delete(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
       }).catch(() => {
       })
     },

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue

@@ -15,7 +15,7 @@
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-row>
                 <el-form-item label="品牌:" class="searchlist">
-                  <el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
+                  <el-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
                     <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
                   </el-select>
                 </el-form-item>
@@ -170,6 +170,7 @@ export default {
           vehicleAlias: '',
           vehicleType: '',
           vehicleVersion: '',
+          userSid: window.sessionStorage.getItem('userSid'),
           vinNoList: []
         },
         total: 1
@@ -294,6 +295,7 @@ export default {
           vehicleAlias: '',
           vehicleType: '',
           vehicleVersion: '',
+          userSid: window.sessionStorage.getItem('userSid'),
           vinNoList: []
         },
         total: 0
@@ -314,14 +316,16 @@ export default {
       this.sids = aa
     },
     showData(value) {
+      const aa = []
       if (value.length > 0) {
         for (var i = 0; i < value.length; i++) {
-          this.listQuery.params.vinNoList.push(value[i].vinNo)
+          aa.push(value[i].vinNo)
         }
-        this.getList()
+        this.listQuery.params.vinNoList = aa
       } else {
         this.listQuery.params.vinNoList = []
       }
+      this.getList()
     },
     // 添加修改返回
     AddUpdateReturn() {