完善销售台账

anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js

@@ -11,16 +11,6 @@ export function pagerList(data) {
   })
 }
 
-// 车辆销售(出库)列表(查出库申请推送的，信息从主表和子表中获取)
-export function listPage(data) {
-  return request({
-    url: '/base/v1/basevehicleoutapply/listPage',
-    data,
-    method: 'post',
-    headers: { 'Content-Type': 'application/json' }
-  })
-}
-
 // 出库详情
 export function fetcBySid(sid) {
   return request({
@@ -58,3 +48,49 @@ export function exportExcel(data) {
   })
 }
 
+// 车辆销售(出库)列表(查出库申请推送的，信息从主表和子表中获取)
+export function listPage(data) {
+  return request({
+    url: '/base/v1/basevehicleoutapply/listPage',
+    data,
+    method: 'post',
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 车辆销售(出库)详情(查出库申请推送的，信息从主表和子表中获取)
+export function detailsNew(data) {
+  return request({
+    url: 'base/v1/basevehicleout/detailsNew/' + data,
+    method: 'get'
+  })
+}
+
+// 导出 (查出库申请推送的，信息从主表和子表中获取)
+export function exportExcelNew(data) {
+  return request({
+    url: 'base/v1/basevehicleout/exportExcelNew',
+    method: 'post',
+    responseType: 'blob', // 表明返回服务器返回的数据类型
+    data: data,
+    headers: { 'Content-Type': 'application/json' }
+  })
+}
+
+// 下载 (查出库申请推送的，信息从主表和子表中获取)
+export function createPdfNew(data) {
+  return request({
+    url: 'base/v1/basevehicleout/createPdfNew',
+    method: 'post',
+    params: data
+  })
+}
+
+// 重推 (查出库申请推送的，信息从主表和子表中获取)
+export function ctxsckd(data) {
+  return request({
+    url: 'base/v1/basevehicleout/ctxsckd',
+    method: 'post',
+    params: data
+  })
+}

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue

@@ -75,6 +75,16 @@
                 <span>{{ scope.row.createOrgName }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="物料名称" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.materialName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="物料编码" align="center" width="100">
+              <template slot-scope="scope">
+                <span>{{ scope.row.materialCode }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车架号" align="center" width="90">
               <template slot-scope="scope">
                 <span>{{ scope.row.vinNo }}</span>
@@ -125,9 +135,9 @@
                 <span>{{ scope.row.concatNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="是否为终端客户" align="center" width="140">
+            <el-table-column label="实际购车人" align="center" width="140">
               <template slot-scope="scope">
-                <span>{{ scope.row.isTerminal }}</span>
+                <span>{{ scope.row.buyerTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="客户名称" align="center" width="100">
@@ -140,16 +150,6 @@
                 <span>{{ scope.row.mobile }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料名称" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.materialName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="物料编码" align="center" width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.materialCode }}</span>
-              </template>
-            </el-table-column>
             <el-table-column label="赠品价值(元)" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.giftsDescription }}</span>
@@ -214,18 +214,18 @@
         <el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
       </span>
     </el-dialog>
-    <chelaingxiaoshouInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <cheliangxiaoshoutaizhangInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
     <vehicleconfiguration v-show="viewState == 3" ref="divPeizhi" @doback="resetState"/>
   </div>
 </template>
 
 <script>
-import { listPage, createPdf, delBySid, exportExcel } from '@/api/cheliang/cheliangxiaoshou'
+import {listPage, createPdfNew, exportExcelNew, ctxsckd } from '@/api/cheliang/cheliangxiaoshou'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import { typeValues, getOrgSidByPath, selectOrgList, selectOrgByLevel, getButtonPermissions } from '@/api/cheliang/dictcommons'
-import chelaingxiaoshouInfo from './chelaingxiaoshouInfo'
+import cheliangxiaoshoutaizhangInfo from './cheliangxiaoshoutaizhangInfo'
 import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
 import { getStorage } from '@/utils/auth'
 
@@ -235,7 +235,7 @@ export default {
     Pagination,
     pageye,
     ButtonBar,
-    chelaingxiaoshouInfo,
+    cheliangxiaoshoutaizhangInfo,
     vehicleconfiguration
   },
   data() {
@@ -248,11 +248,11 @@ export default {
       print: '',
       btnList: [
         {
-          type: 'danger',
+          type: 'primary',
           size: 'small',
-          icon: 'del',
-          btnKey: 'doDel',
-          btnLabel: '删除'
+          icon: '',
+          btnKey: 'toRepush',
+          btnLabel: '重推'
         },
         {
           type: 'success',
@@ -357,8 +357,8 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
-        case 'doDel':
-          this.doDel()
+        case 'toRepush':
+          this.toRepush()
           break
         case 'doExport':
           this.doExport()
@@ -437,7 +437,7 @@ export default {
     },
     handleConfirm() {
       this.visibleDisabled = true
-      createPdf({ xsckdSid: this.printSid, printerType: this.print }).then((resp) => {
+      createPdfNew({ xsckdSid: this.printSid, printerType: this.print }).then((resp) => {
         if (resp.success && resp.data.pdfPath !== '') {
           var xhr = new XMLHttpRequest()
           xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '销售出库单', true)
@@ -477,34 +477,27 @@ export default {
       this.viewState = 3
       this.$refs['divPeizhi'].showInfo(row)
     },
-    doDel() {
+    toRepush() {
       if (this.sids.length === 1) {
-        const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
-        this.$confirm(tip, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          const loading = this.$loading({
-            lock: true,
-            text: 'Loading',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          })
-          delBySid({ sid: this.sids[0] }).then((resp) => {
-            if (resp.success) {
-              loading.close()
-              this.$message({ showClose: true, type: 'success', message: '删除成功' })
-              this.getList()
-            } else {
-              loading.close()
-            }
-          }).catch(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        ctxsckd({ xsckdSid: this.sids[0] }).then((resp) => {
+          if (resp.success) {
+            loading.close()
+            this.$message({ showClose: true, type: 'success', message: '重推成功' })
+            this.getList()
+          } else {
             loading.close()
-          })
+          }
+        }).catch(() => {
+          loading.close()
         })
       } else {
-        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行删除操作'})
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
         return
       }
     },
@@ -516,7 +509,7 @@ export default {
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      exportExcel(this.listQuery.params).then((resp) => {
+      exportExcelNew(this.listQuery.params).then((resp) => {
         loading.close()
         const blob = new Blob([resp], {
           type: 'application/vnd.ms-excel'

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhangInfo.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>车辆出库</div>
+      <div>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd">
+      <div class="titwu">车辆出库</div>
+      <el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">\
+        <el-row class="first_row">
+          <el-col :span="4" class="tleftb">
+            <span>物料编码</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item><span>{{ temp.materialCode }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>物料名称</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.materialName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>车架号</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item><span>{{ temp.vinNo }}</span></el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>销售类型</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.type }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>销售部门</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.orgName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>销售专员</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.staffName }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>销售日期</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.saleDate }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>成交价(元)</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.price }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>合同编号</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.concatNo }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>实际购车人</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.buyerTypeValue }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>客户名称</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.customerName }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>手机号码</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.mobile }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>赠品价值(元)</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.giftsDescription }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>销售折让(元)</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.salesAllowance }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>中介人1</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.middleOne }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>返利金额1(元)</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.rebateMoneyOne }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>中介人2</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.middleTwo }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>返利金额2(元)</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span>{{ temp.rebateMoneyTwo }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="4" class="tleftb">
+            <span>备注</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <span>{{ temp.remarks }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+import { detailsNew } from '@/api/cheliang/cheliangxiaoshou'
+
+export default {
+  name: 'cheliangxiaoshouInfo',
+  data() {
+    return {
+      temp: {
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      detailsNew(row.sid).then((resp) => {
+        if (resp.success) {
+          this.temp = resp.data
+        }
+      })
+    },
+    // 返回
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.temp = {}
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>