diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
index 4059b8805d..98eab62689 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js
@@ -4,12 +4,12 @@ import request from '@/utils/request'
 export function listPage(params) {
   return request({
     url: '/buscenter/v1/busdelivered/listPage',
-    method: "post",
+    method: 'post',
     data: params,
     headers: {
       'Content-Type': 'application/json'
     }
-  });
+  })
 }
 
 // 验证是否可出库
@@ -40,71 +40,70 @@ export function fetchDetailsBySid(params) {
 export function pagerList(params) {
   return request({
     url: '/buscenter/v1/busdeliveredapply/listPage',
-    method: "post",
+    method: 'post',
     data: params,
     headers: {
       'Content-Type': 'application/json'
     }
-  });
+  })
 }
 
 // 保存和修改接口 已改
 export function save(params) {
   return request({
     url: '/buscenter/v1/busdeliveredapply/save',
-    method: "post",
+    method: 'post',
     data: params,
     headers: {
       'Content-Type': 'application/json'
     }
-  });
+  })
 }
 
 // 列表提交 已改
 export function submitBySid(params) {
   return request({
     url: '/buscenter/v1/busdeliveredapply/submitBySid',
-    method: "put",
-    params:  {
+    method: 'put',
+    params: {
       sid: params
     },
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded'
     }
-  });
+  })
 }
 
 // 表单中的提交 已改
 export function submitInfo(params) {
   return request({
     url: '/buscenter/v1/busdeliveredapply/submit',
-    method: "post",
+    method: 'post',
     data: params,
     headers: {
       'Content-Type': 'application/json'
     }
-  });
+  })
 }
 
 // 出库列表批量删除 已改
 export function delBySids(params) {
   return request({
     url: '/buscenter/v1/busdeliveredapply/delBySids',
-    method: "DELETE",
+    method: 'DELETE',
     data: params,
     headers: {
       'Content-Type': 'application/json'
     }
-  });
+  })
 }
 
 // 模糊搜索客户
 export function customerName() {
   return request({
-    url: "/buscenter/v1/busorder/likeGetCustomerName",
-    method: "post"
-    // params: { staffSid: id }
-  });
+    url: '/crm/v1/crmcustomer/cusList',
+    method: 'post'
+  })
 }
 
 // 获取下拉框option
@@ -113,8 +112,5 @@ export function typeValues(data) {
     url: '/portal/v1/dictcommons/typeValues',
     method: 'get',
     params: data
-    // headers: {
-    //   'Content-Type':'multipart/form-data',
-    // }
   })
 }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js
index 2843ce71c1..53c5d24589 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js
@@ -1,6 +1,4 @@
 import request from '@/utils/request'
-import qs from 'qs'
-
 // 销售政策分页列表
 export function selectSalesOrderList(data) {
   return request({
@@ -16,7 +14,7 @@ export function selectSalesOrderList(data) {
 // 根据sid批量删除优惠政策
 export function deleteBySids(data) {
   return request({
-    url: '/buscenter/v1/busorderdiscount/deleteBySids',
+    url: '/base/v1/basediscountpackage/deleteBySids',
     method: 'post',
     data: data,
     headers: {
@@ -28,17 +26,7 @@ export function deleteBySids(data) {
 // 回显
 export function fetchSid(data) {
   return request({
-    url: '/buscenter/v1/busorderdiscount/fetchSid/' + data,
-    method: 'get',
-    data: data,
-    headers: {
-      'Content-Type': 'application/json'
-    }
-  })
-}
-export function selectBySid(data) {
-  return request({
-    url: '/buscenter/v1/busorderdiscount/selectBySid/' + data,
+    url: '/base/v1/basediscountpackage/fetchSid/' + data,
     method: 'get',
     data: data,
     headers: {
@@ -62,7 +50,7 @@ export function save(data) {
 // 修改保存
 export function update(data) {
   return request({
-    url: '/buscenter/v1/busorderdiscount/update/' + data.sid,
+    url: '/base/v1/basediscountpackage/update/' + data.sid,
     method: 'post',
     data: data,
     headers: {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
index 8dbf8be1f2..1f9a317941 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
+++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js
@@ -462,7 +462,7 @@ export const constantRoutes = [{
           import('@/views/chexingchaxun/modelinquire/modellibrary.vue'),
         name: 'chexingchaxun',
         meta: {
-          title: '车型库'
+          title: '车型查询'
         }
       }
     ]
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
index bcf235d235..ce7b572061 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue
@@ -15,7 +15,7 @@
               <el-row>
                 <el-form-item label="品牌:" class="searchlist">
                   <el-select v-model="listQuery.params.carBrand" placeholder="请选择" filterable clearable>
-                    <el-option v-for="item in carBrand_list" :key="item.sid" :label="item.brandName" :value="item.brandName"/>
+                    <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">
@@ -96,6 +96,11 @@
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column label="品牌" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.brandName }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
@@ -186,7 +191,7 @@ export default {
     return {
       isSearchShow: false,
       dialogVisible: false,
-      searchxianshitit: '隐藏查询条件',
+      searchxianshitit: '显示查询条件',
       viewState: 1,
       tableKey: 0,
       list: [],
@@ -396,4 +401,8 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue
index 21474a80ee..c0d84cafc9 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/productionschedulingorder.vue
@@ -60,7 +60,7 @@
             <el-row>
               <el-col :span="4" class="trightb">
                 <el-form-item>
-                  <span>销售指导价</span>
+                  <span>销售指导价(万元)</span>
                 </el-form-item>
               </el-col>
               <el-col :span="20">
@@ -138,7 +138,7 @@ export default {
   data() {
     return {
       isSearchShow: false,
-      searchxianshitit: '隐藏查询条件',
+      searchxianshitit: '显示查询条件',
       tableKey: 0,
       list: [],
       vehicleState_list: [],
@@ -262,4 +262,8 @@ export default {
   display: inline-block;
   margin: 0px 15px;
 }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue
index 0162912aea..bfda36832b 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclecar.vue
@@ -97,7 +97,7 @@ export default {
   data() {
     return {
       isSearchShow: false,
-      searchxianshitit: '隐藏查询条件',
+      searchxianshitit: '显示查询条件',
       viewState: 1,
       tableKey: 0,
       list: [],
@@ -222,4 +222,8 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
index 568fbf6103..90782aef85 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
@@ -225,7 +225,7 @@ export default {
     return {
       isSearchShow: false,
       dialogVisible: false,
-      searchxianshitit: '隐藏查询条件',
+      searchxianshitit: '显示查询条件',
       viewState: 1,
       tableKey: 0,
       list: [],
@@ -508,4 +508,8 @@ export default {
 .pagination {
   margin-bottom: -10px;
 }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
index 45357e154c..af314d7922 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqing.vue
@@ -27,10 +27,8 @@
               <el-input v-model="listQuery.params.contractNo" placeholder="请输入合同编号" clearable class="filter-item"/>
             </el-form-item>
             <el-form-item label="客户名称">
-              <el-select v-model="listQuery.name" class="addinputw" clearable filterable
-                         placeholder="请选择" @change="customerChange">
-                <el-option v-for="item in customerList" :key="item.sid" :label="item.customerName"
-                           :value="item.customerName"/>
+              <el-select v-model="listQuery.params.name" class="addinputw" clearable filterable placeholder="请选择" @change="customerChange">
+                <el-option v-for="item in customerList" :key="item.sid" :label="item.name" :value="item.name"/>
               </el-select>
             </el-form-item>
             <el-form-item label="申请人">
@@ -38,19 +36,11 @@
             </el-form-item>
             <el-form-item label="申请日期">
               <div class="block">
-                <el-date-picker
-                  v-model="listQuery.params.applyDateStart"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
+                <el-date-picker v-model="listQuery.params.applyDateStart" type="date" placeholder="选择日期"></el-date-picker>
               </div>
               <label>至</label>
               <div class="block">
-                <el-date-picker
-                  v-model="listQuery.params.applyDateEnd"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
+                <el-date-picker v-model="listQuery.params.applyDateEnd" type="date" placeholder="选择日期"></el-date-picker>
               </div>
             </el-form-item>
             <el-divider></el-divider>
@@ -65,21 +55,17 @@
 
       <div class="listtop">
         <div class="tit">出库申请列表</div>
-        <pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                class="pagination" @pagination="getList"/>
+        <pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
       </div>
       <!--Start 主页面主要部分 -->
       <div class="listcon">
-        <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" fit highlight-current-row
-                  style="width: 100%;" @selection-change="handleSelectionChange">
+        <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" fit highlight-current-row style="width: 100%;" @selection-change="handleSelectionChange">
           <el-table-column type="selection" align="center" width="50"/>
           <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
           <el-table-column width="150px" label="操作" align="center">
             <template slot-scope="scope">
               <div class="searchbtns"> <!--:disabled="scope.row.nodeState == ''?false:true"-->
-                <el-button size="small" type="primary"
-                           :disabled="scope.row.state !== '待提交'"
-                           @click="changeNodeState(scope.row)">办理
+                <el-button size="small" type="primary" :disabled="scope.row.state !== '待提交'" @click="changeNodeState(scope.row)">办理
                 </el-button>
                 <el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
               </div>
@@ -116,335 +102,314 @@
       <div class="pages">
         <div class="tit"/>
         <!-- 翻页 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                    class="pagination" @pagination="getList"/>
+        <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
       </div>
       <!--End查询列表部分-->
     </div>
-    <chukushenqing-add v-show="viewState == 3" ref="divadd" @doback="resetState"
-                       @reloadlist="getList"/>
-    <chukushenqing-info v-show="viewState == 4" ref="divInfo" @doback="resetState"
-                        @reloadlist="getList"/>
+    <chukushenqing-add v-show="viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"/>
+    <chukushenqing-info v-show="viewState == 4" ref="divInfo" @doback="resetState" @reloadlist="getList"/>
   </div>
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import {
-    pagerList,
-    delBySids,
-    submitBySid,
-    customerName
-  } from '@/api/chukuguanli/chukubanli'
-  import {setuser, getuser} from '@/utils/baocun'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import chukushenqingAdd from "./chukushenqingAdd";
-  import chukushenqingInfo from "./chukushenqingInfo";
+import {
+  pagerList,
+  delBySids,
+  submitBySid,
+  customerName
+} from '@/api/chukuguanli/chukubanli'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import chukushenqingAdd from './chukushenqingAdd'
+import chukushenqingInfo from './chukushenqingInfo'
 
-  export default {
-    name: "chukushenqing",
-    components: {
-      Pagination,
-      pageye,
-      chukushenqingAdd,
-      chukushenqingInfo
-    },
-    data() {
-      return {
-        viewTitle: '',
-        //主页面：隐藏查询条件按钮
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        viewState: 5, // 1、列表 2、新增 3、编辑 4、查看
-        //查询 -----------
-        tableKey: 0,
-        customerList: [],
-        list: [],
-        sids: [],// 用于导出的时候保存已选择的SIDs
-        sides: '',
-        state_list: [],
-        total: 1,
-        FormLoading: false,
-        listLoading: false,
-        departmentSid: window.sessionStorage.getItem('departmentSid'), //部门sid
-        departmentName: window.sessionStorage.getItem('departmentName'), //部门名称
-        typeList: [], //选择器
-        //翻页
-        listQuery: {
-          current: 1,
-          size: 20,
-          params: {
-            applyDateEnd: '',  // 申请日期结束时间
-            applyDateStart: '',  // 申请日期开始时间
-            applyName: '',  // 申请人
-            applySid: window.sessionStorage.getItem('staffSid'),  // 申请人sid
-            contractNo: '',  // 合同编号
-            name: '',  // 客户名称
-          },
-        },
-        initObj: {
-          detailVo: {
-            applyDate: '', // 申请日期
-            contractNo: '', // 合同编号
-            isTerminal: '', // 是否是终端
-            listVo: [],
-            modelName: '', // 车型别名
-            name: '', // 客户名称
-          },
-          sid: '',
-          stringList: []
-        },
-        temp: {}, // 添加和修改
-        templook: {}, // 查看实体
-        textMap: {
-          update: '编辑',
-          create: '创建'
-        },
-        dialogStatus: '',
-      }
-    },
-    computed: {
-      ...mapGetters(['id', 'roles', 'rolesIds', 'departmentId', 'departmentCode']),
-    },
-
-    created() {
-      // 初始化变量
-      this.init();
-    },
-    methods: {
-      // ========== 初始化加载 ==========
-      init() {
-        this.getList()
-        this.getCustomer()
-      },
-      //页面初始化
-      resetTemp() {
-        this.temp = {}
-      },
-      // 客户下拉框
-      getCustomer() {
-        customerName().then((response) => {
-          if (response.code === '200') {
-            this.customerList = response.data
-            console.log('客户列表', this.customerList)
-          }
-        })
-      },
-      // 客户名称
-      customerChange(value) {
-        console.log('触发下拉框按钮', value)
-        let bb = {}
-        this.typeList.forEach((e) => {
-          if (e.customerName == value) {
-            bb = {
-              name: e.customerName,
-              sid: e.sid
-            }
-          }
-        })
-        this.listQuery.params.name = bb.name
-        console.log('客户名称', this.listQuery.params.name)
-      },
-      // 表中序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size;
-        var pageindex = index + 1 + pagestart;
-        return pageindex
-      },
-      // ========== 页面按钮功能 ==========
-      // 切换列表页面
-      handleWaitList() {
-        this.$parent.viewState = 1
-      },
-      // 编辑、详情返回列表页面
-      resetState() {
-        this.viewState = 5
-      },
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow;
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+export default {
+  name: 'chukushenqing',
+  components: {
+    Pagination,
+    pageye,
+    chukushenqingAdd,
+    chukushenqingInfo
+  },
+  data() {
+    return {
+      viewTitle: '',
+      // 主页面：隐藏查询条件按钮
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 5, // 1、列表 2、新增 3、编辑 4、查看
+      // 查询 -----------
+      tableKey: 0,
+      customerList: [],
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      sides: '',
+      state_list: [],
+      total: 1,
+      FormLoading: false,
+      listLoading: false,
+      departmentSid: window.sessionStorage.getItem('departmentSid'), // 部门sid
+      departmentName: window.sessionStorage.getItem('departmentName'), // 部门名称
+      typeList: [], // 选择器
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 20,
+        params: {
+          applyDateEnd: '', // 申请日期结束时间
+          applyDateStart: '', // 申请日期开始时间
+          applyName: '', // 申请人
+          applySid: window.sessionStorage.getItem('staffSid'), // 申请人sid
+          contractNo: '', // 合同编号
+          name: '' // 客户名称
         }
       },
-      // 信息条数 获取点击时当前的sid
-      handleSelectionChange(row) {
-        console.log('开票', row)
-        const aa = [];
-        const bb = []
-        row.forEach(element => {
-          aa.push(element.sid);
-          setuser(this.sids) //用于导出的时候保存已选择的sids
-          bb.push(element.state)
-        });
-        this.sids = aa;
-        this.sides = this.sids.join(); //将sid数组的元素转化成字符串
-        this.state_list = bb
-        console.log('sids数组', this.sids)
-        console.log('sides字符串', this.sides)
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1;
-        this.getList()
+      temp: {}, // 添加和修改
+      templook: {}, // 查看实体
+      textMap: {
+        update: '编辑',
+        create: '创建'
       },
-      // 点击重置
-      handleReset() {
-        this.listQuery.params = {
-          applicant: '',
-          contractNo: '',
-          customerName: '',
-          endDate: '',
-          invoiceState: '',
-          startDate: ''
+      dialogStatus: ''
+    }
+  },
+
+  created() {
+    // 初始化变量
+    this.init()
+  },
+  methods: {
+    // ========== 初始化加载 ==========
+    init() {
+      this.getList()
+      this.getCustomer()
+    },
+    // 页面初始化
+    resetTemp() {
+      this.temp = {}
+    },
+    // 客户下拉框
+    getCustomer() {
+      customerName().then((response) => {
+        if (response.code === '200') {
+          this.customerList = response.data
+          console.log('客户列表', this.customerList)
         }
-      },
-      // ========== 业务功能 ==========
-      // 查询列表信息
-      getList() {
-        this.listLoading = true;
-        pagerList(this.listQuery).then(response => { //拦截器
-          this.listLoading = false;
-          console.log(response)
-          if (response.code === '200' && response.data && response.data.total > 0) {
-            this.list = response.data.records;
-            this.total = response.data.total;
-          } else {
-            this.list = [];
-            this.total = 0
+      })
+    },
+    // 客户名称
+    customerChange(value) {
+      console.log('触发下拉框按钮', value)
+      let bb = null
+      this.typeList.forEach((e) => {
+        if (e.customerName === value) {
+          bb = {
+            name: e.customerName,
+            sid: e.sid
           }
-        })
-      },
-      // 打开查看
-      handleCheck(row) {
-        this.viewState = 4;
-        this.$refs['divInfo'].showInfo(row.sid,row.state)
-      },
-      // 办理
-      changeNodeState(row) {
-        this.viewState = 3
-        this.$refs['divadd'].showEdit(row, row.sid)
-      },
-      // 提交 state_list
-      handleSubmit() {
-        if (this.sids.length > 1) {
-          this.$message({showClose: true, message: '请选择一条出库申请！', type: 'error'});
-          return
-        }
-        if (this.sids.length == 0) {
-          this.$message({showClose: true, message: '请选择一条出库申请！', type: 'error'});
-          return
         }
-        if (this.sids.length == 1) {
-          if (this.state_list[0] == '待提交') {
-            const sid = this.sids[0]
-            submitBySid(sid).then((response) => {
-              if (response.success) {
-                this.getList()
-              }
-            })
-          } else {
-            this.$message({showClose: true, message: '该业务已提交！', type: 'error'});
-            return
-          }
+      })
+      this.listQuery.params.name = bb.name
+      console.log('客户名称', this.listQuery.params.name)
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // ========== 页面按钮功能 ==========
+    // 切换列表页面
+    handleWaitList() {
+      this.$parent.viewState = 1
+    },
+    // 编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 5
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      console.log('开票', row)
+      const aa = []
+      const bb = []
+      row.forEach(element => {
+        aa.push(element.sid)
+        bb.push(element.state)
+      })
+      this.sids = aa
+      this.sides = this.sids.join() // 将sid数组的元素转化成字符串
+      this.state_list = bb
+      console.log('sids数组', this.sids)
+      console.log('sides字符串', this.sides)
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery.params = {
+        applicant: '',
+        contractNo: '',
+        customerName: '',
+        endDate: '',
+        invoiceState: '',
+        startDate: ''
+      }
+    },
+    // ========== 业务功能 ==========
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      pagerList(this.listQuery).then(response => { // 拦截器
+        this.listLoading = false
+        console.log(response)
+        if (response.code === '200' && response.data && response.data.total > 0) {
+          this.list = response.data.records
+          this.total = response.data.total
+        } else {
+          this.list = []
+          this.total = 0
         }
-      },
-      // 删除
-      handleDelete() {
-        if (this.sids.length > 0) {
-          if (this.state_list.length > 0) {
-            this.$message({
-              showClose: true,
-              message: '该业务已提交，不可删除！',
-              type: 'error'
-            });
-            return
-          }
-          const sids = this.sids
-          delBySids(sids).then((response) => {
-            if (response.code === '200') {
+      })
+    },
+    // 打开查看
+    handleCheck(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row.sid, row.state)
+    },
+    // 办理
+    changeNodeState(row) {
+      this.viewState = 3
+      this.$refs['divadd'].showEdit(row, row.sid)
+    },
+    // 提交 state_list
+    handleSubmit() {
+      if (this.sids.length > 1) {
+        this.$message({ showClose: true, message: '请选择一条出库申请！', type: 'error' })
+        return
+      }
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, message: '请选择一条出库申请！', type: 'error' })
+        return
+      }
+      if (this.sids.length === 1) {
+        if (this.state_list[0] === '待提交') {
+          const sid = this.sids[0]
+          submitBySid(sid).then((response) => {
+            if (response.success) {
               this.getList()
             }
           })
         } else {
+          this.$message({ showClose: true, message: '该业务已提交！', type: 'error' })
+          return
+        }
+      }
+    },
+    // 删除
+    handleDelete() {
+      if (this.sids.length > 0) {
+        if (this.state_list.length > 0) {
           this.$message({
             showClose: true,
-            message: '请选择出库申请信息！',
+            message: '该业务已提交，不可删除！',
             type: 'error'
-          });
+          })
           return
         }
-      },
-      // 关闭
-      handleClose() {
+        const sids = this.sids
+        delBySids(sids).then((response) => {
+          if (response.code === '200') {
+            this.getList()
+          }
+        })
+      } else {
+        this.$message({
+          showClose: true,
+          message: '请选择出库申请信息！',
+          type: 'error'
+        })
+        return
+      }
+    },
+    // 关闭
+    handleClose() {
 
-      },
-      // 导入
-      // handleDaoRu() {
-      //   this.$confirm('确定要导入数据, 是否继续?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   })
-      // },
-      // 导出
-      // handleDaoChu(row) {
-      //   this.$confirm('确定要导出数据, 是否继续?', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   })
-      // }
     }
+    // 导入
+    // handleDaoRu() {
+    //   this.$confirm('确定要导入数据, 是否继续?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   })
+    // },
+    // 导出
+    // handleDaoChu(row) {
+    //   this.$confirm('确定要导出数据, 是否继续?', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   })
+    // }
   }
+}
 </script>
 
 <style scoped>
-  .switch_btn {
-    padding: 15px 0 10px 0;
-  }
+.switch_btn {
+  padding: 15px 0 10px 0;
+}
 
-  .block {
-    display: inline-block;
-  }
+.block {
+  display: inline-block;
+}
 
-  label {
-    padding: 0 6px;
-  }
+label {
+  padding: 0 6px;
+}
 
-  .btn_style {
-    background-color: #018ad2;
-    color: white;
-    font-weight: 600;
-  }
+.btn_style {
+  background-color: #018ad2;
+  color: white;
+  font-weight: 600;
+}
 
-  /deep/ .el-collapse {
-    border-top: 0px solid #e6ebf5;
-    border-bottom: 0px solid #e6ebf5;
-  }
+/deep/ .el-collapse {
+  border-top: 0px solid #e6ebf5;
+  border-bottom: 0px solid #e6ebf5;
+}
 
-  /deep/ .el-collapse-item__content {
-    margin: 0;
-    padding: 0;
-  }
+/deep/ .el-collapse-item__content {
+  margin: 0;
+  padding: 0;
+}
 
-  /deep/ .el-collapse-item__wrap {
-    border-bottom: 0px solid #ebeef5;
-  }
+/deep/ .el-collapse-item__wrap {
+  border-bottom: 0px solid #ebeef5;
+}
 
-  /deep/ .el-collapse-item__header {
-    border-bottom: 0px solid #e6ebf5;
-  }
+/deep/ .el-collapse-item__header {
+  border-bottom: 0px solid #e6ebf5;
+}
 
-  .searchbtn {
-    border: #2cab69 1px solid;
-    color: #2cab69;
-  }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 
-  .searchli {
-    padding: 5px 100px;
-  }
+.searchli {
+  padding: 5px 100px;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue
index 26f8a48ca3..083174bf22 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/gaizhanggunali/gaizhangshenqingguanli/gaizhangguanli.vue
@@ -103,7 +103,7 @@ export default {
   data() {
     return {
       isSearchShow: false,
-      searchxianshitit: '隐藏查询条件',
+      searchxianshitit: '显示查询条件',
       viewState: 1,
       tableKey: 0,
       list: [],
@@ -245,4 +245,8 @@ export default {
   display: inline-block;
   margin: 0px 15px;
 }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
index fe480ec706..f87465235e 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kaipiaoguanli/zhengchangkaipiaoguanli/zhangchangkaipiaoguanli.vue
@@ -136,7 +136,7 @@ export default {
   data() {
     return {
       isSearchShow: false,
-      searchxianshitit: '隐藏查询条件',
+      searchxianshitit: '显示查询条件',
       viewState: 1,
       tableKey: 0,
       list: [],
@@ -263,4 +263,8 @@ export default {
   display: inline-block;
   margin: 0px 15px;
 }
+.searchbtn {
+  border: #2cab69 1px solid;
+  color: #2cab69;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
index b4954da277..849534bf45 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue
@@ -71,10 +71,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="4" class="el-form-item-right">销售指导价</el-col>
+            <el-col :span="4" class="el-form-item-right">销售指导价(万元)</el-col>
             <el-col :span="8">
               <el-form-item prop="saleReferencePrice">
-                <el-input v-model="temp.saleReferencePrice" maxlength="20" placeholder="" style="width:50%" clearable/>
+                <el-input v-model="temp.saleReferencePrice" maxlength="20" placeholder="" style="width:50%" clearable readonly/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="el-form-item-right">车型报价</el-col>
@@ -687,9 +687,11 @@ export default {
       this.viewState = 1
       var arrayList = []
       arrayList = value
+      console.log(arrayList, 8888)
       this.temp.modelName = arrayList[0].modelName
       this.temp.sketChconfiguration = arrayList[0].configName
       this.temp.otherConfig = arrayList[0].otherConfig
+      this.temp.saleReferencePrice = arrayList[0].guidedPrice
     },
     resetState() {
       this.viewState = 1
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue
index d3df9b86ff..4ef2193e27 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue
@@ -124,7 +124,8 @@ export default {
         aa.push({
           modelName: element.modelName,
           configName: element.configName,
-          otherConfig: element.otherConfig
+          otherConfig: element.otherConfig,
+          guidedPrice: element.guidedPrice
         })
       })
       this.sids = aa
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
index 15ad5e04b4..32c0c9c643 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudangan.vue
@@ -45,15 +45,22 @@
                 <el-input v-model="listQuery.params.name" maxlength="20" placeholder="请输入客户名称" class="addinputw" clearable/>
               </el-form-item>
               <el-form-item label="客户类型" class="searchlist">
-                <el-select v-model="listQuery.params.customerType" class="addinputw" placeholder="请选择" @change="getKeHu">
+                <el-select v-model="listQuery.params.customerTypeKey" class="addinputw" placeholder="请选择">
                   <el-option v-for="(item, index) in merType" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
                 </el-select>
               </el-form-item>
               <el-form-item label="联系电话" class="searchlist">
                 <el-input v-model="listQuery.params.mobile" maxlength="20" placeholder="请输入联系电话" class="addinputw" clearable/>
               </el-form-item>
-              <el-form-item label="公司名称" class="searchlist">
-                <el-input v-model="listQuery.params.companyName" maxlength="20" placeholder="请输入公司名称" class="addinputw" clearable/>
+              <el-form-item label="客户级别" class="searchlist">
+                <el-select v-model="listQuery.params.levelKey" class="addinputw" placeholder="请选择客户级别">
+                  <el-option v-for="(item, index) in induslevel" :key="index.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="提醒日期" class="searchlist">
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindStartDay" clearable style="width: 160px;" type="date" placeholder="开始日期"/>
+                <div class="line">至</div>
+                <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.remindEndDay" clearable style="width: 160px;" type="date" placeholder="结束日期"/>
               </el-form-item>
               <div class="searchbtns">
                 <el-button type="primary" icon="el-icon-search" @click="handleReset()">查询</el-button>
@@ -188,21 +195,12 @@ export default {
         current: 1,
         size: 10,
         params: {
-          affiliatedOrgName: '',
-          affiliatedOrgSid: '',
-          agencyName: '',
-          agencySid: '',
-          companyName: '',
-          customerClass: '',
-          customerClassKey: '',
-          customerType: '',
           customerTypeKey: '',
-          level: '',
           levelKey: '',
           mobile: '',
           name: '',
-          source: '',
-          sourceKey: '',
+          remindStartDay: '',
+          remindEndtDay: '',
           staffSid: window.sessionStorage.getItem('staffSid')
         },
         total: 1
@@ -231,8 +229,6 @@ export default {
     init() {
       this.getList()
       this.getShuJUZiDian()
-      this.getGuaKao()
-      this.getZhongJie()
     },
     // 序号
     indexMethod(index) {
@@ -270,21 +266,12 @@ export default {
         current: 1,
         size: 20,
         params: {
-          affiliatedOrgName: '',
-          affiliatedOrgSid: '',
-          agencyName: '',
-          agencySid: '',
-          companyName: '',
-          customerClass: '',
-          customerClassKey: '',
-          customerType: '',
           customerTypeKey: '',
-          level: '',
           levelKey: '',
           mobile: '',
           name: '',
-          source: '',
-          sourceKey: '',
+          remindStartDay: '',
+          remindEndtDay: '',
           staffSid: window.sessionStorage.getItem('staffSid')
         }
       }
@@ -510,24 +497,6 @@ export default {
         }
       })
     },
-    // 客户类型
-    getKeHu(value) {
-      let bb = null
-      this.merType.forEach((e) => {
-        if (e.dictKey === value) {
-          bb = {
-            type: 'customerType',
-            name: e.dictValue,
-            vaule: e.dictKey,
-            sid: e.sid
-          }
-        }
-      })
-      this.listQuery.params.customerType = bb.name
-      this.listQuery.params.customerTypeKey = bb.vaule
-      this.kehusid = bb.sid
-      this.getKeHufenlei(this.kehusid)
-    },
     // 联络方式
     getVisitWay(value) {
       let bb = null
@@ -544,85 +513,6 @@ export default {
       this.customerTypeList.visitWay = bb.name
       this.customerTypeList.visitWayKey = bb.vaule
     },
-    // 客户分类
-    getKeHufenlei(kehusid) {
-      typeValues({
-        psid: kehusid, type: 'customerClass'
-      }).then((res) => {
-        if (res.code === '200') {
-          this.merClass = res.data
-        }
-      })
-    },
-    // 挂靠单位
-    getGuaKao() {
-      namesDown({
-        name: this.listQuery.params.affiliatedOrgSid
-      }).then((response) => {
-        if (response.code === '200') {
-          this.edOrgSid = response.data
-        }
-      })
-    },
-    // 中介单位
-    getZhongJie() {
-      getPcDistributorList({
-        current: this.listQuery.current,
-        size: this.listQuery.size,
-        params: {
-          distributorName: this.agencySid
-        }
-      }).then((response) => {
-        if (response.code === '200') {
-          this.ncySid = response.data
-        }
-      })
-    },
-    // 客户分类
-    getFenLei(value) {
-      let bb = null
-      this.merClass.forEach((e) => {
-        if (e.dictKey === value) {
-          bb = {
-            type: 'customerClass',
-            name: e.dictValue,
-            vaule: e.dictKey
-          }
-        }
-      })
-      this.listQuery.params.customerClass = bb.name
-      this.listQuery.params.customerClassKey = bb.vaule
-    },
-    // 客户来源
-    getKeHuLaiYUan(value) {
-      let bb = null
-      this.sourceLisst.forEach((e) => {
-        if (e.dictKey === value) {
-          bb = {
-            type: 'customerSource',
-            name: e.dictValue,
-            vaule: e.dictKey
-          }
-        }
-      })
-      this.listQuery.params.source = bb.name
-      this.listQuery.params.sourceKey = bb.vaule
-    },
-    // 客户级别
-    getJiBie(value) {
-      let bb = null
-      this.induslevel.forEach((e) => {
-        if (e.dictKey === value) {
-          bb = {
-            type: 'customerLevel',
-            name: e.dictValue,
-            vaule: e.dictKey
-          }
-        }
-      })
-      this.listQuery.params.level = bb.name
-      this.listQuery.params.levelKey = bb.vaule
-    }
   }
 }
 </script>
@@ -669,4 +559,8 @@ export default {
 .el-button-sure {
   margin-right: 10%;
 }
+.line {
+  display: inline-block;
+  margin: 0px 15px;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
index 7180f47189..1d5a2a80da 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue
@@ -105,12 +105,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" v-show="stateId=='0'" class="trightb">
+            <el-col :span="4" class="trightb">
               <el-form-item>
                 <span slot="label">是否开启提醒</span>
               </el-form-item>
             </el-col>
-            <el-col :span="8" v-show="stateId=='0'">
+            <el-col :span="8">
               <el-form-item>
                 <el-radio v-model="temp.isOnRemind" label="是">是</el-radio>
                 <el-radio v-model="temp.isOnRemind" label="否">否</el-radio>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue
index 741abc108e..6cb55b0bda 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganinfo.vue
@@ -103,7 +103,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.isOnRemind=='是'">
             <el-col :span="4" class="trightb">
               <el-form-item>
                 <span slot="label">提醒日期</span>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiliAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiliAdd.vue
index bf802b7beb..40092ef536 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiliAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiliAdd.vue
@@ -108,7 +108,7 @@
           </el-col>
           <el-col :span="20">
             <el-form-item>
-              <el-input v-model="temp.remarks" maxlength="20" placeholder="" style="width:85%" class="addinputw" clearable/>
+              <el-input v-model="temp.remind_remark" maxlength="20" placeholder="" style="width:85%" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -183,11 +183,6 @@ export default {
         }
       ],
       rules: {
-        remind_day: [{
-          required: true,
-          message: '请填写',
-          trigger: 'blur'
-        }],
         follow_form: [{
           required: true,
           message: '请填写',
@@ -387,6 +382,7 @@ export default {
                   type: 'success',
                   duration: 2000
                 })
+                this.handleReturn()
                 this.$emit('updated')
               } else {
                 this.$notify({
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
index 471c61e19c..d8c9cdeeca 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehugenjinjilu/genjinjiluguanli.vue
@@ -74,7 +74,7 @@
             </el-table-column>
             <el-table-column label="是否开启提醒" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.isOnRemind == 0 ? '是' : '否' }}</span>
+                <span>{{ scope.row.isOnRemind }}</span>
               </template>
             </el-table-column>
             <el-table-column label="提醒日期" align="center">
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue
index a7123d7b44..380bceba87 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue
@@ -6,6 +6,7 @@
         <div>
           <el-button type="primary" size="small" @click="handleCreate()">新增</el-button>
           <el-button type="danger" size="small" @click="handleDelete()">删除</el-button>
+          <el-button type="primary" size="small">提交</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
@@ -15,54 +16,28 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
               <el-form-item label="政策类别">
-                <el-select v-model="listQuery.params.salesPolicy" placeholder="请选择" @change="salesPolicyChange">
-                  <el-option
-                    v-for="item in salesPolicy_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
+                <el-select v-model="listQuery.params.salesPolicyKey" placeholder="请选择">
+                  <el-option v-for="item in salesPolicy_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
                   </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="优惠包类别">
-                <el-select v-model="listQuery.params.discountType" placeholder="请选择" @change="discountTypeChange">
-                  <el-option
-                    v-for="item in discountType_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
+                <el-select v-model="listQuery.params.discountTypeKey" placeholder="请选择">
+                  <el-option v-for="item in discountType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="是否有效">
-                <el-select v-model="listQuery.params.isEmploy" placeholder="请选择" @change="isEmployChange">
-                  <el-option
-                    v-for="item in effective"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
+                <el-select v-model="listQuery.params.isEmploy" placeholder="请选择">
+                  <el-option v-for="item in effective" :key="item.value" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="有效期">
                 <div class="block">
-                  <el-date-picker
-                    v-model="listQuery.params.getEffectiveStartDate"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                    format="yyyy-MM-dd">
-                  </el-date-picker>
+                  <el-date-picker v-model="listQuery.params.getEffectiveStartDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
                 </div>
                 <label>至</label>
                 <div class="block">
-                  <el-date-picker
-                    v-model="listQuery.params.getEffectiveEndDate"
-                    type="date"
-                    placeholder="选择日期"
-                    value-format="yyyy-MM-dd"
-                    format="yyyy-MM-dd">
-                  </el-date-picker>
+                  <el-date-picker v-model="listQuery.params.getEffectiveEndDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
                 </div>
               </el-form-item>
               <div class="searchbtns">
@@ -74,19 +49,16 @@
         </div>
         <div class="listtop">
           <div class="tit">销售政策列表</div>
-          <pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                  class="pagination" @pagination="getList"/>
+          <pageye v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"
-                    @selection-change="handleSelectionChange">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="150px" label="操作" align="center">
               <template slot-scope="scope">
                 <div class="searchbtns"> <!--:disabled=""-->
-                  <el-button size="small" type="primary"
-                             @click="changeNodeState(scope.row)">办理
+                  <el-button size="small" type="primary" @click="changeNodeState(scope.row)">办理
                   </el-button>
                   <el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
                 </div>
@@ -109,17 +81,22 @@
             </el-table-column>
             <el-table-column label="优惠包名称" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.discountName }}</span>
+                <span>{{ scope.row.projectName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="优惠包成本(元)" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.projectCost }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="优惠包价值" align="center">
+            <el-table-column label="优惠包价值(元)" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.amount }}</span>
+                <span>{{ scope.row.discountMoney }}</span>
               </template>
             </el-table-column>
             <el-table-column label="优惠项目说明" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.detail }}</span>
+                <span>{{ scope.row.discountExplain }}</span>
               </template>
             </el-table-column>
             <el-table-column label="有效期" align="center">
@@ -137,283 +114,222 @@
         <div class="pages">
           <div class="tit"/>
           <!-- 翻页 -->
-          <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size"
-                      class="pagination" @pagination="getList"/>
+          <pagination v-show="total > 0" :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
         </div>
       </div>
     </div>
-    <xiaoshouzhengce-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState"
-                         @reloadlist="getList"></xiaoshouzhengce-add>
+    <xiaoshouzhengce-add v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getList"></xiaoshouzhengce-add>
     <xiaoshouzhengce-info v-show="viewState == 4" ref="divinfo" @doback="resetState"></xiaoshouzhengce-info>
   </div>
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import {selectSalesOrderList, deleteBySids, typeValues} from '@/api/jichuxinxi/salepolicy'
-  import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
-  import xiaoshouzhengceAdd from "./xiaoshouzhengceAdd"
-  import xiaoshouzhengceInfo from "./xiaoshouzhengceInfo"
+import { selectSalesOrderList, deleteBySids, typeValues } from '@/api/jichuxinxi/salepolicy'
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import xiaoshouzhengceAdd from './xiaoshouzhengceAdd'
+import xiaoshouzhengceInfo from './xiaoshouzhengceInfo'
 
-  export default {
-    name: "xiaoshouzhengce",
-    components: {
-      Pagination,
-      pageye,
-      xiaoshouzhengceAdd,
-      xiaoshouzhengceInfo
-    },
-    data() {
-      return {
-        disabled: false, // 办理按钮
-        isSearchShow: false,
-        searchxianshitit: '显示查询条件',
-        viewState: 1, // 1、列表 2、添加-车辆预订 3、编辑  4、查看 5、订金-订金收取
-        // 查询 -----------
-        salesPolicy_list: [], //政策类别
-        discountType_list: [], // 优惠包类别
-        effective: [{ // 是否有效
-          value: 0,
-          label: '是'
-        }, {
-          value: 1,
-          label: '否'
-        }],
-        tableKey: 0,
-        list: [],
-        sids: [],
-        total: 1,
-        FormLoading: false,
-        listLoading: false,
-        listQuery: {
-          current: 1,
-          size: 20,
-          params: {
-            discountType: '',	//优惠类型（赠送套餐 等，数据字典）
-            discountTypeKey: '',	//优惠类型key
-            getEffectiveEndDate: '',	//结束有效期
-            getEffectiveStartDate: '',	//开始有效期
-            isEmploy: '',	//是否有效
-            salesPolicy: '',	//政策类别
-            salesPolicyKey: '',	//政策类别key
-            staffSid:window.sessionStorage.getItem('staffSid')
-          },
-        },
-        submitDto: {
-          businessSid: '',
-          userSid: window.sessionStorage.getItem('userSid'),
-        },
-        nodeState: '',
+export default {
+  name: "xiaoshouzhengce",
+  components: {
+    Pagination,
+    pageye,
+    xiaoshouzhengceAdd,
+    xiaoshouzhengceInfo
+  },
+  data() {
+    return {
+      disabled: false, // 办理按钮
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、添加-车辆预订 3、编辑  4、查看 5、订金-订金收取
+      // 查询 -----------
+      salesPolicy_list: [], // 政策类别
+      discountType_list: [], // 优惠包类别
+      effective: [{ // 是否有效
+        value: 1,
+        label: '是'
+      }, {
+        value: 0,
+        label: '否'
+      }],
+      tableKey: 0,
+      list: [],
+      sids: [],
+      total: 1,
+      FormLoading: false,
+      listLoading: false,
+      listQuery: {
+        current: 1,
+        size: 20,
+        params: {
+          discountTypeKey: '',	// 优惠类型key
+          getEffectiveStartDate: '',	// 开始有效期
+          isEmploy: '',	// 是否有效
+          salesPolicyKey: '',	// 政策类别key
+          staffSid: window.sessionStorage.getItem('staffSid')
+        }
+      },
+      submitDto: {
+        businessSid: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      nodeState: ''
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    // 加载列表
+    this.getList()
+  },
+  methods: {
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
       }
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
+    init() {
+      this.getType()
+    },
+    // ----------功能打开开始--------
+    resetState() {
+      this.viewState = 1
     },
-    created() {
-      // 初始化变量
-      this.init()
-      // 加载列表
+    // 重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 10,
+        params: {
+          discountTypeKey: '',	// 优惠类型key
+          getEffectiveStartDate: '',	// 开始有效期
+          isEmploy: '',	// 是否有效
+          salesPolicyKey: '',	// 政策类别key
+          staffSid: window.sessionStorage.getItem('staffSid')
+        }
+      }
       this.getList()
     },
-    methods: {
-      // 搜索条件效果
-      clicksearchShow() {
-        this.isSearchShow = !this.isSearchShow
-        if (this.isSearchShow) {
-          this.searchxianshitit = '隐藏查询条件'
-        } else {
-          this.searchxianshitit = '显示查询条件'
+    // 下拉框
+    getType() {
+      typeValues({
+        type: 'discountPolicyType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.salesPolicy_list = res.data
+          console.log('下拉框请求政策类别', this.salesPolicy_list)
         }
-      },
-      init() {
-        this.getType()
-      },
-      // ----------功能打开开始--------
-      resetState() {
-        this.viewState = 1
-      },
-      // 重置
-      handleReset() {
-        this.listQuery = {
-          current: 1,
-          size: 20,
-          params: {
-            discountType: '',
-            discountTypeKey: '',
-            getEffectiveEndDate: '',
-            getEffectiveStartDate: '',
-            isEmploy: '',
-            salesPolicy: '',
-            salesPolicyKey: ''
-          },
+      })
+      typeValues({
+        type: 'discountPackageType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.discountType_list = res.data
+          console.log('下拉框请求优惠包类别', this.discountType_list)
         }
-      },
-      // 下拉框
-      getType() {
-        typeValues({
-          type: 'discountPolicyType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.salesPolicy_list = res.data
-            console.log('下拉框请求政策类别', this.salesPolicy_list)
-          }
-        })
-        typeValues({
-          type: 'discountPackageType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.discountType_list = res.data
-            console.log('下拉框请求优惠包类别', this.discountType_list)
-          }
-        })
-      },
-      // 政策类别
-      salesPolicyChange(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.salesPolicy_list.forEach((e) => {
-          if (e.dictKey === value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
+      })
+    },
+    // 打开添加
+    handleCreate() {
+      this.viewState = 2
+      this.$refs['divadd'].showAdd()
+    },
+    // 打开编辑
+    handleUpdate() {
+      if (this.sids.length === 1) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(this.sids[0])
+      } else if (this.sids.length > 1) {
+        this.$notify({
+          title: '提示',
+          message: '不能选中多个信息修改!!',
+          type: 'info',
+          duration: 2000
         })
-        this.listQuery.params.salesPolicy = bb.name
-        this.listQuery.params.salesPolicyKey = bb.key
-        console.log('name', this.listQuery.params.salesPolicy)
-      },
-
-      // 优惠包类别
-      discountTypeChange(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.discountType_list.forEach((e) => {
-          if (e.dictKey === value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择信息!!',
+          type: 'error',
+          duration: 2000
         })
-        this.listQuery.params.discountType = bb.name
-        this.listQuery.params.discountTypeKey = bb.name
-        console.log('name', this.listQuery.params.discountType)
-      },
+        return
+      }
+    },
+    // 办理
+    changeNodeState(row) {
+      console.log('111', row)
+      // if (row.flowState === 0) {
+      this.viewState = 3
+      this.$refs['divadd'].showEdit(row.sid)
+      // } else {
+      //   return
+      // }
+    },
+    // 打开查看详情
+    handleCheck(row) {
+      this.viewState = 4
+      this.$refs['divinfo'].showInfo(row.sid)
+    },
 
-      isEmployChange(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.effective.forEach((e) => {
-          if (e.dictKey === value) {
-            bb = {
-              name: e.value,
-            }
-          }
-        })
-        this.listQuery.params.isEmploy = bb.name
-        console.log('name', this.listQuery.params.isEmploy)
-      },
-      // 打开添加
-      handleCreate() {
-        this.viewState = 2
-        this.$refs['divadd'].showAdd()
-      },
-      // 打开编辑
-      handleUpdate() {
-        if (this.sids.length === 1) {
-          this.viewState = 3
-          this.$refs['divadd'].showEdit(this.sids[0])
-        } else if (this.sids.length > 1) {
-          this.$notify({
-            title: '提示',
-            message: '不能选中多个信息修改!!',
-            type: 'info',
-            duration: 2000,
-          })
+    // 序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      selectSalesOrderList(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (
+          response.code === '200' &&
+          response.data &&
+          response.data.total > 0
+        ) {
+          this.list = response.data.records
+          this.total = response.data.total
         } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择信息!!',
-            type: 'error',
-            duration: 2000,
-          })
-          return
+          this.list = []
+          this.total = 0
         }
-      },
-      //办理
-      changeNodeState(row) {
-        console.log('111', row)
-        // if (row.flowState === 0) {
-          this.viewState = 3
-          this.$refs['divadd'].showEdit(row.sid)
-        // } else {
-        //   return
-        // }
-      },
-      // 打开查看详情
-      handleCheck(row) {
-        this.viewState = 4
-        this.$refs['divinfo'].showInfo(row.sid)
-      },
-
-      // 序号
-      indexMethod(index) {
-        var pagestart = (this.listQuery.current - 1) * this.listQuery.size
-        var pageindex = index + 1 + pagestart
-        return pageindex
-      },
-      // 查询列表信息
-      getList() {
-        this.listLoading = true
-        selectSalesOrderList(this.listQuery).then((response) => {
-          this.listLoading = false
-          if (
-            response.code === '200' &&
-            response.data &&
-            response.data.total > 0
-          ) {
-            this.list = response.data.records
-            this.total = response.data.total
-          } else {
-            this.list = []
-            this.total = 0
-          }
-        })
-      },
-      // 查询按钮
-      handleFilter() {
-        this.listQuery.current = 1
-        this.getList()
-      },
-      // 勾选
-      handleSelectionChange(row) {
-        console.log('row', row)
-        const aa = []
-        const bb = []
-        row.forEach((element) => {
-          aa.push(element.sid)
-          bb.push(element.depositBillTypeKey)
-        });
-        this.sids = aa
-        this.billType = bb
-        console.log('选择sid', this.sids)
-        console.log('选择订单类型', this.billType)
-      },
-      // 根据本行ID删除数据
-      handleDelete() {
-        if (this.sids.length > 0) {
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 勾选
+    handleSelectionChange(row) {
+      console.log('row', row)
+      const aa = []
+      const bb = []
+      row.forEach((element) => {
+        aa.push(element.sid)
+        bb.push(element.depositBillTypeKey)
+      })
+      this.sids = aa
+      this.billType = bb
+      console.log('选择sid', this.sids)
+      console.log('选择订单类型', this.billType)
+    },
+    // 根据本行ID删除数据
+    handleDelete() {
+      if (this.sids.length > 0) {
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           const sids = this.sids
           deleteBySids(sids).then((response) => {
             if (response.code === '200') {
@@ -421,105 +337,105 @@
                 title: '提示',
                 message: '删除成功',
                 type: 'success',
-                duration: 2000,
+                duration: 2000
               })
               this.getList()
             } else {
               this.$notify({
                 title: '删除失败',
                 message: response.msg,
-                type: 'error',
+                type: 'error'
               })
             }
           })
-        } else {
-          this.$notify({
-            title: '提示',
-            message: '没有选择资方信息!!',
-            type: 'error',
-            duration: 2000,
-          })
-          return
-        }
-      },
-      // 提交
-      // handleSubmit(row) {
-      //   // if (this.sids.length == 1) {
-      //   this.$confirm('是否将此条数据加入到待办任务', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() => {
-      //     this.submitDto.businessSid = row.sid
-      //     submitApprove(this.submitDto).then((response) => {
-      //       if (response.code === '200') {
-      //         this.updateDto.nodeState = response.data.nodeState
-      //         this.$notify({
-      //           title: '提示',
-      //           message: '添加成功',
-      //           type: 'success',
-      //           duration: 2000,
-      //         })
-      //         // 更新审批 状态
-      //         this.updateDto.sid = row.sid
-      //         updateState(this.updateDto).then((response) => {
-      //           if (response.code === '200') {
-      //             this.$notify({
-      //               title: '提示',
-      //               message: '更新成功',
-      //               type: 'success',
-      //               duration: 2000,
-      //             })
-      //             this.getList()
-      //           } else {
-      //             this.$notify({
-      //               title: '更新失败',
-      //               message: response.msg,
-      //               type: 'error',
-      //             })
-      //           }
-      //         })
-      //       } else {
-      //         this.$notify({
-      //           title: '添加失败',
-      //           message: response.msg,
-      //           type: 'error',
-      //         })
-      //       }
-      //     })
-      //   })
-      //   // } else if (this.sids.length == 0) {
-      //   //   this.$notify({
-      //   //     title: '您还未选择，请选择数据！！！',
-      //   //     type: 'error',
-      //   //   })
-      //   // } else if (this.sids.length > 1) {
-      //   //   this.$notify({
-      //   //     title: '您选择的数据过多，请选择一条数据编辑！！',
-      //   //     type: 'error',
-      //   //   })
-      //   // }
-      // },
-    },
-
+        })
+      } else {
+        this.$notify({
+          title: '提示',
+          message: '没有选择资方信息!!',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
+    }
+    // 提交
+    // handleSubmit(row) {
+    //   // if (this.sids.length == 1) {
+    //   this.$confirm('是否将此条数据加入到待办任务', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     this.submitDto.businessSid = row.sid
+    //     submitApprove(this.submitDto).then((response) => {
+    //       if (response.code === '200') {
+    //         this.updateDto.nodeState = response.data.nodeState
+    //         this.$notify({
+    //           title: '提示',
+    //           message: '添加成功',
+    //           type: 'success',
+    //           duration: 2000,
+    //         })
+    //         // 更新审批 状态
+    //         this.updateDto.sid = row.sid
+    //         updateState(this.updateDto).then((response) => {
+    //           if (response.code === '200') {
+    //             this.$notify({
+    //               title: '提示',
+    //               message: '更新成功',
+    //               type: 'success',
+    //               duration: 2000,
+    //             })
+    //             this.getList()
+    //           } else {
+    //             this.$notify({
+    //               title: '更新失败',
+    //               message: response.msg,
+    //               type: 'error',
+    //             })
+    //           }
+    //         })
+    //       } else {
+    //         this.$notify({
+    //           title: '添加失败',
+    //           message: response.msg,
+    //           type: 'error',
+    //         })
+    //       }
+    //     })
+    //   })
+    //   // } else if (this.sids.length == 0) {
+    //   //   this.$notify({
+    //   //     title: '您还未选择，请选择数据！！！',
+    //   //     type: 'error',
+    //   //   })
+    //   // } else if (this.sids.length > 1) {
+    //   //   this.$notify({
+    //   //     title: '您选择的数据过多，请选择一条数据编辑！！',
+    //   //     type: 'error',
+    //   //   })
+    //   // }
+    // },
   }
+}
 </script>
 
 <style scoped>
-  /* .listcon{height: calc(100vh - 480px);overflow-y: auto;overflow-x: hidden;} */
-  .el-input__icon {
-    width: 40px;
-  }
+/* .listcon{height: calc(100vh - 480px);overflow-y: auto;overflow-x: hidden;} */
+.el-input__icon {
+  width: 40px;
+}
 
-  .el-form-item .el-form-item__label {
-    width: 100% !important;
-  }
+.el-form-item .el-form-item__label {
+  width: 100% !important;
+}
 
-  .block {
-    display: inline-block;
-  }
+.block {
+  display: inline-block;
+}
 
-  .el-form-item__content label {
-    padding: 0 5px;
-  }
+.el-form-item__content label {
+  padding: 0 5px;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
index 310daa190d..3d4f799ba1 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>
       <div class="tab-header webtop">
-        <div>{{viewTitle}}</div>
+        <div>{{ viewTitle }}</div>
         <div>
           <el-button type="primary" size="small" :disabled="FormLoading" @click="handleCreate()">保存</el-button>
           <el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交</el-button>
@@ -21,12 +21,7 @@
             <el-col :span="8" class="trightb">
               <el-form-item>
                 <el-select v-model="temp.salesPolicy" placeholder="请选择" @change="salesPolicyChange">
-                  <el-option
-                    v-for="item in salesPolicy_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
+                  <el-option v-for="item in salesPolicy_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -36,12 +31,7 @@
             <el-col :span="8" class="trightb">
               <el-form-item>
                 <el-select v-model="temp.discountType" placeholder="请选择" @change="discountTypeChange">
-                  <el-option
-                    v-for="item in discountType_list"
-                    :key="item.dictKey"
-                    :label="item.dictValue"
-                    :value="item.dictKey">
-                  </el-option>
+                  <el-option v-for="item in discountType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -50,19 +40,27 @@
             <el-col :span="4" class="tleftb">
               <el-form-item><span slot="label">优惠包名称</span></el-form-item>
             </el-col>
+            <el-col :span="20" class="trightb">
+              <el-form-item>
+                <el-input v-model="temp.projectName" class="addinputw" placeholder="" clearable/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <el-form-item><span slot="label">优惠包成本(元)</span></el-form-item>
+            </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-input v-model="temp.projectName" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.projectCost" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <el-form-item><span slot="label">优惠包价值</span></el-form-item>
+              <el-form-item><span slot="label">优惠包价值(元)</span></el-form-item>
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-input v-model="temp.amount" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.discountMoney" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -72,8 +70,7 @@
             </el-col>
             <el-col :span="20" class="trightb">
               <el-form-item>
-                <el-input v-model="temp.detail" class="addinputw" placeholder=""
-                          clearable/>
+                <el-input v-model="temp.discountExplain" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -83,13 +80,7 @@
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-date-picker
-                  v-model="temp.effectiveDate"
-                  type="date"
-                  placeholder="选择日期"
-                  value-format="yyyy-MM-dd"
-                  format="yyyy-MM-dd">
-                </el-date-picker>
+                <el-date-picker v-model="temp.effectiveDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -97,8 +88,8 @@
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-radio v-model="temp.isEmploy" label="0">是</el-radio>
-                <el-radio v-model="temp.isEmploy" label="1">否</el-radio>
+                <el-radio v-model="temp.isEmploy" label="1">是</el-radio>
+                <el-radio v-model="temp.isEmploy" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -109,350 +100,331 @@
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import {save, update, fetchSid, typeValues, submitVehicleApprove} from '@/api/jichuxinxi/salepolicy'
-  import {loginDetails} from '@/api/dictcommons/basemanufacturer'
-  import {getStorage} from '@/utils/auth'
+import { save, update, fetchSid, typeValues, submitVehicleApprove } from '@/api/jichuxinxi/salepolicy'
+import { loginDetails } from '@/api/dictcommons/basemanufacturer'
+import { getStorage } from '@/utils/auth'
 
-  export default {
-    name: "xiaoshouzhengceAdd",
-    data() {
-      return {
-        viewTitle: '',
-        index: 0,
-        disabled: false, // 提交按钮状态
-        // --按钮菜单-------
-        YongHuid: [],
-        stateId: '0',
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        salesPolicy_list: [], //政策类别
-        discountType_list: [], // 优惠包类别
-        temp: {
-          amount: '',	//优惠包价值
-          detail: '',	//优惠项目说明
-          discountName: '',	//优惠包名称
-          discountType: '',	//优惠类型（赠送套餐 等，数据字典）
-          discountTypeKey: '',	//优惠类型key
-          effectiveDate: '',	//有效期
-          isEmploy: '',	//1 是 0 否有效
-          orderSid: '',	//销售订单单据sid
-          salesPolicy: '',	//政策类别
-          salesPolicyKey: '',	//政策类别key
-          sid: '',	//优惠情况sid
-          useOrg: window.sessionStorage.getItem('Orgname'),	//使用组织
-          userSid: window.sessionStorage.getItem('userSid')
-        }, // 添加和修改
-        textMap: {
-          update: '修改',
-          create: '创建',
-        },
-        submitDto: {
-          businessSid: '',
-          userSid: window.sessionStorage.getItem('userSid')
-        },
-        xuniSid: '',
-        mobile: '',
-        orgName: '',
-        staffName: '',
-        _userSid: '',
-        deposit_list: [],
-        customerName: [],
-        tificateT: [],
-        dnumbDate: [],
-        dialogStatus: '', // 对话框状态
-        rules: {},
-        // ------------------------------------
-      }
+export default {
+  name: 'xiaoshouzhengceAdd',
+  data() {
+    return {
+      viewTitle: '',
+      index: 0,
+      disabled: false, // 提交按钮状态
+      // --按钮菜单-------
+      YongHuid: [],
+      stateId: '0',
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      salesPolicy_list: [], // 政策类别
+      discountType_list: [], // 优惠包类别
+      temp: {
+        projectName: '',
+        discountMoney: '',	// 优惠包价值
+        discountType: '',	// 优惠类型（赠送套餐 等，数据字典）
+        discountTypeKey: '',	// 优惠类型key
+        effectiveDate: '',	// 有效期
+        isEmploy: '',	// 1 是 0 否有效
+        orderSid: '',	// 销售订单单据sid
+        salesPolicy: '',	// 政策类别
+        salesPolicyKey: '',	// 政策类别key
+        sid: '',	// 优惠情况sid
+        discountExplain: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      }, // 添加和修改
+      textMap: {
+        update: '修改',
+        create: '创建'
+      },
+      submitDto: {
+        businessSid: '',
+        userSid: window.sessionStorage.getItem('userSid')
+      },
+      xuniSid: '',
+      mobile: '',
+      orgName: '',
+      staffName: '',
+      _userSid: '',
+      deposit_list: [],
+      customerName: [],
+      tificateT: [],
+      dnumbDate: [],
+      dialogStatus: '', // 对话框状态
+      rules: {}
+      // ------------------------------------
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+  },
+  methods: {
+    init() {
+      var token = getStorage()
+      loginDetails(token).then((response) => {
+        if (response.code === '200') {
+          this.YongHuid = response.data
+          this.orgName = this.YongHuid.departmentName
+          this.staffName = this.YongHuid.name
+          this._userSid = this.YongHuid.sid
+          console.log('8888', this.YongHuid)
+        }
+      })
+      this.getType()
     },
-    computed: {
-      ...mapGetters([
-        'id',
-        'roles',
-        'rolesIds',
-        'departmentId',
-        'departmentCode',
-      ]),
+    showAdd() {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.dialogStatus = 'add'
+      this.viewTitle = '【新增】销售政策管理'
     },
-    created() {
-      // 初始化变量
-      this.init()
+    showEdit(sid) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      this.temp.sid = sid
+      this.dialogStatus = 'edit'
+      this.viewTitle = '【编辑】销售政策管理'
+      console.log('编辑页面', sid)
+      fetchSid(sid).then((response) => {
+        if (response.code) {
+          this.temp = response.data
+        }
+      })
     },
-    methods: {
-      // ------------ 页面初始化 ------------
-      // 添加前数据初始化
-      resetTemp() {
-        this.temp = {};
-        this.list = []
-      },
-      init() {
-        var token = getStorage();
-        loginDetails(token).then((response) => {
-          if (response.code === '200') {
-            this.YongHuid = response.data;
-            this.orgName = this.YongHuid.departmentName;
-            this.staffName = this.YongHuid.name;
-            this._userSid = this.YongHuid.sid;
-            console.log('8888', this.YongHuid)
-          }
-        });
-        this.getType()
-      },
-      showAdd() {
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        });
-        this.dialogStatus = 'add';
-        this.viewTitle = '【新增】销售政策管理';
-      },
-      showEdit(sid) {
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        });
-        this.temp.sid = sid
-        this.dialogStatus = 'edit';
-        this.viewTitle = '【编辑】销售政策管理';
-        console.log('编辑页面', sid)
-        fetchSid(sid).then((response) => {
-          if (response.code) {
-            this.temp = response.data
-          }
-        });
-      },
-      // 下拉框
-      getType() {
-        typeValues({
-          type: 'discountPolicyType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.salesPolicy_list = res.data
-            console.log('下拉框请求政策类别', this.salesPolicy_list)
+    // 下拉框
+    getType() {
+      typeValues({
+        type: 'discountPolicyType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.salesPolicy_list = res.data
+          console.log('下拉框请求政策类别', this.salesPolicy_list)
+        }
+      })
+      typeValues({
+        type: 'discountPackageType'
+      }).then((res) => {
+        if (res.code === '200') {
+          this.discountType_list = res.data
+          console.log('下拉框请求优惠包类别', this.discountType_list)
+        }
+      })
+    },
+    // 政策类别
+    salesPolicyChange(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.salesPolicy_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-        typeValues({
-          type: 'discountPackageType'
-        }).then((res) => {
-          if (res.code === '200') {
-            this.discountType_list = res.data
-            console.log('下拉框请求优惠包类别', this.discountType_list)
+        }
+      })
+      this.temp.salesPolicy = bb.name
+      this.temp.salesPolicyKey = bb.key
+      console.log('name', this.temp.salesPolicy)
+    },
+
+    // 优惠包类别
+    discountTypeChange(value) {
+      console.log('触发下拉框按钮')
+      let bb = {}
+      this.discountType_list.forEach((e) => {
+        if (e.dictKey === value) {
+          bb = {
+            type: e.dictType,
+            name: e.dictValue,
+            key: e.dictKey,
+            sid: e.sid
           }
-        })
-      },
-      // 政策类别
-      salesPolicyChange(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.salesPolicy_list.forEach((e) => {
-          if (e.dictKey === value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
+        }
+      })
+      this.temp.discountType = bb.name
+      this.temp.discountTypeKey = bb.key
+      console.log('name', this.temp.discountType)
+    },
+    // ------------ 功能实现 ------------
+    // 添加数据
+    handleCreate() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.FormLoading = true
+          if (this.dialogStatus === 'add') {
+            this.temp.staffSid = this.YongHuid.staffSid
+            this.temp.orgName = this.orgName
+            this.temp.staffName = this.staffName
+            this.temp.orgSid = this.YongHuid.organizationSid
+            this.temp.userSid = window.sessionStorage.getItem('userSid')
+            save(this.temp).then((response) => {
+              this.FormLoading = false
+              if (response.code === '200') {
+                this.xuniSid = response.data
+                this.$notify({
+                  title: '提示',
+                  message: '添加成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                // this.disabled = false
+                this.handleReturn('true')
+                // this.$emit('doback')
+              } else {
+                this.$notify({
+                  title: '提示',
+                  message: '添加失败',
+                  type: 'error',
+                  duration: 2000
+                })
+              }
+            })
+          } else {
+            this.temp.staffSid = this.YongHuid.staffSid
+            this.temp.orgSid = this.YongHuid.organizationSid
+            this.temp.orgName = this.orgName
+            this.temp.staffName = this.staffName
+            this.temp.userSid = window.sessionStorage.getItem('userSid')
+            update(this.temp).then((response) => {
+              console.log('response', response)
+              this.FormLoading = false
+              if (response.code === '200') {
+                this.$notify({
+                  title: '提示',
+                  message: '修改成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.handleReturn('true')
+              } else {
+                this.$notify({
+                  title: '失败',
+                  message: '修改失败',
+                  type: 'error'
+                })
+              }
+            })
           }
-        })
-        this.temp.salesPolicy = bb.name
-        this.temp.salesPolicyKey = bb.key
-        console.log('name', this.temp.salesPolicy)
-      },
+        }
+      })
+    },
 
-      // 优惠包类别
-      discountTypeChange(value) {
-        console.log('触发下拉框按钮')
-        let bb = {}
-        this.discountType_list.forEach((e) => {
-          if (e.dictKey === value) {
-            bb = {
-              type: e.dictType,
-              name: e.dictValue,
-              key: e.dictKey,
-              sid: e.sid
-            }
-          }
-        })
-        this.temp.discountType = bb.name
-        this.temp.discountTypeKey = bb.key
-        console.log('name', this.temp.discountType)
-      },
-      // ------------ 功能实现 ------------
-      // 添加数据
-      handleCreate() {
+    // 提交
+    handleSubmit() {
+      this.$confirm('是否确定提交该业务', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
-            this.FormLoading = true;
-            if (this.dialogStatus === 'add') {
-              this.temp.staffSid = this.YongHuid.staffSid;
-              this.temp.orgName = this.orgName;
-              this.temp.staffName = this.staffName;
-              this.temp.orgSid = this.YongHuid.organizationSid;
+            this.FormLoading = true
+            if (this.stateId === '0') {
+              this.temp.staffSid = this.YongHuid.staffSid
+              this.temp.orgName = this.orgName
+              this.temp.staffName = this.staffName
+              this.temp.orgSid = this.YongHuid.organizationSid
               this.temp.userSid = window.sessionStorage.getItem('userSid')
-              save(this.temp).then((response) => {
-                this.FormLoading = false;
+              console.log('提交时sid', this.temp.sid)
+              // 提交流程
+              submitVehicleApprove(this.temp).then((response) => {
                 if (response.code === '200') {
-                  this.xuniSid = response.data;
                   this.$notify({
                     title: '提示',
-                    message: '添加成功',
+                    message: '提交成功',
                     type: 'success',
-                    duration: 2000,
+                    duration: 2000
                   })
-                  // this.disabled = false
                   this.handleReturn('true')
-                  // this.$emit('doback')
                 } else {
                   this.$notify({
-                    title: '提示',
-                    message: '添加失败',
-                    type: 'error',
-                    duration: 2000,
+                    title: '提交失败',
+                    message: response.msg,
+                    type: 'error'
                   })
                 }
               })
             } else {
-              this.temp.staffSid = this.YongHuid.staffSid;
-              this.temp.orgSid = this.YongHuid.organizationSid;
-              this.temp.orgName = this.orgName;
-              this.temp.staffName = this.staffName;
+              this.temp.staffSid = this.YongHuid.staffSid
+              this.temp.orgSid = this.YongHuid.organizationSid
+              this.temp.orgName = this.orgName
+              this.temp.staffName = this.staffName
               this.temp.userSid = window.sessionStorage.getItem('userSid')
-              update(this.temp).then((response) => {
-                console.log('response', response);
-                this.FormLoading = false;
+              // 提交流程
+              submitVehicleApprove(this.temp).then((response) => {
                 if (response.code === '200') {
                   this.$notify({
                     title: '提示',
-                    message: '修改成功',
+                    message: '提交成功',
                     type: 'success',
-                    duration: 2000,
+                    duration: 2000
                   })
                   this.handleReturn('true')
                 } else {
                   this.$notify({
-                    title: '失败',
-                    message: '修改失败',
-                    type: 'error',
+                    title: '提交失败',
+                    message: response.msg,
+                    type: 'error'
                   })
                 }
               })
             }
           }
         })
-      },
-
-      // 提交
-      handleSubmit() {
-        this.$confirm('是否确定提交该业务', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$refs['dataForm'].validate((valid) => {
-            if (valid) {
-              this.FormLoading = true;
-              if (this.stateId === '0') {
-                this.temp.staffSid = this.YongHuid.staffSid;
-                this.temp.orgName = this.orgName;
-                this.temp.staffName = this.staffName;
-                this.temp.orgSid = this.YongHuid.organizationSid;
-                this.temp.userSid = window.sessionStorage.getItem('userSid')
-                console.log('提交时sid', this.temp.sid)
-                // 提交流程
-                submitVehicleApprove(this.temp).then((response) => {
-                  if (response.code === '200') {
-                    this.$notify({
-                      title: '提示',
-                      message: '提交成功',
-                      type: 'success',
-                      duration: 2000,
-                    })
-                    this.handleReturn('true')
-                  } else {
-                    this.$notify({
-                      title: '提交失败',
-                      message: response.msg,
-                      type: 'error',
-                    })
-                  }
-                })
-              } else {
-                this.temp.staffSid = this.YongHuid.staffSid;
-                this.temp.orgSid = this.YongHuid.organizationSid;
-                this.temp.orgName = this.orgName;
-                this.temp.staffName = this.staffName;
-                this.temp.userSid = window.sessionStorage.getItem('userSid')
-                // 提交流程
-                submitVehicleApprove(this.temp).then((response) => {
-                  if (response.code === '200') {
-                    this.$notify({
-                      title: '提示',
-                      message: '提交成功',
-                      type: 'success',
-                      duration: 2000,
-                    })
-                    this.handleReturn('true')
-                  } else {
-                    this.$notify({
-                      title: '提交失败',
-                      message: response.msg,
-                      type: 'error',
-                    })
-                  }
-                })
-              }
-            }
-          })
-        })
-      },
-      // 返回
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist');
-        this.temp.sid = ''; // SID
-        this.temp = {
-          amount: '',	//优惠包价值
-          detail: '',	//优惠项目说明
-          discountName: '',	//优惠包名称
-          discountType: '',	//优惠类型（赠送套餐 等，数据字典）
-          discountTypeKey: '',	//优惠类型key
-          effectiveDate: '',	//有效期
-          isEmploy: '',	//1 是 0 否有效
-          orderSid: '',	//销售订单单据sid
-          salesPolicy: '',	//政策类别
-          salesPolicyKey: '',	//政策类别key
-          sid: '',	//优惠情况sid
-          useOrg: '',
-          userSid: ''
-        }
-        this.$refs['dataForm'].resetFields()
-        this.$emit('doback')
-      },
-
+      })
     },
+    // 返回
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.temp.sid = '' // SID
+      this.temp = {
+        discountExplain: '',
+        discountMoney: '',
+        projectName: '',
+        discountType: '',	// 优惠类型（赠送套餐 等，数据字典）
+        discountTypeKey: '',	// 优惠类型key
+        effectiveDate: '',	// 有效期
+        isEmploy: '',	// 1 是 0 否有效
+        orderSid: '',	// 销售订单单据sid
+        salesPolicy: '',	// 政策类别
+        salesPolicyKey: '',	// 政策类别key
+        sid: '',	// 优惠情况sid
+        userSid: ''
+      }
+      this.$refs['dataForm'].resetFields()
+      this.$emit('doback')
+    }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 20px 0 35px 0;
-    padding: 10px 0 0 0;
-    border-bottom: 0 !important;
-  }
+.tit {
+  margin: 20px 0 35px 0;
+  padding: 10px 0 0 0;
+  border-bottom: 0 !important;
+}
 
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
+.times {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  padding: 30px 0 10px 0;
+  margin: 0 auto 0px auto;
+  width: 70%;
+  font-size: 14px;
+}
 
-  /deep/ .el-select {
-    width: 80%;
-  }
+/deep/ .el-select {
+  width: 80%;
+}
 
-  /deep/ .el-form-item__content {
-    margin-left: 0 !important;
-  }
+/deep/ .el-form-item__content {
+  margin-left: 0 !important;
+}
 </style>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue
index e3d55c6ff0..cf5be07ad9 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue
@@ -4,8 +4,7 @@
       <div class="tab-header webtop">
         <div>销售政策管理详情</div>
         <div>
-          <el-button type="primary" size="small" :disabled="disabled" @click="handleSubmit()">提交</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="listconadd">
@@ -35,17 +34,27 @@
             <el-col :span="4" class="tleftb">
               <el-form-item><span slot="label">优惠包名称</span></el-form-item>
             </el-col>
+            <el-col :span="20" class="trightb">
+              <el-form-item>
+                <span>{{ temp.projectName }}</span>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="4" class="tleftb">
+              <el-form-item><span slot="label">优惠包成本(元)</span></el-form-item>
+            </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <span>{{temp.discountName}}</span>
+                <span>{{ temp.projectCost }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
-              <el-form-item><span slot="label">优惠包价值</span></el-form-item>
+              <el-form-item><span slot="label">优惠包价值(元)</span></el-form-item>
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                {{ temp.amount }}
+                {{ temp.discountMoney }}
               </el-form-item>
             </el-col>
           </el-row>
@@ -55,7 +64,7 @@
             </el-col>
             <el-col :span="20" class="trightb">
               <el-form-item>
-                {{ temp.detail }}
+                {{ temp.discountExplain }}
               </el-form-item>
             </el-col>
           </el-row>
@@ -74,8 +83,7 @@
             <el-col :span="8" class="trightb">
               <el-form-item>
                 <el-form-item>
-                  <el-radio v-model="temp.isEmploy" label="1">是</el-radio>
-                  <el-radio v-model="temp.isEmploy" label="0">否</el-radio>
+                  {{ temp.isEmploy === '1' ? '是' : '否' }}
                 </el-form-item>
               </el-form-item>
             </el-col>
@@ -87,145 +95,66 @@
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import {fetchSid, submitVehicleApprove} from '@/api/jichuxinxi/salepolicy'
+import { fetchSid } from '@/api/jichuxinxi/salepolicy'
 
-  export default {
-    name: "xiaoshouzhengceInfo",
-    data() {
-      return {
-        disabled: true,
-        index: 0,
-        edit: true,
-        // --按钮菜单-------
-        YongHuid: [],
-        visible: true,
-        stateId: "0",
-        FormLoading: false,
-        listLoading: false,
-        list: [],
-        temp: {}, // 添加和修改
-        textMap: {
-          update: "修改",
-          create: "创建",
-        },
-        submitDto: {
-          businessSid: '',
-          userSid: window.sessionStorage.getItem("userSid"),
-        },
-        updateDto: {
-          nodeState: '',
-          sid: '',
-        },
-        nodeState: '',
-        billNo: '',
-        createDate: '',
-        mobile: '',
-        orgName: '',
-        staffName: '',
-        _userSid: '',
-        customerName: [],
-        xuniSid: '',
-        tificateT: [],
-        dnumbDate: [],
-        dialogStatus: '', // 对话框状态
-      };
-    },
-    computed: {
-      ...mapGetters([
-        "id",
-        "roles",
-        "rolesIds",
-        "departmentId",
-        "departmentCode",
-      ]),
+export default {
+  name: 'xiaoshouzhengceInfo',
+  data() {
+    return {
+      disabled: true,
+      index: 0,
+      edit: true,
+      visible: true,
+      FormLoading: false,
+      listLoading: false,
+      list: [],
+      temp: {} // 添加和修改
+    }
+  },
+  created() {
+  },
+  methods: {
+    // ----------功能打开开始--------
+    handleReturn(isreload) {
+      this.temp = {
+        amount: '',	// 优惠包价值
+        detail: '',	// 优惠项目说明
+        discountName: '',	// 优惠包名称
+        discountType: '',	// 优惠类型（赠送套餐 等，数据字典）
+        discountTypeKey: '',	// 优惠类型key
+        effectiveDate: '',	// 有效期
+        isEmploy: '',	// 1 是 0 否有效
+        orderSid: '',	// 销售订单单据sid
+        salesPolicy: '',	// 政策类别
+        salesPolicyKey: '',	// 政策类别key
+        sid: '',	// 优惠情况sid
+        useOrg: '',
+        userSid: ''
+      }
+      this.$refs['dataForm'].resetFields()
+      this.$emit('doback')
     },
-    created() {
-    },
-    methods: {
-      // ----------功能打开开始--------
-      handleReturn(isreload) {
-        this.temp = {
-          amount: '',	//优惠包价值
-          detail: '',	//优惠项目说明
-          discountName: '',	//优惠包名称
-          discountType: '',	//优惠类型（赠送套餐 等，数据字典）
-          discountTypeKey: '',	//优惠类型key
-          effectiveDate: '',	//有效期
-          isEmploy: '',	//1 是 0 否有效
-          orderSid: '',	//销售订单单据sid
-          salesPolicy: '',	//政策类别
-          salesPolicyKey: '',	//政策类别key
-          sid: '',	//优惠情况sid
-          useOrg: '',
-          userSid: ''
+    showInfo(sid) {
+      console.log("详情打开", sid)
+      fetchSid(sid).then((response) => {
+        if (response.code) {
+          this.temp = response.data
         }
-        this.$refs['dataForm'].resetFields()
-        this.$emit('doback')
-      },
-
-      showInfo(sid) {
-        // this.$nextTick(() => {
-        //   this.$refs["dataForm"].clearValidate();
-        // });
-        console.log("详情打开", sid);
-        // this.submitDto.businessSid = sid;
-        fetchSid(sid).then((response) => {
-          if (response.code) {
-            this.temp = response.data
-          }
-        });
-      },
-      // 提交
-      handleSubmit() {
-        this.$confirm("是否确定提交该业务", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          this.temp.userSid = window.sessionStorage.getItem('userSid')
-          // 提交流程
-          submitVehicleApprove(this.temp).then((response) => {
-            if (response.code === "200") {
-              this.$notify({
-                title: "提示",
-                message: "添加成功",
-                type: "success",
-                duration: 2000,
-              });
-            } else {
-              this.$notify({
-                title: "添加失败",
-                message: response.msg,
-                type: "error",
-              });
-            }
-          });
-        });
-      },
-
-    },
+      })
+    }
   }
+}
 </script>
 
 <style scoped>
-  .tit {
-    margin: 0 0 20px 0;
-    padding: 10px 0 0 0;
-  }
-
-  .times {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
-    padding: 30px 0 10px 0;
-    margin: 0 auto 0px auto;
-    width: 70%;
-    font-size: 14px;
-  }
+.tit {
+  margin: 0 0 20px 0;
+  padding: 10px 0 0 0;
+  border-bottom: 0px !important;
+}
 
-  /deep/ .el-form-item__content {
-    margin-left: 0 !important;
-  }
+/deep/ .el-form-item__content {
+  margin-left: 0 !important;
+}
 
 </style>